Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updates for AMF v2 #1

Merged
merged 21 commits into from
Jan 19, 2024
Merged

Updates for AMF v2 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
5c5af2a
add support for location of .ccc or .cdl files that include ref ids f…
aforsythe Jul 11, 2023
1f17033
add applied tag to aces:outputTransformType by adding to base aces:tr…
aforsythe Jul 11, 2023
8a3a20f
specify that exactly one cdl:colorCorrectionRef is required
aforsythe Jul 11, 2023
26bd853
update email regex
aforsythe Nov 22, 2023
bcc268f
require amfInfo uuid
aforsythe Nov 22, 2023
e5d962d
add support to ACEScsc transforms to be used as IDTs
aforsythe Dec 12, 2023
3e8ed99
make outputTransform element optional
aforsythe Aug 15, 2023
642806c
Merge branch 'v2_updates/optional-output-transforms' into v2_updates/…
aforsythe Dec 22, 2023
58a9067
Merge branch 'v2_updates/colorCorrectionRef' into v2_updates/v2_stage
aforsythe Dec 22, 2023
ea9ee9b
Merge branch 'v2_updates/email-regex-update' into v2_updates/v2_stage
aforsythe Dec 22, 2023
b3971e6
add workingLocation tag
aforsythe Nov 17, 2023
024e6e3
Merge branch 'v2_updates/require-amfInfo-uuid' into v2_updates/v2_stage
aforsythe Dec 22, 2023
42a0e09
update and add amf examples
aforsythe Nov 17, 2023
d9a143a
Merge branch 'v2_updates/csc-as-idt' into v2_updates/v2_stage
aforsythe Dec 22, 2023
7d385b3
Merge branch 'v2_updates/optional-output-transforms' into v2_updates/…
aforsythe Dec 22, 2023
7b25b1c
Merge branch 'v2_updates/workingLocation' into v2_updates/v2_stage
aforsythe Dec 22, 2023
7b4d3ec
bump amf version number
aforsythe Dec 22, 2023
f7f71bb
fix merge conflicts
aforsythe Dec 27, 2023
aa22c46
correct amf version number in example files
aforsythe Dec 27, 2023
80427da
add additional example amf files and fix amf version number
aforsythe Dec 28, 2023
059903a
fix output tranform applied tag integration
aforsythe Dec 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions examples/example1.amf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<aces:acesMetadataFile
xmlns:aces="urn:ampas:aces:amf:v1.0"
xsi:schemaLocation="urn:ampas:aces:amf:v1.0 file:acesMetadataFile.xsd"
xmlns:cdl="urn:ASC:CDL:v1.01"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
version="1.0">
<aces:acesMetadataFile version="2.0" xmlns:aces="urn:ampas:aces:amf:v2.0">
<aces:amfInfo>
<aces:dateTime>
<aces:creationDateTime>2020-11-10T13:20:00Z</aces:creationDateTime>
<aces:modificationDateTime>2020-11-10T13:20:00Z</aces:modificationDateTime>
</aces:dateTime>
<aces:uuid>urn:uuid:54bfd6af-57c0-4bd1-8f95-0952c4f25f86</aces:uuid>
</aces:amfInfo>
<aces:pipeline>
<aces:pipelineInfo>
<aces:dateTime>
<aces:creationDateTime>2020-11-10T13:20:00Z</aces:creationDateTime>
<aces:modificationDateTime>2020-11-10T13:20:00Z</aces:modificationDateTime>
</aces:dateTime>
<aces:uuid>urn:uuid:d587baff-1e20-46e7-a3b1-bbb1194b0172</aces:uuid>
<aces:systemVersion>
<aces:majorVersion>1</aces:majorVersion>
<aces:minorVersion>1</aces:minorVersion>
<aces:minorVersion>3</aces:minorVersion>
<aces:patchVersion>0</aces:patchVersion>
</aces:systemVersion>
</aces:pipelineInfo>
<aces:outputTransform>
<aces:outputTransform applied="false">
<aces:transformId>urn:ampas:aces:transformId:v1.5:RRTODT.Academy.Rec2020_1000nits_15nits_ST2084.a1.1.0</aces:transformId>
</aces:outputTransform>
</aces:pipeline>
</aces:acesMetadataFile>
</aces:acesMetadataFile>
7 changes: 3 additions & 4 deletions examples/example2.amf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<aces:acesMetadataFile
xmlns:aces="urn:ampas:aces:amf:v1.0"
xsi:schemaLocation="urn:ampas:aces:amf:v1.0 file:acesMetadataFile.xsd"
xmlns:aces="urn:ampas:aces:amf:v2.0"
xmlns:cdl="urn:ASC:CDL:v1.01"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
version="1.0">
version="2.0">
<aces:amfInfo>
<aces:description>Example Movie</aces:description>
<aces:author>
Expand Down Expand Up @@ -56,7 +55,7 @@
<cdl:Saturation>1</cdl:Saturation>
</cdl:ASC_SAT>
</aces:lookTransform>
<aces:outputTransform>
<aces:outputTransform applied="false">
<aces:referenceRenderingTransform>
<aces:description>ACES v1.0.3 RRT</aces:description>
<aces:hash algorithm="http://www.w3.org/2001/04/xmlenc#sha256">c81af4fb4a22ee0353308e4582708951df4682bf73f838c24bf44e585fc3bb61</aces:hash>
Expand Down
9 changes: 4 additions & 5 deletions examples/example3.amf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<aces:acesMetadataFile
xmlns:aces="urn:ampas:aces:amf:v1.0"
xsi:schemaLocation="urn:ampas:aces:amf:v1.0 file:acesMetadataFile.xsd"
xmlns:aces="urn:ampas:aces:amf:v2.0"
xmlns:cdl="urn:ASC:CDL:v1.01"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
version="1.0">
version="2.0">
<aces:amfInfo>
<aces:description>Exmaple Movie</aces:description>
<aces:author>
Expand Down Expand Up @@ -65,7 +64,7 @@
<aces:hash algorithm="http://www.w3.org/2001/04/xmlenc#sha256">e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855</aces:hash>
<aces:transformId>urn:ampas:aces:transformId:v1.5:LMT.ACME.AcmeDILook.a1.v5</aces:transformId>
</aces:lookTransform>
<aces:outputTransform>
<aces:outputTransform applied="false">
<aces:referenceRenderingTransform>
<aces:description>ACES v1.0.3 RRT</aces:description>
<aces:hash algorithm="http://www.w3.org/2001/04/xmlenc#sha256">c81af4fb4a22ee0353308e4582708951df4682bf73f838c24bf44e585fc3bb61</aces:hash>
Expand Down Expand Up @@ -118,7 +117,7 @@
<aces:hash algorithm="http://www.w3.org/2001/04/xmlenc#sha256">e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855</aces:hash>
<aces:transformId>urn:ampas:aces:transformId:v1.5:LMT.ACME.AcmeDILook.a1.v5</aces:transformId>
</aces:lookTransform>
<aces:outputTransform>
<aces:outputTransform applied="false">
<aces:description>Some HDR Output Transform</aces:description>
<aces:hash algorithm="http://www.w3.org/2001/04/xmlenc#sha256">9ffcd28772e244f9a3c6e9893f499f2b4f2f3313d292db51aeea4fd3f65f00d9</aces:hash>
<aces:transformId>urn:ampas:aces:transformId:v1.5:RRTODT.Acme.HDRODT.a1.v3</aces:transformId>
Expand Down
7 changes: 3 additions & 4 deletions examples/example4.amf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<aces:acesMetadataFile
xmlns:aces="urn:ampas:aces:amf:v1.0"
xsi:schemaLocation="urn:ampas:aces:amf:v1.0 file:acesMetadataFile.xsd"
xmlns:aces="urn:ampas:aces:amf:v2.0"
xmlns:cdl="urn:ASC:CDL:v1.01"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
version="1.0">
version="2.0">
<aces:amfInfo>
<aces:description>Example Movie</aces:description>
<aces:author>
Expand Down Expand Up @@ -60,7 +59,7 @@
<cdl:Saturation>1</cdl:Saturation>
</cdl:ASC_SAT>
</aces:lookTransform>
<aces:outputTransform>
<aces:outputTransform applied="false">
<aces:referenceRenderingTransform>
<aces:description>ACES v1.0.3 RRT</aces:description>
<aces:hash algorithm="http://www.w3.org/2001/04/xmlenc#sha256">c81af4fb4a22ee0353308e4582708951df4682bf73f838c24bf44e585fc3bb61</aces:hash>
Expand Down
80 changes: 80 additions & 0 deletions examples/example5.amf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
<?xml version="1.0" encoding="UTF-8"?>
<aces:acesMetadataFile
xmlns:aces="urn:ampas:aces:amf:v2.0"
xmlns:cdl="urn:ASC:CDL:v1.01"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
version="2.0">
<aces:amfInfo>
<aces:description>Example Movie</aces:description>
<aces:author>
<aces:name>Foo Bar</aces:name>
<aces:emailAddress>Foobar@onset.com</aces:emailAddress>
</aces:author>
<aces:dateTime>
<aces:creationDateTime>2019-09-19T13:20:00</aces:creationDateTime>
<aces:modificationDateTime>2019-11-27T13:20:00Z</aces:modificationDateTime>
</aces:dateTime>
<aces:uuid>urn:uuid:afe122be-59d3-4360-ad69-33c10108fa7a</aces:uuid>
</aces:amfInfo>
<aces:clipId>
<aces:clipName>A001C012</aces:clipName>
<aces:sequence idx="#" min="1" max="240">A001_C012_AE0306_###.exr</aces:sequence>
</aces:clipId>
<aces:pipeline>
<aces:pipelineInfo>
<aces:description>Example Movie Final DI</aces:description>
<aces:dateTime>
<aces:creationDateTime>2019-09-19T13:20:00</aces:creationDateTime>
<aces:modificationDateTime>2019-11-27T13:20:00Z</aces:modificationDateTime>
</aces:dateTime>
<aces:uuid>urn:uuid:be6Ec2ea-a6DC-6cBC-ff0D-AfCED5FF3Dd8</aces:uuid>
<aces:systemVersion>
<aces:majorVersion>1</aces:majorVersion>
<aces:minorVersion>0</aces:minorVersion>
<aces:patchVersion>3</aces:patchVersion>
</aces:systemVersion>
</aces:pipelineInfo>
<aces:inputTransform applied="false">
<aces:description>Inverse ODT and RRT used to import output referred data</aces:description>
<aces:inverseOutputDeviceTransform>
<aces:transformId>urn:ampas:aces:transformId:v1.5:InvODT.Academy.Rec709_100nits_dim.a1.0.3</aces:transformId>
</aces:inverseOutputDeviceTransform>
<aces:inverseReferenceRenderingTransform>
<aces:transformId>urn:ampas:aces:transformId:v1.5:InvRRT.a1.0.3</aces:transformId>
</aces:inverseReferenceRenderingTransform>
</aces:inputTransform>
<aces:workingLocation/>
<aces:lookTransform applied="false">
<aces:description>Technical Grade</aces:description>
<aces:cdlWorkingSpace>
<aces:fromCdlWorkingSpace>
<aces:transformId>urn:ampas:aces:transformId:v1.5:ACEScsc.Academy.ACEScct_to_ACES.a1.0.3</aces:transformId>
</aces:fromCdlWorkingSpace>
</aces:cdlWorkingSpace>
<cdl:ASC_SOP>
<cdl:Slope>2.0 2.0 2.0</cdl:Slope>
<cdl:Offset>0.1 0.1 0.1</cdl:Offset>
<cdl:Power>1 1 1</cdl:Power>
</cdl:ASC_SOP>
<cdl:ASC_SAT>
<cdl:Saturation>1</cdl:Saturation>
</cdl:ASC_SAT>
</aces:lookTransform>
<aces:lookTransform applied="false">
<aces:description>Show Look</aces:description>
<aces:file>showLook.clf</aces:file>
</aces:lookTransform>
<aces:outputTransform applied="false">
<aces:referenceRenderingTransform>
<aces:description>ACES v1.0.3 RRT</aces:description>
<aces:hash algorithm="http://www.w3.org/2001/04/xmlenc#sha256">c81af4fb4a22ee0353308e4582708951df4682bf73f838c24bf44e585fc3bb61</aces:hash>
<aces:transformId>urn:ampas:aces:transformId:v1.5:RRT.a1.0.3</aces:transformId>
</aces:referenceRenderingTransform>
<aces:outputDeviceTransform>
<aces:description>P3D60 ODT</aces:description>
<aces:hash algorithm="http://www.w3.org/2000/09/xmldsig#sha1">efd279a82c2d52ee8c49dc0793499dc86bb1a4a3fa0dfb420d59c2814c55aea6</aces:hash>
<aces:transformId>urn:ampas:aces:transformId:v1.5:ODT.Academy.P3D60_48nits.a1.0.3</aces:transformId>
</aces:outputDeviceTransform>
</aces:outputTransform>
</aces:pipeline>
</aces:acesMetadataFile>
80 changes: 80 additions & 0 deletions examples/example6.amf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
<?xml version="1.0" encoding="UTF-8"?>
<aces:acesMetadataFile
xmlns:aces="urn:ampas:aces:amf:v2.0"
xmlns:cdl="urn:ASC:CDL:v1.01"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
version="2.0">
<aces:amfInfo>
<aces:description>Example Movie</aces:description>
<aces:author>
<aces:name>Foo Bar</aces:name>
<aces:emailAddress>Foobar@onset.com</aces:emailAddress>
</aces:author>
<aces:dateTime>
<aces:creationDateTime>2019-09-19T13:20:00</aces:creationDateTime>
<aces:modificationDateTime>2019-11-27T13:20:00Z</aces:modificationDateTime>
</aces:dateTime>
<aces:uuid>urn:uuid:afe122be-59d3-4360-ad69-33c10108fa7a</aces:uuid>
</aces:amfInfo>
<aces:clipId>
<aces:clipName>A001C012</aces:clipName>
<aces:sequence idx="#" min="1" max="240">A001_C012_AE0306_###.exr</aces:sequence>
</aces:clipId>
<aces:pipeline>
<aces:pipelineInfo>
<aces:description>Example Movie Final DI</aces:description>
<aces:dateTime>
<aces:creationDateTime>2019-09-19T13:20:00</aces:creationDateTime>
<aces:modificationDateTime>2019-11-27T13:20:00Z</aces:modificationDateTime>
</aces:dateTime>
<aces:uuid>urn:uuid:be6Ec2ea-a6DC-6cBC-ff0D-AfCED5FF3Dd8</aces:uuid>
<aces:systemVersion>
<aces:majorVersion>1</aces:majorVersion>
<aces:minorVersion>0</aces:minorVersion>
<aces:patchVersion>3</aces:patchVersion>
</aces:systemVersion>
</aces:pipelineInfo>
<aces:inputTransform applied="false">
<aces:description>Inverse ODT and RRT used to import output referred data</aces:description>
<aces:inverseOutputDeviceTransform>
<aces:transformId>urn:ampas:aces:transformId:v1.5:InvODT.Academy.Rec709_100nits_dim.a1.0.3</aces:transformId>
</aces:inverseOutputDeviceTransform>
<aces:inverseReferenceRenderingTransform>
<aces:transformId>urn:ampas:aces:transformId:v1.5:InvRRT.a1.0.3</aces:transformId>
</aces:inverseReferenceRenderingTransform>
</aces:inputTransform>
<aces:workingLocation/>
<aces:lookTransform applied="false">
<aces:description>Technical Grade</aces:description>
<aces:cdlWorkingSpace>
<aces:fromCdlWorkingSpace>
<aces:transformId>urn:ampas:aces:transformId:v1.5:ACEScsc.Academy.ACEScct_to_ACES.a1.0.3</aces:transformId>
</aces:fromCdlWorkingSpace>
</aces:cdlWorkingSpace>
<cdl:ASC_SOP>
<cdl:Slope>2.0 2.0 2.0</cdl:Slope>
<cdl:Offset>0.1 0.1 0.1</cdl:Offset>
<cdl:Power>1 1 1</cdl:Power>
</cdl:ASC_SOP>
<cdl:ASC_SAT>
<cdl:Saturation>1</cdl:Saturation>
</cdl:ASC_SAT>
</aces:lookTransform>
<aces:lookTransform applied="false">
<aces:description>Show Look</aces:description>
<aces:file>showLook.clf</aces:file>
</aces:lookTransform>
<aces:outputTransform applied="false">
<aces:referenceRenderingTransform>
<aces:description>ACES v1.0.3 RRT</aces:description>
<aces:hash algorithm="http://www.w3.org/2001/04/xmlenc#sha256">c81af4fb4a22ee0353308e4582708951df4682bf73f838c24bf44e585fc3bb61</aces:hash>
<aces:transformId>urn:ampas:aces:transformId:v1.5:RRT.a1.0.3</aces:transformId>
</aces:referenceRenderingTransform>
<aces:outputDeviceTransform>
<aces:description>P3D60 ODT</aces:description>
<aces:hash algorithm="http://www.w3.org/2000/09/xmldsig#sha1">efd279a82c2d52ee8c49dc0793499dc86bb1a4a3fa0dfb420d59c2814c55aea6</aces:hash>
<aces:transformId>urn:ampas:aces:transformId:v1.5:ODT.Academy.P3D60_48nits.a1.0.3</aces:transformId>
</aces:outputDeviceTransform>
</aces:outputTransform>
</aces:pipeline>
</aces:acesMetadataFile>
24 changes: 24 additions & 0 deletions examples/exampleMinimum.amf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<aces:acesMetadataFile version="2.0" xmlns:aces="urn:ampas:aces:amf:v2.0">
<aces:amfInfo>
<aces:dateTime>
<aces:creationDateTime>2023-08-15T08:00:00-07:00</aces:creationDateTime>
<aces:modificationDateTime>2023-08-15T08:00:00-07:00</aces:modificationDateTime>
</aces:dateTime>
<aces:uuid>urn:uuid:948E6925-2B2B-4825-8540-368304288A06</aces:uuid>
</aces:amfInfo>
<aces:pipeline>
<aces:pipelineInfo>
<aces:dateTime>
<aces:creationDateTime>2023-08-15T08:00:00-07:00</aces:creationDateTime>
<aces:modificationDateTime>2023-08-15T08:00:00-07:00</aces:modificationDateTime>
</aces:dateTime>
<aces:uuid>urn:uuid:B5Fd5DfB-ca3b-E62a-5657-dDf31E32cE92</aces:uuid>
<aces:systemVersion>
<aces:majorVersion>1</aces:majorVersion>
<aces:minorVersion>3</aces:minorVersion>
<aces:patchVersion>0</aces:patchVersion>
</aces:systemVersion>
</aces:pipelineInfo>
</aces:pipeline>
</aces:acesMetadataFile>
27 changes: 18 additions & 9 deletions schema/acesMetadataFile.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema targetNamespace="urn:ampas:aces:amf:v1.0"
xmlns:aces="urn:ampas:aces:amf:v1.0"
<xs:schema targetNamespace="urn:ampas:aces:amf:v2.0"
xmlns:aces="urn:ampas:aces:amf:v2.0"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:cdl="urn:ASC:CDL:v1.01"
xmlns:dcml="http://www.smpte-ra.org/schemas/433/2008/dcmlTypes/"
Expand Down Expand Up @@ -38,7 +38,7 @@

<xs:simpleType name="emailAddressType">
<xs:restriction base="xs:string">
<xs:pattern value="[^@]+@[^\.]+\..+"/>
<xs:pattern value="[^@]+@[^@]+"/>
</xs:restriction>
</xs:simpleType>

Expand All @@ -58,6 +58,8 @@
</xs:simpleContent>
</xs:complexType>

<xs:complexType name="emptyType"/>

<!-- Define transform name types -->
<xs:simpleType name="tnLookTransform">
<xs:restriction base="xs:string">
Expand All @@ -67,7 +69,7 @@

<xs:simpleType name="tnInputTransform">
<xs:restriction base="xs:string">
<xs:pattern value="urn:ampas:aces:transformId:v1.5:IDT\.\S+\.\S+\.a\d+\.v\d+"/>
<xs:pattern value="urn:ampas:aces:transformId:v1.5:(IDT\.\S+\.\S+\.a\d+\.v\d+|ACEScsc\.\S+\.a\d+\.\d+\.\d+)"/>
</xs:restriction>
</xs:simpleType>

Expand Down Expand Up @@ -229,6 +231,7 @@
<xs:element name="outputDeviceTransform" type="aces:outputDeviceTransformType" minOccurs="1" maxOccurs="1"/>
</xs:sequence>
</xs:choice>
<xs:attribute name="applied" type="xs:boolean" use="required"/>
</xs:extension>
</xs:complexContent>
</xs:complexType>
Expand Down Expand Up @@ -281,7 +284,10 @@
<xs:element ref="cdl:SOPNode" minOccurs="1" maxOccurs="1"/>
<xs:element ref="cdl:SatNode" minOccurs="1" maxOccurs="1"/>
</xs:sequence>
<xs:element ref="cdl:ColorCorrectionRef"/>
<xs:sequence>
<xs:element ref="cdl:ColorCorrectionRef" minOccurs="1" maxOccurs="1"/>
<xs:element name="file" type="xs:anyURI" minOccurs="1" maxOccurs="1"/>
</xs:sequence>
</xs:choice>
</xs:sequence>
</xs:choice>
Expand Down Expand Up @@ -311,7 +317,7 @@
<xs:element name="description" type="xs:string" minOccurs="0" maxOccurs="1"/>
<xs:element name="author" type="aces:authorType" minOccurs="0" maxOccurs="unbounded"/>
<xs:element name="dateTime" type="aces:dateTimeType" minOccurs="1" maxOccurs="1"/>
<xs:element name="uuid" type="dcml:UUIDType" minOccurs="0" maxOccurs="1"/>
<xs:element name="uuid" type="dcml:UUIDType" minOccurs="1" maxOccurs="1"/>
</xs:sequence>
</xs:complexType>

Expand All @@ -329,8 +335,11 @@
<xs:sequence>
<xs:element name="pipelineInfo" type="aces:pipelineInfoType" minOccurs="1" maxOccurs="1"/>
<xs:element name="inputTransform" type="aces:inputTransformType" minOccurs="0" maxOccurs="1"/>
<xs:element name="lookTransform" type="aces:lookTransformType" minOccurs="0" maxOccurs="unbounded" />
<xs:element name="outputTransform" type="aces:outputTransformType" minOccurs="1" maxOccurs="1"/>
<xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:element name="workingLocation" type="aces:emptyType" minOccurs="0" maxOccurs="1"/>
<xs:element name="lookTransform" type="aces:lookTransformType" minOccurs="0" maxOccurs="unbounded"/>
</xs:choice>
<xs:element name="outputTransform" type="aces:outputTransformType" minOccurs="0" maxOccurs="1"/>
</xs:sequence>
</xs:complexType>

Expand All @@ -343,7 +352,7 @@
<xs:element name="pipeline" type="aces:pipelineType" minOccurs="1" maxOccurs="1"/>
<xs:element name="archivedPipeline" type="aces:pipelineType" minOccurs="0" maxOccurs="unbounded"/>
</xs:sequence>
<xs:attribute name="version" type="xs:decimal" use="required" fixed="1.0"/>
<xs:attribute name="version" type="xs:decimal" use="required" fixed="2.0"/>
</xs:complexType>
</xs:element>

Expand Down
Loading