Print

Print


Commit in GeomConverter/resources/org/lcsim/schemas/gdml/1.0 on MAIN
gdml.xsd+45-921.1 -> 1.2
gdml_define.xsd+151.1 -> 1.2
gdml_solids.xsd+2-11.1 -> 1.2
+62-93
3 modified files
sync with slac gdml cvs head

GeomConverter/resources/org/lcsim/schemas/gdml/1.0
gdml.xsd 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- gdml.xsd	14 Dec 2007 21:46:32 -0000	1.1
+++ gdml.xsd	19 Aug 2011 21:06:57 -0000	1.2
@@ -15,7 +15,7 @@
   <xs:complexType name="SinglePlacementType">
     <xs:annotation>
       <xs:documentation>Represents a single unique copy a of an associated logical volume
-      in geometrical hierarchy</xs:documentation>
+        in geometrical hierarchy</xs:documentation>
     </xs:annotation>
     <xs:sequence>
       <xs:choice minOccurs="1">
@@ -30,6 +30,10 @@
 	<xs:element name="rotation" type="rotationType"/>
 	<xs:element name="rotationref" type="ReferenceType"/>
       </xs:choice>
+      <xs:choice minOccurs="0">
+	<xs:element name="scale" type="scaleType"/>
+	<xs:element name="scaleref" type="ReferenceType"/>
+      </xs:choice>
     </xs:sequence>
     <xs:attribute name="name" type="xs:ID"></xs:attribute>
   </xs:complexType>
@@ -37,7 +41,7 @@
   <xs:complexType name="DivisionPlacementType">
     <xs:annotation>
       <xs:documentation>Represents a division of the associated logical volume
-      in geometrical hierarchy</xs:documentation>
+        in geometrical hierarchy</xs:documentation>
     </xs:annotation>
     <xs:sequence>
       <xs:element name="volumeref" type="ReferenceType"/>
@@ -52,9 +56,9 @@
   <xs:complexType name="VolumeType">
     <xs:annotation>
       <xs:documentation>Represents a top of a geometrical sub-hierarchy not placed in space
-      None of its children can coincide with its boundary defined by an associated solid
-      Two different placements of the same logical volume represent two different geometrical
-      hierarchies in space</xs:documentation>
+        None of its children can coincide with its boundary defined by an associated solid
+        Two different placements of the same logical volume represent two different geometrical
+        hierarchies in space</xs:documentation>
     </xs:annotation>
     <xs:complexContent>
       <xs:extension base="IdentifiableVolumeType">
@@ -77,12 +81,12 @@
   <xs:complexType name="AssemblyVolumeType">
     <xs:annotation>
       <xs:documentation>Allows to create a group of volumes bound together without a boundary
-      All the volumes exits inside the same virtual reference system of the assmebly volume
-      they belong to
-      When assembly volume is placed all its children follow the global transformation applied
-      to their assembly volume
-      After the assembly volume is placed its children exist as standalone placements in space
-      independent of each other</xs:documentation>
+        All the volumes exits inside the same virtual reference system of the assmebly volume
+        they belong to
+        When assembly volume is placed all its children follow the global transformation applied
+        to their assembly volume
+        After the assembly volume is placed its children exist as standalone placements in space
+        independent of each other</xs:documentation>
     </xs:annotation>
     <xs:complexContent>
       <xs:extension base="IdentifiableVolumeType">
@@ -114,31 +118,31 @@
     <xs:annotation>
       <xs:documentation>Surface between two physical volumes</xs:documentation>
     </xs:annotation>
-    <xs:complexType>
+      <xs:complexType>
       <xs:complexContent>
 	<xs:extension base="LogicalSurfaceType">
-	  <xs:sequence>
-	    <xs:element name="physvolref" type="ReferenceType"/>
-	    <xs:element name="physvolref" type="ReferenceType"/>
-	  </xs:sequence>
+	 <xs:sequence>
+	  <xs:element name="physvolref" type="ReferenceType"/>
+	  <xs:element name="physvolref" type="ReferenceType"/>
+	 </xs:sequence>
 	</xs:extension>
       </xs:complexContent>
-    </xs:complexType>
+     </xs:complexType>
   </xs:element>
   <!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
   <xs:element name="skinsurface" substitutionGroup="Surface">
     <xs:annotation>
       <xs:documentation>Surface between two physical volumes</xs:documentation>
     </xs:annotation>
-    <xs:complexType>
+     <xs:complexType>
       <xs:complexContent>
 	<xs:extension base="LogicalSurfaceType">
 	  <xs:sequence>
-	    <xs:element name="volumeref" type="ReferenceType"/>
+             <xs:element name="volumeref" type="ReferenceType"/>
 	  </xs:sequence>
 	</xs:extension>
       </xs:complexContent>
-    </xs:complexType>
+     </xs:complexType>
   </xs:element>
   <!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
   <xs:element name="structure">
@@ -168,15 +172,15 @@
 	<xs:element maxOccurs="unbounded" name="setup">
 	  <xs:annotation>
 	    <xs:documentation>Geometry setup representing the particular geometry hierarchy by refferring to
-	    a given volume which becomes the top level volume</xs:documentation>
+              a given volume which becomes the top level volume</xs:documentation>
 	  </xs:annotation>
 	  <xs:complexType>
 	    <xs:sequence>
 	      <xs:element name="world" type="ReferenceType">
 		<xs:annotation>
 		  <xs:documentation>A reference to the previously defined volume
-		  in the structure block chosen by this setup
-		  World volumme can't be an assembly volume</xs:documentation>
+                    in the structure block chosen by this setup
+                    World volumme can't be an assembly volume</xs:documentation>
 		</xs:annotation>
 	      </xs:element>
 	    </xs:sequence>
@@ -185,79 +189,28 @@
 	  </xs:complexType>
 	</xs:element>
       </xs:sequence>
-      <xs:attribute fixed="2.9.0" name="version" type="xs:string">
+      <xs:attribute fixed="2.10.0" name="version" type="xs:string">
 	<xs:annotation>
 	  <xs:documentation>The GDML Schema version consists of 3 digits X.Y.Z
-	  where these mean:
-	  X - major number, increased when major new
-	  features or backward incompatible bug fixes
-	  are added and means the GDML Processor is
-	  allowed to refuse processing of such a
-	  document if this is using the more recent
-	  version of the GDML Schema then GDML Processor
-	  understands 
-	  Y - minor number, increased when incremental and
-	  backward compatible changes or improvements
-	  are made into the GDML Schema. GDML Processor
-	  should be able to process such a document
-	  using higher minor version number then that of
-	  the GDML Processor
-	  Z - bugfix revision number, increased when fully
-	  backward compatible changes which resolve a
-	  problem in GDML Schema are applied</xs:documentation>
+            where these mean:
+            X - major number, increased when major new
+            features or backward incompatible bug fixes
+            are added and means the GDML Processor is
+            allowed to refuse processing of such a
+            document if this is using the more recent
+            version of the GDML Schema then GDML Processor
+            understands 
+            Y - minor number, increased when incremental and
+            backward compatible changes or improvements
+            are made into the GDML Schema. GDML Processor
+            should be able to process such a document
+            using higher minor version number then that of
+            the GDML Processor
+            Z - bugfix revision number, increased when fully
+            backward compatible changes which resolve a
+            problem in GDML Schema are applied</xs:documentation>
 	</xs:annotation>
       </xs:attribute>
     </xs:complexType>
   </xs:element>
-
-  <xs:complexType name="GDMLType">
-    <xs:sequence>
-      <xs:element ref="define"/>
-      <xs:element ref="materials"/>
-      <xs:element ref="solids"/>
-      <xs:element ref="structure"/>
-      <xs:element maxOccurs="unbounded" name="setup">
-	<xs:annotation>
-	  <xs:documentation>Geometry setup representing the particular geometry hierarchy by refferring to
-	  a given volume which becomes the top level volume</xs:documentation>
-	</xs:annotation>
-	<xs:complexType>
-	  <xs:sequence>
-	    <xs:element name="world" type="ReferenceType">
-	      <xs:annotation>
-		<xs:documentation>A reference to the previously defined volume
-		in the structure block chosen by this setup
-		World volumme can't be an assembly volume</xs:documentation>
-	      </xs:annotation>
-	    </xs:element>
-	  </xs:sequence>
-	  <xs:attribute name="name" type="xs:ID" use="required"/>
-	  <xs:attribute name="version" type="xs:string" use="required"/>
-	</xs:complexType>
-      </xs:element>
-    </xs:sequence>
-    <xs:attribute fixed="2.8.0" name="version" type="xs:string">
-      <xs:annotation>
-	<xs:documentation>The GDML Schema version consists of 3 digits X.Y.Z
-	where these mean:
-	X - major number, increased when major new
-	features or backward incompatible bug fixes
-	are added and means the GDML Processor is
-	allowed to refuse processing of such a
-	document if this is using the more recent
-	version of the GDML Schema then GDML Processor
-	understands 
-	Y - minor number, increased when incremental and
-	backward compatible changes or improvements
-	are made into the GDML Schema. GDML Processor
-	should be able to process such a document
-	using higher minor version number then that of
-	the GDML Processor
-	Z - bugfix revision number, increased when fully
-	backward compatible changes which resolve a
-	problem in GDML Schema are applied</xs:documentation>
-      </xs:annotation>
-    </xs:attribute>
-  </xs:complexType>
-
 </xs:schema>

GeomConverter/resources/org/lcsim/schemas/gdml/1.0
gdml_define.xsd 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- gdml_define.xsd	14 Dec 2007 21:46:32 -0000	1.1
+++ gdml_define.xsd	19 Aug 2011 21:06:57 -0000	1.2
@@ -76,6 +76,13 @@
 	</xs:annotation>
       </xs:element>
       <!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
+
+      <xs:element maxOccurs="unbounded" minOccurs="0" name="scale" type="scaleType">
+	<xs:annotation>
+	  <xs:documentation>Named cartesian rotation, default unit radian</xs:documentation>
+	</xs:annotation>
+      </xs:element>
+      <!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
     </xs:choice>
     <!-- |||||||||||||||||||||||||||||||||||||||||||||||||||||||||| -->
   </xs:complexType>
@@ -100,4 +107,12 @@
     </xs:complexContent>
   </xs:complexType>
   <!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
+
+  <xs:complexType name="scaleType">
+    <xs:complexContent>
+      <xs:restriction base="IdentifiableQuantityVectorType">
+      </xs:restriction>
+    </xs:complexContent>
+  </xs:complexType>
+  <!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
 </xs:schema>

GeomConverter/resources/org/lcsim/schemas/gdml/1.0
gdml_solids.xsd 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- gdml_solids.xsd	14 Dec 2007 21:46:32 -0000	1.1
+++ gdml_solids.xsd	19 Aug 2011 21:06:57 -0000	1.2
@@ -806,7 +806,8 @@
       <xs:complexContent>
 	<xs:extension base="SolidType">
 	  <xs:sequence>
-	    <xs:element name="Facet" minOccurs="1" maxOccurs="unbounded" type="FacetType"/>	
+<!--	    <xs:element name="Facet" minOccurs="1" maxOccurs="unbounded" type="FacetType"/>	-->
+            <xs:element ref="Facet" minOccurs="1" maxOccurs="unbounded" />
 	  </xs:sequence>
 	</xs:extension>
       </xs:complexContent>
CVSspam 0.2.8