3 modified files
lcdd/schemas/gdml/1.0
diff -u -r1.1 -r1.2
--- gdml.xsd 30 Mar 2005 19:06:51 -0000 1.1
+++ gdml.xsd 25 Mar 2006 02:05:08 -0000 1.2
@@ -29,6 +29,21 @@
</xs:sequence>
</xs:complexType>
<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
+ <xs:complexType name="DivisionPlacementType">
+ <xs:annotation>
+ <xs:documentation>Represents a division of the associated logical volume
+ in geometrical hierarchy</xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="volumeref" type="ReferenceType"/>
+ </xs:sequence>
+ <xs:attribute name="axis" type="xs:string" use="required"></xs:attribute>
+ <xs:attribute name="number" type="ExpressionOrIDREFType" use="required"></xs:attribute>
+ <xs:attribute name="width" type="ExpressionOrIDREFType" use="required"></xs:attribute>
+ <xs:attribute name="offset" type="ExpressionOrIDREFType" use="required"></xs:attribute>
+ <xs:attribute default="mm" name="unit" type="xs:string"></xs:attribute>
+ </xs:complexType>
+ <!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
<xs:complexType name="VolumeType">
<xs:annotation>
<xs:documentation>Represents a top of a geometrical sub-hierarchy not placed in space
@@ -43,6 +58,7 @@
<xs:element name="solidref" type="ReferenceType"/>
<xs:choice minOccurs="0">
<xs:element maxOccurs="unbounded" name="physvol" type="SinglePlacementType"/>
+ <xs:element maxOccurs="1" minOccurs="1" name="divisionvol" type="DivisionPlacementType"/>
<xs:element maxOccurs="1" minOccurs="1" ref="replicavol"/>
<xs:element maxOccurs="1" minOccurs="1" name="paramvol" type="ParameterisedPlacementType"/>
</xs:choice>
@@ -115,7 +131,7 @@
</xs:complexType>
</xs:element>
</xs:sequence>
- <xs:attribute fixed="2.1.0" name="version" type="xs:string">
+ <xs:attribute fixed="2.3.0" name="version" type="xs:string">
<xs:annotation>
<xs:documentation>The GDML Schema version consists of 3 digits X.Y.Z
where these mean:
lcdd/schemas/gdml/1.0
diff -u -r1.1 -r1.2
--- gdml_replicas.xsd 30 Mar 2005 19:06:51 -0000 1.1
+++ gdml_replicas.xsd 25 Mar 2006 02:05:08 -0000 1.2
@@ -40,7 +40,8 @@
<xs:element ref="direction"/>
<xs:element name="directionref" type="ReferenceType"/>
</xs:choice>
- <xs:element ref="distance"/>
+ <xs:element ref="width"/>
+ <xs:element ref="offset"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
@@ -72,6 +73,7 @@
</xs:complexType>
<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
<xs:element name="direction" type="directionType"/>
- <xs:element name="distance" type="QuantityType"/>
+ <xs:element name="width" type="QuantityType"/>
+ <xs:element name="offset" type="QuantityType"/>
<xs:element name="replicavol" type="ReplicaPlacementType"/>
</xs:schema>
lcdd/schemas/gdml/1.0
diff -u -r1.1 -r1.2
--- gdml_solids.xsd 30 Mar 2005 19:06:51 -0000 1.1
+++ gdml_solids.xsd 25 Mar 2006 02:05:08 -0000 1.2
@@ -54,6 +54,34 @@
</xs:complexType>
<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
+ <xs:element name="reflectedSolid" substitutionGroup="Solid">
+ <xs:annotation>
+ <xs:documentation>Reflected solid:
+ sx, sy, sz are scale components (containing reflection),
+ rx, ry, rz are rotation angles around given axes and
+ dx, dy, dz is the translation.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:complexContent>
+ <xs:extension base="SolidType">
+ <xs:attribute name="solid" type="ExpressionOrIDREFType" use="required"></xs:attribute>
+ <xs:attribute default="1.0" name="sx" type="ExpressionOrIDREFType"></xs:attribute>
+ <xs:attribute default="1.0" name="sy" type="ExpressionOrIDREFType"></xs:attribute>
+ <xs:attribute default="1.0" name="sz" type="ExpressionOrIDREFType"></xs:attribute>
+ <xs:attribute default="0.0" name="rx" type="ExpressionOrIDREFType"></xs:attribute>
+ <xs:attribute default="0.0" name="ry" type="ExpressionOrIDREFType"></xs:attribute>
+ <xs:attribute default="0.0" name="rz" type="ExpressionOrIDREFType"></xs:attribute>
+ <xs:attribute default="0.0" name="dx" type="ExpressionOrIDREFType"></xs:attribute>
+ <xs:attribute default="0.0" name="dy" type="ExpressionOrIDREFType"></xs:attribute>
+ <xs:attribute default="0.0" name="dz" type="ExpressionOrIDREFType"></xs:attribute>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+
+ <!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
+
<!--
<xs:element name="BooleanSolid" abstract="true">
<xs:annotation>
@@ -157,6 +185,30 @@
</xs:complexContent>
</xs:complexType>
</xs:element>
+ <!-- +++++++++++++++ G.GUERRIERI - 26.06.2005 +++++++++++++++++++++++ -->
+
+ <xs:element name="ellipsoid" substitutionGroup="Solid">
+ <xs:annotation>
+ <xs:documentation>CSG ellispoid or ellipsoidal shell segment solid described by
+ ax x semiaxis
+ by y semiaxis
+ cz z semiaxis
+ zcut1 bottom plane cutting ellipsoid
+ zcut2 top plane cutting ellispoid
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:complexContent>
+ <xs:extension base="SolidType">
+ <xs:attribute name="ax" type="ExpressionOrIDREFType" use="required"></xs:attribute>
+ <xs:attribute name="by" type="ExpressionOrIDREFType" use="required"></xs:attribute>
+ <xs:attribute name="cz" type="ExpressionOrIDREFType" use="required"></xs:attribute>
+ <xs:attribute default="-1000000.0" name="zcut1" type="ExpressionOrIDREFType"></xs:attribute>
+ <xs:attribute default="1000000.0" name="zcut2" type="ExpressionOrIDREFType"></xs:attribute>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
<xs:element name="tube" substitutionGroup="Solid">
@@ -381,7 +433,7 @@
</xs:sequence>
<xs:attribute name="startphi" type="ExpressionOrIDREFType" use="required"></xs:attribute>
- <xs:attribute name="totalphi" type="ExpressionOrIDREFType" use="required"></xs:attribute>
+ <xs:attribute name="deltaphi" type="ExpressionOrIDREFType" use="required"></xs:attribute>
<xs:attribute name="numsides" type="ExpressionOrIDREFType" use="required"></xs:attribute>
</xs:extension>
</xs:complexContent>
CVSspam 0.2.8
