[GraXML-commit] DetDescr/AGDD/src/net/hep/AGDD/Schema AGDD.xsd,1.5,1.6
Brought to you by:
hrivnac
Menu
▾
▴
[GraXML-commit] DetDescr/AGDD/src/net/hep/AGDD/Schema AGDD.xsd,1.5,1.6
|
From: Julius H. <hr...@us...> - 2005-11-23 16:13:18
|
Update of /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Schema In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13594/net/hep/AGDD/Schema Modified Files: AGDD.xsd Log Message: media and colors added, buildingBlock added Index: AGDD.xsd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Schema/AGDD.xsd,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** AGDD.xsd 7 Oct 2005 15:53:47 -0000 1.5 --- AGDD.xsd 23 Nov 2005 16:13:10 -0000 1.6 *************** *** 2,5 **** --- 2,8 ---- <!-- $Log$ + Revision 1.6 2005/11/23 16:13:10 hrivnac + media and colors added, buildingBlock added + Revision 1.5 2005/10/07 15:53:47 hrivnac Colors introduced *************** *** 97,101 **** </p> <p> ! "composition", "section", "solid", "data" "colormap" and "materials" elements can be linked from another file using XInclude mechanism. </p> --- 100,104 ---- </p> <p> ! "composition", "section", "solid", "data" "colormap" , "materials" and "media" elements can be linked from another file using XInclude mechanism. </p> *************** *** 112,116 **** <ul> <li><b>section</b>, which is a definition of the main division of the detector</li> ! <li><b>materials</b>, which define all used materials</li> <li><b>colormap</b>, which define all used colors</li> </ul> --- 115,120 ---- <ul> <li><b>section</b>, which is a definition of the main division of the detector</li> ! <li><b>media</b>, which define all used media</li> ! <li><b>materials</b>, which define all used media</li> <li><b>colormap</b>, which define all used colors</li> </ul> *************** *** 124,127 **** --- 128,132 ---- <xs:complexType> <xs:choice minOccurs="0" maxOccurs="unbounded"> + <xs:element ref="media"/> <xs:element ref="materials"/> <xs:element ref="colormap"/> *************** *** 146,150 **** of detector. A section is primarily made of "volume" elements but also may receive a set of named and typed parameter blocks (used to specify ! constants). <br></br> Attributes of section are: --- 151,155 ---- of detector. A section is primarily made of "volume" elements but also may receive a set of named and typed parameter blocks (used to specify ! constants). Solids can be encapsulated in a buildingBlock. <br></br> Attributes of section are: *************** *** 164,167 **** --- 169,173 ---- <xs:element ref="abstractBooleanVolume"/> <xs:element ref="abstractData"/> + <xs:element ref="buildingBlock"/> <xs:element ref="composition"/> </xs:choice> *************** *** 655,669 **** <xs:documentation> A solid is basic geometry unit. Specialized types provide for specific ! shapes. A solid references a material and may be declared as "sensitive" ! (which opens the not-yet-implemented capability of producing hits). </xs:documentation> </xs:annotation> <xs:complexContent> <xs:extension base="volumeInstance"> ! <xs:attribute name="material" type="xs:IDREF" use="required"/> ! <xs:attribute name="sensitive" type="xs:boolean" default="false"/> <xs:attribute name="unit_length" type="unit_length" default="mm"/> <xs:attribute name="unit_angle" type="unit_angle" default="deg"/> - <xs:attribute name="color" type="xs:IDREF"/> <xs:attribute ref="xml:base" xmlns:xml="http://www.w3.org/XML/1998/namespace"/> </xs:extension> --- 661,673 ---- <xs:documentation> A solid is basic geometry unit. Specialized types provide for specific ! shapes. A solid references a medium. </xs:documentation> </xs:annotation> <xs:complexContent> <xs:extension base="volumeInstance"> ! <xs:attribute name="medium" type="xs:IDREF" use="required"/> ! <xs:attribute name="color" type="xs:IDREF"/> <xs:attribute name="unit_length" type="unit_length" default="mm"/> <xs:attribute name="unit_angle" type="unit_angle" default="deg"/> <xs:attribute ref="xml:base" xmlns:xml="http://www.w3.org/XML/1998/namespace"/> </xs:extension> *************** *** 1046,1050 **** done via single positioners. <br></br> ! Note that it is required that the materials of the boolean volumes are identical. This is however not checked (or forced) within the XML syntax, and is left to the responsibility of the user (and the --- 1050,1054 ---- done via single positioners. <br></br> ! Note that it is required that the mediums of the boolean volumes are identical. This is however not checked (or forced) within the XML syntax, and is left to the responsibility of the user (and the *************** *** 1110,1114 **** </xs:element> ! <!-- Volume Instances / Composition =========================================== --> <!-- composition .............................................................. --> --- 1114,1136 ---- </xs:element> ! <!-- Building Blocks/ Compositions ============================================ --> ! ! <!-- buildingBlock ............................................................ --> ! <xs:element name="buildingBlock"> ! <xs:annotation> ! <xs:documentation> ! BuildingBlock can encapsulate a set of Solids ! </xs:documentation> ! </xs:annotation> ! <xs:complexType> ! <xs:choice minOccurs="0" maxOccurs="unbounded"> ! <xs:element ref="abstractSolid"/> ! <xs:element ref="abstractStack"/> ! <xs:element ref="abstractBooleanVolume"/> ! <xs:element ref="abstractData"/> ! </xs:choice> ! <xs:attribute ref="xml:base" xmlns:xml="http://www.w3.org/XML/1998/namespace"/> ! </xs:complexType> ! </xs:element> <!-- composition .............................................................. --> *************** *** 1436,1439 **** --- 1458,1502 ---- </xs:simpleType> + <!-- Media ==================================================================== --> + + <!-- media .................................................................... --> + <xs:element name="media"> + <xs:annotation> + <xs:documentation> + </xs:documentation> + </xs:annotation> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" maxOccurs="unbounded" ref="medium" /> + </xs:sequence> + <xs:attribute name="version" type="xs:string" use="required" /> + <xs:attribute name="author" type="xs:string" use="required" /> + <xs:attribute name="date" type="xs:date" use="required" /> + <xs:attribute name="DTD_version" use="required"> + <xs:simpleType> + <xs:restriction base="xs:string"> + <xs:enumeration value="v7"/> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + <xs:attribute ref="xml:base" xmlns:xml="http://www.w3.org/XML/1998/namespace"/> + </xs:complexType> + </xs:element> + + <!-- medium ................................................................... --> + <xs:element name="medium"> + <xs:annotation> + <xs:documentation> + </xs:documentation> + </xs:annotation> + <xs:complexType> + <xs:attribute name="name" type="xs:ID" use="required" /> + <xs:attribute name="material" type="xs:IDREF" /> + <xs:attribute name="color" type="xs:IDREF" /> + <xs:attribute name="parameters" type="xs:string" /> + <xs:attribute name="sensitive" type="xs:boolean" default="true" /> + </xs:complexType> + </xs:element> + <!-- Materials ================================================================ --> |
