graxml-commit Mailing List for GraXML (Page 19)
Brought to you by:
hrivnac
You can subscribe to this list here.
2005 |
Jan
|
Feb
|
Mar
(1) |
Apr
(5) |
May
(6) |
Jun
(2) |
Jul
|
Aug
(12) |
Sep
(32) |
Oct
(41) |
Nov
(16) |
Dec
(21) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2006 |
Jan
(10) |
Feb
(10) |
Mar
(3) |
Apr
(3) |
May
(10) |
Jun
(12) |
Jul
|
Aug
|
Sep
(11) |
Oct
|
Nov
|
Dec
|
2007 |
Jan
(169) |
Feb
(17) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(5) |
Oct
(100) |
Nov
(14) |
Dec
(10) |
2008 |
Jan
(37) |
Feb
(4) |
Mar
(10) |
Apr
(73) |
May
(22) |
Jun
(8) |
Jul
(2) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: Julius H. <hr...@us...> - 2007-01-14 17:26:40
|
Update of /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Schema In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv5954/src/net/hep/AGDD/Schema Modified Files: AGDD.xsd Added Files: AGDD0.xsd xml.xsd Log Message: embedded demos included Index: AGDD.xsd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Schema/AGDD.xsd,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** AGDD.xsd 12 Jan 2007 14:18:36 -0000 1.11 --- AGDD.xsd 14 Jan 2007 17:15:22 -0000 1.12 *************** *** 2,5 **** --- 2,8 ---- <!-- $Log$ + Revision 1.12 2007/01/14 17:15:22 hrivnac + embedded demos included + Revision 1.11 2007/01/12 14:18:36 hrivnac new version 0.8.0 started, corresponding to AGDD v8; small changes to XSD *************** *** 75,82 **** <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xml="http://www.w3.org/XML/1998/namespace"> ! <xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="xml.xsd"/> ! <xs:annotation><xs:documentation> <p> --- 78,85 ---- <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xml="http://www.w3.org/XML/1998/namespace"> ! <xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="xml.xsd"/> ! <xs:annotation><xs:documentation> <p> --- NEW FILE: AGDD0.xsd --- <!-- AGDD Schema. --> <!-- Standalone copy of the source AGDD schema. It loads xml.xsd from the network. --> <!-- $Log: AGDD0.xsd,v $ Revision 1.1 2007/01/14 17:15:22 hrivnac embedded demos included Revision 1.11 2007/01/12 14:18:36 hrivnac new version 0.8.0 started, corresponding to AGDD v8; small changes to XSD Revision 1.10 2007/01/11 14:15:28 hrivnac version 0.7.0 Revision 1.9 2006/06/02 15:19:57 hrivnac Color may be invisible Revision 1.8 2006/04/18 21:37:39 hrivnac compositions in BuildingBlocks [...1644 lines suppressed...] <!-- color .................................................................... --> <xs:element name="color"> <xs:annotation> <xs:documentation> Color can be referenced from an abstractSolid. If no color is specified, standard GraXML algorithm (i.e. random colors) is used. </xs:documentation> </xs:annotation> <xs:complexType> <xs:attribute name="name" type="xs:ID" use="required" /> <xs:attribute name="rgb" type="vector3" use="required" /> <xs:attribute name="transparency" type="scalar" default="0.0" /> <xs:attribute name="visible" type="xs:boolean" default="true" /> </xs:complexType> </xs:element> </xs:schema> --- NEW FILE: xml.xsd --- <?xml version='1.0'?> <xs:schema targetNamespace="http://www.w3.org/XML/1998/namespace" xmlns:xs="http://www.w3.org/2001/XMLSchema" xml:lang="en"> <xs:annotation> <xs:documentation> See http://www.w3.org/XML/1998/namespace.html and http://www.w3.org/TR/REC-xml for information about this namespace. This schema document describes the XML namespace, in a form suitable for import by other schema documents. Note that local names in this namespace are intended to be defined only by the World Wide Web Consortium or its subgroups. The following names are currently defined in this namespace and should not be used with conflicting semantics by any Working Group, specification, or document instance: base (as an attribute name): denotes an attribute whose value provides a URI to be used as the base for interpreting any relative URIs in the scope of the element on which it appears; its value is inherited. This name is reserved by virtue of its definition in the XML Base specification. id (as an attribute name): denotes an attribute whose value should be interpreted as if declared to be of type ID. The xml:id specification is not yet a W3C Recommendation, but this attribute is included here to facilitate experimentation with the mechanisms it proposes. Note that it is _not_ included in the specialAttrs attribute group. lang (as an attribute name): denotes an attribute whose value is a language code for the natural language of the content of any element; its value is inherited. This name is reserved by virtue of its definition in the XML specification. space (as an attribute name): denotes an attribute whose value is a keyword indicating what whitespace processing discipline is intended for the content of the element; its value is inherited. This name is reserved by virtue of its definition in the XML specification. Father (in any context at all): denotes Jon Bosak, the chair of the original XML Working Group. This name is reserved by the following decision of the W3C XML Plenary and XML Coordination groups: In appreciation for his vision, leadership and dedication the W3C XML Plenary on this 10th day of February, 2000 reserves for Jon Bosak in perpetuity the XML name xml:Father </xs:documentation> </xs:annotation> <xs:annotation> <xs:documentation>This schema defines attributes and an attribute group suitable for use by schemas wishing to allow xml:base, xml:lang, xml:space or xml:id attributes on elements they define. To enable this, such a schema must import this schema for the XML namespace, e.g. as follows: <schema . . .> . . . <import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/> Subsequently, qualified reference to any of the attributes or the group defined below will have the desired effect, e.g. <type . . .> . . . <attributeGroup ref="xml:specialAttrs"/> will define a type which will schema-validate an instance element with any of those attributes</xs:documentation> </xs:annotation> <xs:annotation> <xs:documentation>In keeping with the XML Schema WG's standard versioning policy, this schema document will persist at http://www.w3.org/2005/08/xml.xsd. At the date of issue it can also be found at http://www.w3.org/2001/xml.xsd. The schema document at that URI may however change in the future, in order to remain compatible with the latest version of XML Schema itself, or with the XML namespace itself. In other words, if the XML Schema or XML namespaces change, the version of this document at http://www.w3.org/2001/xml.xsd will change accordingly; the version at http://www.w3.org/2005/08/xml.xsd will not change. </xs:documentation> </xs:annotation> <xs:attribute name="lang"> <xs:annotation> <xs:documentation>Attempting to install the relevant ISO 2- and 3-letter codes as the enumerated possible values is probably never going to be a realistic possibility. See RFC 3066 at http://www.ietf.org/rfc/rfc3066.txt and the IANA registry at http://www.iana.org/assignments/lang-tag-apps.htm for further information. The union allows for the 'un-declaration' of xml:lang with the empty string.</xs:documentation> </xs:annotation> <xs:simpleType> <xs:union memberTypes="xs:language"> <xs:simpleType> <xs:restriction base="xs:string"> <xs:enumeration value=""/> </xs:restriction> </xs:simpleType> </xs:union> </xs:simpleType> </xs:attribute> <xs:attribute name="space"> <xs:simpleType> <xs:restriction base="xs:NCName"> <xs:enumeration value="default"/> <xs:enumeration value="preserve"/> </xs:restriction> </xs:simpleType> </xs:attribute> <xs:attribute name="base" type="xs:anyURI"> <xs:annotation> <xs:documentation>See http://www.w3.org/TR/xmlbase/ for information about this attribute.</xs:documentation> </xs:annotation> </xs:attribute> <xs:attribute name="id" type="xs:ID"> <xs:annotation> <xs:documentation>See http://www.w3.org/TR/xml-id/ for information about this attribute.</xs:documentation> </xs:annotation> </xs:attribute> <xs:attributeGroup name="specialAttrs"> <xs:attribute ref="xml:base"/> <xs:attribute ref="xml:lang"/> <xs:attribute ref="xml:space"/> </xs:attributeGroup> </xs:schema> |
From: Julius H. <hr...@us...> - 2007-01-14 17:26:40
|
Update of /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv5954/src/net/hep/AGDD/Test/data Added Files: Demo.agdd IncludedBuildingBlockCompositions.agdd Log Message: embedded demos included --- NEW FILE: Demo.agdd --- <?xml version="1.0" encoding="UTF-8"?> <!-- GraXML AGDD Unit Test: Demo --> <!-- Standalone copy of the Solids.agdd. It includes all components in one file. --> <!-- $Log: Demo.agdd,v $ Revision 1.1 2007/01/14 17:15:23 hrivnac embedded demos included --> <!-- @version $Id: Demo.agdd,v 1.1 2007/01/14 17:15:23 hrivnac Exp $ --> <!-- @author Jul...@ce... --> <AGDD DTD_version = "v8" xmlns:xi="http://www.w3.org/2001/XInclude"> <!-- xi:include href="StandardMedia.agdd"/ --> <media version="$Id: Demo.agdd,v 1.1 2007/01/14 17:15:23 hrivnac Exp $" date="2005-11-23" author="Julius Hrivnac" DTD_version="v8"> <medium name="active" material="Iron" color="random" sensitive="true" parameters=""/> <medium name="passive" material="Lead" color="randomTransparent" sensitive="false" parameters=""/> </media> <!-- xi:include href="StandardMaterials.agdd"/ --> <materials version="$Id: Demo.agdd,v 1.1 2007/01/14 17:15:23 hrivnac Exp $" date="2001-10-03" author="Stan Bentvelsen, Julius Hrivnac" DTD_version="v8"> <!-- isotops ================================================================== --> <isotope name="Bor_10" z="5" n="10" a="10"/> <isotope name="Bor_11" z="5" n="11" a="11"/> <!-- elements ================================================================= --> <element symbol="H" ><atom zeff=" 1.0" aweight="1.00797" /></element> <element symbol="D" ><atom zeff=" 1.0" aweight="2.01" /></element> <element symbol="He"><atom zeff=" 2.0" aweight="4.0026" /></element> <element symbol="Li"><atom zeff=" 3.0" aweight="6.9410" /></element> <element symbol="Be"><atom zeff=" 4.0" aweight="9.0122" /></element> <element symbol="C" ><atom zeff=" 6.0" aweight="12.011" /></element> <element symbol="N" ><atom zeff=" 7.0" aweight="14.0067" /></element> <element symbol="O" ><atom zeff=" 8.0" aweight="15.9995" /></element> <element symbol="F" ><atom zeff=" 9.0" aweight="18.9984" /></element> <element symbol="Ne"><atom zeff="10.0" aweight="20.179" /></element> <element symbol="Na"><atom zeff="11.0" aweight="22.9898" /></element> <element symbol="Mg"><atom zeff="12.0" aweight="24.305" /></element> <element symbol="Al"><atom zeff="13.0" aweight="26.9815" /></element> <element symbol="Si"><atom zeff="14.0" aweight="28.086" /></element> <element symbol="P" ><atom zeff="15.0" aweight="30.9738" /></element> <element symbol="S" ><atom zeff="16.0" aweight="32.06" /></element> <element symbol="Cl"><atom zeff="17.0" aweight="35.453" /></element> <element symbol="Ar"><atom zeff="18.0" aweight="39.948" /></element> <element symbol="K" ><atom zeff="19.0" aweight="39.098" /></element> <element symbol="Ca"><atom zeff="20.0" aweight="40.08" /></element> <element symbol="Sc"><atom zeff="21.0" aweight="44.956" /></element> <element symbol="Ti"><atom zeff="22.0" aweight="47.90" /></element> <element symbol="V" ><atom zeff="23.0" aweight="50.9414" /></element> <element symbol="Cr"><atom zeff="24.0" aweight="51.996" /></element> <element symbol="Mn"><atom zeff="25.0" aweight="54.9830" /></element> <element symbol="Fe"><atom zeff="26.0" aweight="55.847" /></element> <element symbol="Co"><atom zeff="27.0" aweight="58.9332" /></element> <element symbol="Ni"><atom zeff="28.0" aweight="58.70" /></element> <element symbol="Cu"><atom zeff="29.0" aweight="63.546" /></element> <element symbol="Zn"><atom zeff="30.0" aweight="65.38" /></element> <element symbol="Ga"><atom zeff="31.0" aweight="69.72" /></element> <element symbol="Ge"><atom zeff="32.0" aweight="72.59" /></element> <element symbol="As"><atom zeff="33.0" aweight="74.9216" /></element> <element symbol="Se"><atom zeff="34.0" aweight="78.96" /></element> <element symbol="Br"><atom zeff="35.0" aweight="79.904" /></element> <element symbol="Kr"><atom zeff="36.0" aweight="83.80" /></element> <element symbol="Rb"><atom zeff="37.0" aweight="85.4678" /></element> <element symbol="Sr"><atom zeff="38.0" aweight="87.62" /></element> <element symbol="Y" ><atom zeff="39.0" aweight="88.909" /></element> <element symbol="Zr"><atom zeff="40.0" aweight="91.22" /></element> <element symbol="Nb"><atom zeff="41.0" aweight="92.9064" /></element> <element symbol="Mo"><atom zeff="42.0" aweight="95.94" /></element> <element symbol="Tc"><atom zeff="43.0" aweight="97" /></element> <element symbol="Ru"><atom zeff="44.0" aweight="101.07" /></element> <element symbol="Rh"><atom zeff="45.0" aweight="102.905" /></element> <element symbol="Pd"><atom zeff="46.0" aweight="106.04" /></element> <element symbol="Ag"><atom zeff="47.0" aweight="107.868" /></element> <element symbol="Cd"><atom zeff="48.0" aweight="112.40" /></element> <element symbol="In"><atom zeff="49.0" aweight="114.82" /></element> <element symbol="Sn"><atom zeff="50.0" aweight="118.69" /></element> <element symbol="Sb"><atom zeff="51.0" aweight="121.75" /></element> <element symbol="Te"><atom zeff="52.0" aweight="127.60" /></element> <element symbol="I" ><atom zeff="53.0" aweight="126.9046"/></element> <element symbol="Xe"><atom zeff="54.0" aweight="131.30" /></element> <element symbol="Cs"><atom zeff="55.0" aweight="132.905" /></element> <element symbol="Ba"><atom zeff="56.0" aweight="137.34" /></element> <element symbol="La"><atom zeff="57.0" aweight="138.91" /></element> <element symbol="Ce"><atom zeff="58.0" aweight="140.12" /></element> <element symbol="Pr"><atom zeff="59.0" aweight="140.908" /></element> <element symbol="Nd"><atom zeff="60.0" aweight="144.24" /></element> <element symbol="Pm"><atom zeff="61.0" aweight="145" /></element> <element symbol="Sm"><atom zeff="62.0" aweight="150.4" /></element> <element symbol="Eu"><atom zeff="63.0" aweight="151.96" /></element> <element symbol="Gd"><atom zeff="64.0" aweight="157.25" /></element> <element symbol="Tb"><atom zeff="65.0" aweight="158.925" /></element> <element symbol="Dy"><atom zeff="66.0" aweight="162.50" /></element> <element symbol="Ho"><atom zeff="67.0" aweight="164.930" /></element> <element symbol="Er"><atom zeff="68.0" aweight="167.26" /></element> <element symbol="Tm"><atom zeff="69.0" aweight="168.934" /></element> <element symbol="Yb"><atom zeff="70.0" aweight="173.04" /></element> <element symbol="Lu"><atom zeff="71.0" aweight="174.97" /></element> <element symbol="Hf"><atom zeff="72.0" aweight="178.49" /></element> <element symbol="Ta"><atom zeff="73.0" aweight="180.948" /></element> <element symbol="W" ><atom zeff="74.0" aweight="183.85" /></element> <element symbol="Re"><atom zeff="75.0" aweight="186.207" /></element> <element symbol="Os"><atom zeff="76.0" aweight="190.2" /></element> <element symbol="Ir"><atom zeff="77.0" aweight="192.22" /></element> <element symbol="Pt"><atom zeff="78.0" aweight="195.09" /></element> <element symbol="Au"><atom zeff="79.0" aweight="196.967" /></element> <element symbol="Hg"><atom zeff="80.0" aweight="200.59" /></element> <element symbol="Tl"><atom zeff="81.0" aweight="204.37" /></element> <element symbol="Pb"><atom zeff="82.0" aweight="207.2" /></element> <element symbol="Bi"><atom zeff="83.0" aweight="208.980" /></element> <element symbol="Po"><atom zeff="84.0" aweight="209" /></element> <element symbol="At"><atom zeff="85.0" aweight="210" /></element> <element symbol="Rn"><atom zeff="86.0" aweight="222" /></element> <element symbol="Fr"><atom zeff="87.0" aweight="223" /></element> <element symbol="Ra"><atom zeff="88.0" aweight="226.03" /></element> <element symbol="Ac"><atom zeff="89.0" aweight="227" /></element> <element symbol="Th"><atom zeff="90.0" aweight="232.038" /></element> <element symbol="Pa"><atom zeff="91.0" aweight="231.038" /></element> <element symbol="U" ><atom zeff="92.0" aweight="238.03" /></element> <element symbol="Np"><atom zeff="93.0" aweight="237.048" /></element> <element symbol="B"> <addisotope name="Bor_10" natoms="2"/> <addisotope name="Bor_11" natoms="8"/> </element> <!-- materials ================================================================ --> <material name="Hydrogen" density="0.0708" state="gas"> <addelement name="H" natoms="1"/> </material> <material name="Deuterium" density="0.162"> <addelement name="D" natoms="1"/> </material> <material name="Helium" density="0.125"> <addelement name="He" natoms="1"/> </material> <material name="Lithium" density="0.534"> <addelement name="Li" natoms="1"/> </material> <material name="Beryllium" density="1.8480"> <addelement name="Be" natoms="1"/> </material> <material name="Boron" density="2.34"> <addelement name="B" natoms="1"/> </material> <material name="Carbon" density="2.2650"> <addelement name="C" natoms="1"/> </material> <material name="Nitrogen" density="0.808"> <addelement name="N" natoms="1"/> </material> <material name="Oxygen" density="0.00143"> <addelement name="O" natoms="1"/> </material> <material name="Fluorine" density="1.1080"> <addelement name="F" natoms="1"/> </material> <material name="Neon" density="1.2070"> <addelement name="Ne" natoms="1"/> </material> <material name="Sodium" density="0.969"> <addelement name="Na" natoms="1"/> </material> <material name="Magnesium" density="1.735"> <addelement name="Mg" natoms="1"/> </material> <material name="Aluminum" density="2.700"> <addelement name="Al" natoms="1"/> </material> <material name="Silicon" density="2.33"> <addelement name="Si" natoms="1"/> </material> <material name="Phosphorus" density="1.82"> <addelement name="P" natoms="1"/> </material> <material name="Sulfur" density="2.07"> <addelement name="S" natoms="1"/> </material> <material name="Chlorine" density="1.56"> <addelement name="Cl" natoms="1"/> </material> <material name="Argon" density="0.001639"> <addelement name="Ar" natoms="1"/> </material> <material name="Potassium" density="0.860"> <addelement name="K" natoms="1"/> </material> <material name="Calcium" density="1.55"> <addelement name="Ca" natoms="1"/> </material> <material name="Scandium" density="2.98"> <addelement name="Sc" natoms="1"/> </material> <material name="Titanium" density="4.53"> <addelement name="Ti" natoms="1"/> </material> <material name="Vanadium" density="6.10"> <addelement name="V" natoms="1"/> </material> <material name="Chromium" density="7.18"> <addelement name="Cr" natoms="1"/> </material> <material name="Manganese" density="7.43"> <addelement name="Mn" natoms="1"/> </material> <material name="Iron" density="7.87"> <addelement name="Fe" natoms="1"/> </material> <material name="Cobalt" density="8.90"> <addelement name="Co" natoms="1"/> </material> <material name="Nickel" density="8.876"> <addelement name="Ni" natoms="1"/> </material> <material name="Copper" density="8.96"> <addelement name="Cu" natoms="1"/> </material> <material name="Zinc" density="7.112"> <addelement name="Zn" natoms="1"/> </material> <material name="Gallium" density="5.877"> <addelement name="Ga" natoms="1"/> </material> <material name="Germanium" density="5.3230"> <addelement name="Ge" natoms="1"/> </material> <material name="Arsenic" density="5.72"> <addelement name="As" natoms="1"/> </material> <material name="Selenium" density="4.78"> <addelement name="Se" natoms="1"/> </material> <material name="Bromine" density="3.11"> <addelement name="Br" natoms="1"/> </material> <material name="Krypton" density="2.60"> <addelement name="Kr" natoms="1"/> </material> <material name="Rubidium" density="1.529"> <addelement name="Rb" natoms="1"/> </material> <material name="Strontium" density="2.54"> <addelement name="Sr" natoms="1"/> </material> <material name="Yttrium" density="4.456"> <addelement name="Y" natoms="1"/> </material> <material name="Zirconium" density="6.494"> <addelement name="Zr" natoms="1"/> </material> <material name="Niobium" density="8.55"> <addelement name="Nb" natoms="1"/> </material> <material name="Molybdenum" density="10.20"> <addelement name="Mo" natoms="1"/> </material> <material name="Technetium" density="11.48"> <addelement name="Tc" natoms="1"/> </material> <material name="Ruthenium" density="12.39"> <addelement name="Ru" natoms="1"/> </material> <material name="Rhodium" density="12.39"> <addelement name="Rh" natoms="1"/> </material> <material name="Palladium" density="12.00"> <addelement name="Pd" natoms="1"/> </material> <material name="Silver" density="10.48"> <addelement name="Ag" natoms="1"/> </material> <material name="Cadmium" density="8.63"> <addelement name="Cd" natoms="1"/> </material> <material name="Indium" density="7.30"> <addelement name="In" natoms="1"/> </material> <material name="Tin" density="7.31"> <addelement name="Sn" natoms="1"/> </material> <material name="Antimony" density="6.679"> <addelement name="Sb" natoms="1"/> </material> <material name="Tellurium" density="6.23"> <addelement name="Te" natoms="1"/> </material> <material name="Iodine" density="7.30"> <addelement name="I" natoms="1"/> </material> <material name="Xenon" density="3.057"> <addelement name="Xe" natoms="1"/> </material> <material name="Cesium" density="1.870"> <addelement name="Cs" natoms="1"/> </material> <material name="Barium" density="3.50"> <addelement name="Ba" natoms="1"/> </material> <material name="Larthanum" density="6.127"> <addelement name="La" natoms="1"/> </material> <material name="Cerium" density="6.637"> <addelement name="Ce" natoms="1"/> </material> <material name="Tungsten" density="19.3"> <addelement name="W" natoms="1"/> </material> <material name="Gold" density="18.85"> <addelement name="Au" natoms="1"/> </material> <material name="Lead" density="11.35"> <addelement name="Pb" natoms="1"/> </material> <material name="Bismuth" density="9.37"> <addelement name="Bi" natoms="1"/> </material> <material name="Uranium" density="18.950"> <addelement name="U" natoms="1"/> </material> <material name="Air" density="0.001214"> <addelement name="N" natoms="0.7494"/> <addelement name="O" natoms="0.2369"/> <addelement name="Ar" natoms="0.0129"/> <addelement name="H" natoms="0.0008"/> </material> <material name="Vacuum" zeff="1.0e-15" aweight="1.0e-15" density="1.0e-15" x0="1.0e+17" lambda="1.0e+17"> </material> </materials> <!-- xi:include href="StandardColors.agdd"/ --> <colormap version="$Id: Demo.agdd,v 1.1 2007/01/14 17:15:23 hrivnac Exp $" date="2005-10-07" author="Julius Hrivnac" DTD_version="v8"> <!-- Standards ================================================================ --> <color name="parametrised" rgb="red; green; blue"/> <color name="random" rgb="256 * Math.random(); 256 * Math.random(); 256 * Math.random()"/> <color name="randomTransparent" rgb="256 * Math.random(); 256 * Math.random(); 256 * Math.random()" transparency="0.5"/> <color name="invisible" rgb="0; 0; 0" visible="false"/> <color name="black" rgb=" 0; 0; 0"/> <color name="blue" rgb=" 0; 0; 255"/> <color name="cyan" rgb=" 0; 255; 255"/> <color name="darkGray" rgb=" 64; 64; 64"/> <color name="gray" rgb="128; 128; 128"/> <color name="green" rgb=" 0; 255; 0"/> <color name="lightGray" rgb="192; 192; 192"/> <color name="magenta" rgb="255; 0; 255"/> <color name="orange" rgb="255; 200; 0"/> <color name="pink" rgb="255; 175; 175"/> <color name="red" rgb="255; 0; 0"/> <color name="white" rgb="255; 255; 255"/> <color name="yellow" rgb="255; 255; 0"/> <!-- Atlantis ================================================================= --> <color name="atlantis_0" rgb=" 0; 204; 255"/> <color name="atlantis_1" rgb=" 0; 0; 0"/> <color name="atlantis_2" rgb="255; 0; 0"/> <color name="atlantis_3" rgb="255; 210; 0"/> <color name="atlantis_4" rgb=" 0; 0; 0"/> <color name="atlantis_5" rgb=" 0; 255; 0"/> <color name="atlantis_6" rgb=" 0; 0; 255"/> <color name="atlantis_7" rgb="153; 153; 153"/> <color name="atlantis_8" rgb="255; 255; 255"/> <color name="atlantis_9" rgb=" 0; 255; 0"/> <color name="atlantis_10" rgb="255; 255; 0"/> <color name="atlantis_11" rgb="255; 115; 0"/> <color name="atlantis_12" rgb="255; 0; 0"/> <color name="atlantis_13" rgb="255; 0; 255"/> <color name="atlantis_14" rgb=" 0; 255; 255"/> <color name="atlantis_15" rgb="102; 128; 255"/> <color name="atlantis_16" rgb="102; 128; 255"/> <!-- Atlantis - Solid ========================================================= --> <color name="solidatlantis_0" rgb=" 0; 255; 255"/> <color name="solidatlantis_1" rgb=" 0; 0; 0"/> <color name="solidatlantis_2" rgb="255; 102; 0"/> <color name="solidatlantis_3" rgb="255; 210; 0"/> <color name="solidatlantis_4" rgb="153; 153; 153"/> <color name="solidatlantis_5" rgb="130; 200; 130"/> <color name="solidatlantis_6" rgb=" 0; 0; 20"/> <color name="solidatlantis_7" rgb="153; 153; 153"/> <color name="solidatlantis_8" rgb="255; 255; 255"/> <color name="solidatlantis_9" rgb=" 0; 255; 0"/> <color name="solidatlantis_10" rgb="255; 255; 0"/> <color name="solidatlantis_11" rgb="255; 115; 0"/> <color name="solidatlantis_12" rgb="255; 0; 0"/> <color name="solidatlantis_13" rgb="255; 0; 255"/> <color name="solidatlantis_14" rgb=" 0; 204; 255"/> <color name="solidatlantis_15" rgb="102; 128; 255"/> <color name="solidatlantis_16" rgb="102; 128; 255"/> </colormap> <section DTD_version = "v8" name = "Solids" version = "$Id: Demo.agdd,v 1.1 2007/01/14 17:15:23 hrivnac Exp $" date = "2005-01-05" author = "Julius Hrivnac" top_volume = "TEST"> <box name="box" medium="active" X_Y_Z="1000; 2000; 8000" /> <trd name="trd" medium="active" Xmp_Ymp_Z="500; 1000; 1000; 2000; 8000" /> <trd name="trd_skewed" medium="active" Xmp_Ymp_Z="500; 1000; 1000; 2000; 8000" inclination="15; 30"/> <tubs name="tubs_full" medium="active" Rio_Z=" 0; 1000; 8000" /> <tubs name="tubs_hole" medium="active" Rio_Z="500; 1000; 8000" /> <tubs name="tubs_angle" medium="active" Rio_Z="500; 1000; 8000" profile="0; 180" /> <cons name="cons_full" medium="active" Rio1_Rio2_Z=" 0; 0; 1000; 1400; 8000" /> <cons name="cons_hole" medium="active" Rio1_Rio2_Z="500; 900; 1000; 1400; 8000" /> <cons name="cons_angle" medium="active" Rio1_Rio2_Z="500; 900; 1000; 1400; 8000" profile="0; 180" /> <composition name="TEST"> <posXYZ X_Y_Z=" 2000; 2000; 0"> <volume name="box" /> </posXYZ> <posXYZ X_Y_Z="-2000; 2000; 0"> <volume name="trd" /> </posXYZ> <posXYZ X_Y_Z="-4000; 4000; 0"> <volume name="trd_skewed"/> </posXYZ> <posXYZ X_Y_Z=" 2000; -2000; 0"> <volume name="tubs_full" /> </posXYZ> <posXYZ X_Y_Z=" 4000; -4000; 0"> <volume name="tubs_hole" /> </posXYZ> <posXYZ X_Y_Z=" 6000; -6000; 0"> <volume name="tubs_angle"/> </posXYZ> <posXYZ X_Y_Z="-2000; -2000; 0"> <volume name="cons_full" /> </posXYZ> <posXYZ X_Y_Z="-4000; -4000; 0"> <volume name="cons_hole" /> </posXYZ> <posXYZ X_Y_Z="-6000; -6000; 0"> <volume name="cons_angle"/> </posXYZ> </composition> </section> </AGDD> --- NEW FILE: IncludedBuildingBlockCompositions.agdd --- <?xml version="1.0" encoding="UTF-8"?> <!-- GraXML AGDD Unit Test: XInclude constituent --> <!-- $Log: IncludedBuildingBlockCompositions.agdd,v $ Revision 1.1 2007/01/14 17:15:23 hrivnac embedded demos included --> <!-- @version $Id: IncludedBuildingBlockCompositions.agdd,v 1.1 2007/01/14 17:15:23 hrivnac Exp $ --> <!-- @author Jul...@ce... --> <buildingBlock> <composition name="comp1"> <var name="var2" value="2000"/> <posXYZ X_Y_Z=" 2*var1; var2; 0"> <volume name="box"/> </posXYZ> <posXYZ X_Y_Z=" 4*var1; var2; 0"> <volume name="box"/> </posXYZ> </composition> <composition name="comp2"> <var name="var2" value="4000"/> <posXYZ X_Y_Z=" 2*var1; var2; 0"> <volume name="box"/> </posXYZ> <posXYZ X_Y_Z=" 4*var2; var2; 0"> <volume name="box"/> </posXYZ> </composition> </buildingBlock> |
From: Julius H. <hr...@us...> - 2007-01-12 14:18:44
|
Update of /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Schema In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv11589/src/net/hep/AGDD/Schema Modified Files: AGDD.xsd Log Message: new version 0.8.0 started, corresponding to AGDD v8; small changes to XSD Index: AGDD.xsd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Schema/AGDD.xsd,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** AGDD.xsd 11 Jan 2007 14:15:28 -0000 1.10 --- AGDD.xsd 12 Jan 2007 14:18:36 -0000 1.11 *************** *** 2,5 **** --- 2,8 ---- <!-- $Log$ + Revision 1.11 2007/01/12 14:18:36 hrivnac + new version 0.8.0 started, corresponding to AGDD v8; small changes to XSD + Revision 1.10 2007/01/11 14:15:28 hrivnac version 0.7.0 *************** *** 83,87 **** Author: <a href="http://home.cern.ch/hrivnac">J.Hrivnac</a>. <br></br> ! Version: v7 ($Id$. </p><p> Following text corresponds to the AGDD.dtd version 4 updated to the version 6 --- 86,90 ---- Author: <a href="http://home.cern.ch/hrivnac">J.Hrivnac</a>. <br></br> ! Version: v8 ($Id$. </p><p> Following text corresponds to the AGDD.dtd version 4 updated to the version 6 *************** *** 148,152 **** <xs:simpleType> <xs:restriction base="xs:string"> ! <xs:enumeration value="v7"/> </xs:restriction> </xs:simpleType> --- 151,155 ---- <xs:simpleType> <xs:restriction base="xs:string"> ! <xs:enumeration value="v8"/> </xs:restriction> </xs:simpleType> *************** *** 186,190 **** <xs:attribute name="name" type="xs:string" use="required"/> <xs:attribute name="version" type="xs:string" use="required"/> ! <xs:attribute name="date" type="xs:string" use="required"/> <xs:attribute name="author" type="xs:string" use="required"/> <xs:attribute name="top_volume" type="xs:IDREF" use="required"/> --- 189,193 ---- <xs:attribute name="name" type="xs:string" use="required"/> <xs:attribute name="version" type="xs:string" use="required"/> ! <xs:attribute name="date" type="xs:date" use="required"/> <xs:attribute name="author" type="xs:string" use="required"/> <xs:attribute name="top_volume" type="xs:IDREF" use="required"/> *************** *** 192,196 **** <xs:simpleType> <xs:restriction base="xs:string"> ! <xs:enumeration value="v7"/> </xs:restriction> </xs:simpleType> --- 195,199 ---- <xs:simpleType> <xs:restriction base="xs:string"> ! <xs:enumeration value="v8"/> </xs:restriction> </xs:simpleType> *************** *** 1489,1493 **** <xs:simpleType> <xs:restriction base="xs:string"> ! <xs:enumeration value="v7"/> </xs:restriction> </xs:simpleType> --- 1492,1496 ---- <xs:simpleType> <xs:restriction base="xs:string"> ! <xs:enumeration value="v8"/> </xs:restriction> </xs:simpleType> *************** *** 1532,1536 **** <xs:simpleType> <xs:restriction base="xs:string"> ! <xs:enumeration value="v7"/> </xs:restriction> </xs:simpleType> --- 1535,1539 ---- <xs:simpleType> <xs:restriction base="xs:string"> ! <xs:enumeration value="v8"/> </xs:restriction> </xs:simpleType> *************** *** 1646,1650 **** <xs:simpleType> <xs:restriction base="xs:string"> ! <xs:enumeration value="v7"/> </xs:restriction> </xs:simpleType> --- 1649,1653 ---- <xs:simpleType> <xs:restriction base="xs:string"> ! <xs:enumeration value="v8"/> </xs:restriction> </xs:simpleType> |
Update of /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv11589/src/net/hep/AGDD/Test/data Modified Files: AliPolys.agdd AliSolids.agdd BinaryOperators.agdd Colors.agdd Copies.agdd Envelopes.agdd Identifiers.agdd Including.agdd MultiplePositioners.agdd ParametrisedColors.agdd Polys.agdd Reflections.agdd Rotations.agdd Shifts.agdd Solids.agdd arrays.agdd foreach.agdd math.agdd positioners.agdd solids.agdd stacks.agdd vars.agdd Log Message: new version 0.8.0 started, corresponding to AGDD v8; small changes to XSD Index: arrays.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data/arrays.agdd,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** arrays.agdd 23 Nov 2005 16:13:10 -0000 1.4 --- arrays.agdd 12 Jan 2007 14:18:37 -0000 1.5 *************** *** 3,6 **** --- 3,9 ---- <!-- $Log$ + Revision 1.5 2007/01/12 14:18:37 hrivnac + new version 0.8.0 started, corresponding to AGDD v8; small changes to XSD + Revision 1.4 2005/11/23 16:13:10 hrivnac media and colors added, buildingBlock added *************** *** 31,35 **** <!-- @author Jul...@ce... --> ! <AGDD DTD_version = "v7" xmlns:xi="http://www.w3.org/2001/XInclude"> --- 34,38 ---- <!-- @author Jul...@ce... --> ! <AGDD DTD_version = "v8" xmlns:xi="http://www.w3.org/2001/XInclude"> *************** *** 38,44 **** <xi:include href="StandardColors.agdd"/> ! <section DTD_version = "v7" author = "C.Arnault, Julius Hrivnac" ! date = "5 January 2005" name = "arrays" top_volume = "TEST" --- 41,47 ---- <xi:include href="StandardColors.agdd"/> ! <section DTD_version = "v8" author = "C.Arnault, Julius Hrivnac" ! date = "2005-01-05" name = "arrays" top_volume = "TEST" Index: BinaryOperators.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data/BinaryOperators.agdd,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** BinaryOperators.agdd 23 Nov 2005 16:13:10 -0000 1.4 --- BinaryOperators.agdd 12 Jan 2007 14:18:37 -0000 1.5 *************** *** 3,6 **** --- 3,9 ---- <!-- $Log$ + Revision 1.5 2007/01/12 14:18:37 hrivnac + new version 0.8.0 started, corresponding to AGDD v8; small changes to XSD + Revision 1.4 2005/11/23 16:13:10 hrivnac media and colors added, buildingBlock added *************** *** 28,32 **** <!-- @author Jul...@ce... --> ! <AGDD DTD_version = "v7" xmlns:xi="http://www.w3.org/2001/XInclude"> --- 31,35 ---- <!-- @author Jul...@ce... --> ! <AGDD DTD_version = "v8" xmlns:xi="http://www.w3.org/2001/XInclude"> *************** *** 35,42 **** <xi:include href="StandardColors.agdd"/> ! <section DTD_version = "v7" name = "BinaryOperators" version = "$Id$" ! date = "5 january 2005" author = "Julius Hrivnac" top_volume = "TEST"> --- 38,45 ---- <xi:include href="StandardColors.agdd"/> ! <section DTD_version = "v8" name = "BinaryOperators" version = "$Id$" ! date = "2005-01-05" author = "Julius Hrivnac" top_volume = "TEST"> Index: vars.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data/vars.agdd,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** vars.agdd 23 Nov 2005 16:13:10 -0000 1.4 --- vars.agdd 12 Jan 2007 14:18:37 -0000 1.5 *************** *** 3,6 **** --- 3,9 ---- <!-- $Log$ + Revision 1.5 2007/01/12 14:18:37 hrivnac + new version 0.8.0 started, corresponding to AGDD v8; small changes to XSD + Revision 1.4 2005/11/23 16:13:10 hrivnac media and colors added, buildingBlock added *************** *** 31,35 **** <!-- @author Jul...@ce... --> ! <AGDD DTD_version = "v7" xmlns:xi="http://www.w3.org/2001/XInclude"> --- 34,38 ---- <!-- @author Jul...@ce... --> ! <AGDD DTD_version = "v8" xmlns:xi="http://www.w3.org/2001/XInclude"> *************** *** 38,44 **** <xi:include href="StandardColors.agdd"/> ! <section DTD_version = "v7" author = "C.Arnault, Julius Hrivnac" ! date = "5 January 2005" name = "vars" top_volume = "TEST" --- 41,47 ---- <xi:include href="StandardColors.agdd"/> ! <section DTD_version = "v8" author = "C.Arnault, Julius Hrivnac" ! date = "2005-1-06" name = "vars" top_volume = "TEST" Index: Rotations.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data/Rotations.agdd,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Rotations.agdd 23 Nov 2005 16:13:10 -0000 1.4 --- Rotations.agdd 12 Jan 2007 14:18:37 -0000 1.5 *************** *** 3,6 **** --- 3,9 ---- <!-- $Log$ + Revision 1.5 2007/01/12 14:18:37 hrivnac + new version 0.8.0 started, corresponding to AGDD v8; small changes to XSD + Revision 1.4 2005/11/23 16:13:10 hrivnac media and colors added, buildingBlock added *************** *** 28,32 **** <!-- @author Jul...@ce... --> ! <AGDD DTD_version = "v7" xmlns:xi="http://www.w3.org/2001/XInclude"> --- 31,35 ---- <!-- @author Jul...@ce... --> ! <AGDD DTD_version = "v8" xmlns:xi="http://www.w3.org/2001/XInclude"> *************** *** 35,42 **** <xi:include href="StandardColors.agdd"/> ! <section DTD_version = "v7" name = "Rotations" version = "$Id$" ! date = "5 January 2005" author = "Julius Hrivnac" top_volume = "TEST"> --- 38,45 ---- <xi:include href="StandardColors.agdd"/> ! <section DTD_version = "v8" name = "Rotations" version = "$Id$" ! date = "2005-01-05" author = "Julius Hrivnac" top_volume = "TEST"> Index: AliPolys.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data/AliPolys.agdd,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** AliPolys.agdd 23 Nov 2005 16:13:10 -0000 1.4 --- AliPolys.agdd 12 Jan 2007 14:18:36 -0000 1.5 *************** *** 3,6 **** --- 3,9 ---- <!-- $Log$ + Revision 1.5 2007/01/12 14:18:36 hrivnac + new version 0.8.0 started, corresponding to AGDD v8; small changes to XSD + Revision 1.4 2005/11/23 16:13:10 hrivnac media and colors added, buildingBlock added *************** *** 28,32 **** <!-- @author Jul...@ce... --> ! <AGDD DTD_version = "v7" xmlns:xi="http://www.w3.org/2001/XInclude"> --- 31,35 ---- <!-- @author Jul...@ce... --> ! <AGDD DTD_version = "v8" xmlns:xi="http://www.w3.org/2001/XInclude"> *************** *** 35,42 **** <xi:include href="StandardColors.agdd"/> ! <section DTD_version = "v7" name = "AliPolys" version = "$Id$" ! date = "5 January 2005" author = "Julius Hrivnac" top_volume = "TEST"> --- 38,45 ---- <xi:include href="StandardColors.agdd"/> ! <section DTD_version = "v8" name = "AliPolys" version = "$Id$" ! date = "2005-01-05" author = "Julius Hrivnac" top_volume = "TEST"> Index: Including.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data/Including.agdd,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Including.agdd 18 Apr 2006 21:37:39 -0000 1.6 --- Including.agdd 12 Jan 2007 14:18:37 -0000 1.7 *************** *** 3,6 **** --- 3,9 ---- <!-- $Log$ + Revision 1.7 2007/01/12 14:18:37 hrivnac + new version 0.8.0 started, corresponding to AGDD v8; small changes to XSD + Revision 1.6 2006/04/18 21:37:39 hrivnac compositions in BuildingBlocks *************** *** 28,32 **** <!-- @author Jul...@ce... --> ! <AGDD DTD_version = "v7" xmlns:xi="http://www.w3.org/2001/XInclude"> --- 31,35 ---- <!-- @author Jul...@ce... --> ! <AGDD DTD_version = "v8" xmlns:xi="http://www.w3.org/2001/XInclude"> *************** *** 35,42 **** <xi:include href="StandardColors.agdd"/> ! <section DTD_version = "v7" name = "Solids" version = "$Id$" ! date = "16 February 2005" author = "Julius Hrivnac" top_volume = "TEST"> --- 38,45 ---- <xi:include href="StandardColors.agdd"/> ! <section DTD_version = "v8" name = "Solids" version = "$Id$" ! date = "2005-02-16" author = "Julius Hrivnac" top_volume = "TEST"> Index: AliSolids.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data/AliSolids.agdd,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** AliSolids.agdd 23 Nov 2005 16:13:10 -0000 1.4 --- AliSolids.agdd 12 Jan 2007 14:18:37 -0000 1.5 *************** *** 3,6 **** --- 3,9 ---- <!-- $Log$ + Revision 1.5 2007/01/12 14:18:37 hrivnac + new version 0.8.0 started, corresponding to AGDD v8; small changes to XSD + Revision 1.4 2005/11/23 16:13:10 hrivnac media and colors added, buildingBlock added *************** *** 28,32 **** <!-- @author Jul...@ce... --> ! <AGDD DTD_version = "v7" xmlns:xi="http://www.w3.org/2001/XInclude"> --- 31,35 ---- <!-- @author Jul...@ce... --> ! <AGDD DTD_version = "v8" xmlns:xi="http://www.w3.org/2001/XInclude"> *************** *** 35,42 **** <xi:include href="StandardColors.agdd"/> ! <section DTD_version = "v7" name = "AliSolids" version = "$Id$" ! date = "5 January 2005" author = "Julius Hrivnac" top_volume = "TEST"> --- 38,45 ---- <xi:include href="StandardColors.agdd"/> ! <section DTD_version = "v8" name = "AliSolids" version = "$Id$" ! date = "2005-01-05" author = "Julius Hrivnac" top_volume = "TEST"> Index: Solids.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data/Solids.agdd,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Solids.agdd 23 Nov 2005 16:13:10 -0000 1.4 --- Solids.agdd 12 Jan 2007 14:18:37 -0000 1.5 *************** *** 3,6 **** --- 3,9 ---- <!-- $Log$ + Revision 1.5 2007/01/12 14:18:37 hrivnac + new version 0.8.0 started, corresponding to AGDD v8; small changes to XSD + Revision 1.4 2005/11/23 16:13:10 hrivnac media and colors added, buildingBlock added *************** *** 31,35 **** <!-- @author Jul...@ce... --> ! <AGDD DTD_version = "v7" xmlns:xi="http://www.w3.org/2001/XInclude"> --- 34,38 ---- <!-- @author Jul...@ce... --> ! <AGDD DTD_version = "v8" xmlns:xi="http://www.w3.org/2001/XInclude"> *************** *** 38,45 **** <xi:include href="StandardColors.agdd"/> ! <section DTD_version = "v7" name = "Solids" version = "$Id$" ! date = "5 January 2005" author = "Julius Hrivnac" top_volume = "TEST"> --- 41,48 ---- <xi:include href="StandardColors.agdd"/> ! <section DTD_version = "v8" name = "Solids" version = "$Id$" ! date = "2005-01-05" author = "Julius Hrivnac" top_volume = "TEST"> Index: Identifiers.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data/Identifiers.agdd,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Identifiers.agdd 20 Sep 2006 14:17:48 -0000 1.5 --- Identifiers.agdd 12 Jan 2007 14:18:37 -0000 1.6 *************** *** 3,6 **** --- 3,9 ---- <!-- $Log$ + Revision 1.6 2007/01/12 14:18:37 hrivnac + new version 0.8.0 started, corresponding to AGDD v8; small changes to XSD + Revision 1.5 2006/09/20 14:17:48 hrivnac multiple identifiers per postioner possible *************** *** 19,23 **** <!-- @author Jul...@ce... --> ! <AGDD DTD_version = "v7" xmlns:xi="http://www.w3.org/2001/XInclude"> --- 22,26 ---- <!-- @author Jul...@ce... --> ! <AGDD DTD_version = "v8" xmlns:xi="http://www.w3.org/2001/XInclude"> *************** *** 26,33 **** <xi:include href="StandardColors.agdd"/> ! <section DTD_version = "v7" name = "Identifiers" version = "$Id$" ! date = "5 October 2005" author = "Julius Hrivnac" top_volume = "TEST"> --- 29,36 ---- <xi:include href="StandardColors.agdd"/> ! <section DTD_version = "v8" name = "Identifiers" version = "$Id$" ! date = "2005-10-05" author = "Julius Hrivnac" top_volume = "TEST"> Index: MultiplePositioners.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data/MultiplePositioners.agdd,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MultiplePositioners.agdd 23 Nov 2005 16:13:10 -0000 1.4 --- MultiplePositioners.agdd 12 Jan 2007 14:18:37 -0000 1.5 *************** *** 3,6 **** --- 3,9 ---- <!-- $Log$ + Revision 1.5 2007/01/12 14:18:37 hrivnac + new version 0.8.0 started, corresponding to AGDD v8; small changes to XSD + Revision 1.4 2005/11/23 16:13:10 hrivnac media and colors added, buildingBlock added *************** *** 31,35 **** <!-- @author Jul...@ce... --> ! <AGDD DTD_version = "v7" xmlns:xi="http://www.w3.org/2001/XInclude"> --- 34,38 ---- <!-- @author Jul...@ce... --> ! <AGDD DTD_version = "v8" xmlns:xi="http://www.w3.org/2001/XInclude"> *************** *** 38,45 **** <xi:include href="StandardColors.agdd"/> ! <section DTD_version = "v7" name = "MultiplePositioners" version = "$Id$" ! date = "5 January 2005" author = "Julius Hrivnac" top_volume = "TEST"> --- 41,48 ---- <xi:include href="StandardColors.agdd"/> ! <section DTD_version = "v8" name = "MultiplePositioners" version = "$Id$" ! date = "2005-01-05" author = "Julius Hrivnac" top_volume = "TEST"> Index: Shifts.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data/Shifts.agdd,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Shifts.agdd 23 Nov 2005 16:13:10 -0000 1.4 --- Shifts.agdd 12 Jan 2007 14:18:37 -0000 1.5 *************** *** 3,6 **** --- 3,9 ---- <!-- $Log$ + Revision 1.5 2007/01/12 14:18:37 hrivnac + new version 0.8.0 started, corresponding to AGDD v8; small changes to XSD + Revision 1.4 2005/11/23 16:13:10 hrivnac media and colors added, buildingBlock added *************** *** 28,32 **** <!-- @author Jul...@ce... --> ! <AGDD DTD_version = "v7" xmlns:xi="http://www.w3.org/2001/XInclude"> --- 31,35 ---- <!-- @author Jul...@ce... --> ! <AGDD DTD_version = "v8" xmlns:xi="http://www.w3.org/2001/XInclude"> *************** *** 35,42 **** <xi:include href="StandardColors.agdd"/> ! <section DTD_version = "v7" name = "Shifts" version = "$Id$" ! date = "5 January 2005" author = "Julius Hrivnac" top_volume = "TEST"> --- 38,45 ---- <xi:include href="StandardColors.agdd"/> ! <section DTD_version = "v8" name = "Shifts" version = "$Id$" ! date = "2005-01-05" author = "Julius Hrivnac" top_volume = "TEST"> Index: Envelopes.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data/Envelopes.agdd,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Envelopes.agdd 23 Nov 2005 16:13:10 -0000 1.4 --- Envelopes.agdd 12 Jan 2007 14:18:37 -0000 1.5 *************** *** 3,6 **** --- 3,9 ---- <!-- $Log$ + Revision 1.5 2007/01/12 14:18:37 hrivnac + new version 0.8.0 started, corresponding to AGDD v8; small changes to XSD + Revision 1.4 2005/11/23 16:13:10 hrivnac media and colors added, buildingBlock added *************** *** 28,32 **** <!-- @author Jul...@ce... --> ! <AGDD DTD_version = "v7" xmlns:xi="http://www.w3.org/2001/XInclude"> --- 31,35 ---- <!-- @author Jul...@ce... --> ! <AGDD DTD_version = "v8" xmlns:xi="http://www.w3.org/2001/XInclude"> *************** *** 35,42 **** <xi:include href="StandardColors.agdd"/> ! <section DTD_version = "v7" name = "Envelopes" version = "$Id$" ! date = "5 January 2005" author = "Julius Hrivnac" top_volume = "TEST"> --- 38,45 ---- <xi:include href="StandardColors.agdd"/> ! <section DTD_version = "v8" name = "Envelopes" version = "$Id$" ! date = "2005-01-05" author = "Julius Hrivnac" top_volume = "TEST"> Index: Reflections.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data/Reflections.agdd,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Reflections.agdd 23 Nov 2005 16:13:10 -0000 1.4 --- Reflections.agdd 12 Jan 2007 14:18:37 -0000 1.5 *************** *** 3,6 **** --- 3,9 ---- <!-- $Log$ + Revision 1.5 2007/01/12 14:18:37 hrivnac + new version 0.8.0 started, corresponding to AGDD v8; small changes to XSD + Revision 1.4 2005/11/23 16:13:10 hrivnac media and colors added, buildingBlock added *************** *** 28,32 **** <!-- @author Jul...@ce... --> ! <AGDD DTD_version = "v7" xmlns:xi="http://www.w3.org/2001/XInclude"> --- 31,35 ---- <!-- @author Jul...@ce... --> ! <AGDD DTD_version = "v8" xmlns:xi="http://www.w3.org/2001/XInclude"> *************** *** 35,42 **** <xi:include href="StandardColors.agdd"/> ! <section DTD_version = "v7" name = "Reflections" version = "$Id$" ! date = "5 January 2005" author = "Julius Hrivnac" top_volume = "TEST"> --- 38,45 ---- <xi:include href="StandardColors.agdd"/> ! <section DTD_version = "v8" name = "Reflections" version = "$Id$" ! date = "2005-01-05" author = "Julius Hrivnac" top_volume = "TEST"> Index: solids.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data/solids.agdd,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** solids.agdd 23 Nov 2005 16:13:10 -0000 1.4 --- solids.agdd 12 Jan 2007 14:18:37 -0000 1.5 *************** *** 3,6 **** --- 3,9 ---- <!-- $Log$ + Revision 1.5 2007/01/12 14:18:37 hrivnac + new version 0.8.0 started, corresponding to AGDD v8; small changes to XSD + Revision 1.4 2005/11/23 16:13:10 hrivnac media and colors added, buildingBlock added *************** *** 28,32 **** <!-- @author Jul...@ce... --> ! <AGDD DTD_version = "v7" xmlns:xi="http://www.w3.org/2001/XInclude"> --- 31,35 ---- <!-- @author Jul...@ce... --> ! <AGDD DTD_version = "v8" xmlns:xi="http://www.w3.org/2001/XInclude"> *************** *** 35,41 **** <xi:include href="StandardColors.agdd"/> ! <section DTD_version = "v7" author = "C.Arnault, Julius Hrivnac" ! date = "5 January 2005" name = "solids" top_volume = "TEST" --- 38,44 ---- <xi:include href="StandardColors.agdd"/> ! <section DTD_version = "v8" author = "C.Arnault, Julius Hrivnac" ! date = "2005-01-05" name = "solids" top_volume = "TEST" Index: ParametrisedColors.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data/ParametrisedColors.agdd,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ParametrisedColors.agdd 24 Nov 2005 16:10:55 -0000 1.3 --- ParametrisedColors.agdd 12 Jan 2007 14:18:37 -0000 1.4 *************** *** 6,9 **** --- 6,12 ---- <!-- $Log$ + Revision 1.4 2007/01/12 14:18:37 hrivnac + new version 0.8.0 started, corresponding to AGDD v8; small changes to XSD + Revision 1.3 2005/11/24 16:10:55 hrivnac examples up-to-date *************** *** 19,23 **** <!-- @author Jul...@ce... --> ! <AGDD DTD_version = "v7" xmlns:xi="http://www.w3.org/2001/XInclude"> --- 22,26 ---- <!-- @author Jul...@ce... --> ! <AGDD DTD_version = "v8" xmlns:xi="http://www.w3.org/2001/XInclude"> *************** *** 26,33 **** <xi:include href="StandardColors.agdd"/> ! <section DTD_version = "v7" name = "Parametrised Colors" version = "$Id$" ! date = "10 October 2005" author = "Julius Hrivnac" top_volume = "TEST"> --- 29,36 ---- <xi:include href="StandardColors.agdd"/> ! <section DTD_version = "v8" name = "Parametrised Colors" version = "$Id$" ! date = "2005-10-10" author = "Julius Hrivnac" top_volume = "TEST"> Index: Polys.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data/Polys.agdd,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Polys.agdd 23 Nov 2005 16:13:10 -0000 1.4 --- Polys.agdd 12 Jan 2007 14:18:37 -0000 1.5 *************** *** 3,6 **** --- 3,9 ---- <!-- $Log$ + Revision 1.5 2007/01/12 14:18:37 hrivnac + new version 0.8.0 started, corresponding to AGDD v8; small changes to XSD + Revision 1.4 2005/11/23 16:13:10 hrivnac media and colors added, buildingBlock added *************** *** 28,32 **** <!-- @author Jul...@ce... --> ! <AGDD DTD_version = "v7" xmlns:xi="http://www.w3.org/2001/XInclude"> --- 31,35 ---- <!-- @author Jul...@ce... --> ! <AGDD DTD_version = "v8" xmlns:xi="http://www.w3.org/2001/XInclude"> *************** *** 35,42 **** <xi:include href="StandardColors.agdd"/> ! <section DTD_version = "v7" name = "Polys" version = "$Id$" ! date = "5 January 2005" author = "Julius Hrivnac" top_volume = "TEST"> --- 38,45 ---- <xi:include href="StandardColors.agdd"/> ! <section DTD_version = "v8" name = "Polys" version = "$Id$" ! date = "2005-01-05" author = "Julius Hrivnac" top_volume = "TEST"> Index: math.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data/math.agdd,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** math.agdd 23 Nov 2005 16:13:10 -0000 1.4 --- math.agdd 12 Jan 2007 14:18:37 -0000 1.5 *************** *** 3,6 **** --- 3,9 ---- <!-- $Log$ + Revision 1.5 2007/01/12 14:18:37 hrivnac + new version 0.8.0 started, corresponding to AGDD v8; small changes to XSD + Revision 1.4 2005/11/23 16:13:10 hrivnac media and colors added, buildingBlock added *************** *** 28,32 **** <!-- @author Jul...@ce... --> ! <AGDD DTD_version = "v7" xmlns:xi="http://www.w3.org/2001/XInclude"> --- 31,35 ---- <!-- @author Jul...@ce... --> ! <AGDD DTD_version = "v8" xmlns:xi="http://www.w3.org/2001/XInclude"> *************** *** 35,41 **** <xi:include href="StandardColors.agdd"/> ! <section DTD_version = "v7" author = "C.Arnault, Julius Hrivnac" ! date = "5 January 2005" name = "math" top_volume = "TEST" --- 38,44 ---- <xi:include href="StandardColors.agdd"/> ! <section DTD_version = "v8" author = "C.Arnault, Julius Hrivnac" ! date = "2005-01-05" name = "math" top_volume = "TEST" Index: foreach.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data/foreach.agdd,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** foreach.agdd 23 Nov 2005 16:13:10 -0000 1.4 --- foreach.agdd 12 Jan 2007 14:18:37 -0000 1.5 *************** *** 3,6 **** --- 3,9 ---- <!-- $Log$ + Revision 1.5 2007/01/12 14:18:37 hrivnac + new version 0.8.0 started, corresponding to AGDD v8; small changes to XSD + Revision 1.4 2005/11/23 16:13:10 hrivnac media and colors added, buildingBlock added *************** *** 22,26 **** <!-- @author Jul...@ce... --> ! <AGDD DTD_version = "v7" xmlns:xi="http://www.w3.org/2001/XInclude"> --- 25,29 ---- <!-- @author Jul...@ce... --> ! <AGDD DTD_version = "v8" xmlns:xi="http://www.w3.org/2001/XInclude"> *************** *** 29,35 **** <xi:include href="StandardColors.agdd"/> ! <section DTD_version = "v7" author = "Julius Hrivnac" ! date = "13 February 2005" name = "foreach" top_volume = "TEST" --- 32,38 ---- <xi:include href="StandardColors.agdd"/> ! <section DTD_version = "v8" author = "Julius Hrivnac" ! date = "2005-02-13" name = "foreach" top_volume = "TEST" Index: positioners.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data/positioners.agdd,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** positioners.agdd 23 Nov 2005 16:13:10 -0000 1.4 --- positioners.agdd 12 Jan 2007 14:18:37 -0000 1.5 *************** *** 3,6 **** --- 3,9 ---- <!-- $Log$ + Revision 1.5 2007/01/12 14:18:37 hrivnac + new version 0.8.0 started, corresponding to AGDD v8; small changes to XSD + Revision 1.4 2005/11/23 16:13:10 hrivnac media and colors added, buildingBlock added *************** *** 31,35 **** <!-- @author Jul...@ce... --> ! <AGDD DTD_version = "v7" xmlns:xi="http://www.w3.org/2001/XInclude"> --- 34,38 ---- <!-- @author Jul...@ce... --> ! <AGDD DTD_version = "v8" xmlns:xi="http://www.w3.org/2001/XInclude"> *************** *** 38,44 **** <xi:include href="StandardColors.agdd"/> ! <section DTD_version = "v7" author = "C.Arnault, Julius Hrivnac" ! date = "5 January 2005" name = "positioners" top_volume = "TEST" --- 41,47 ---- <xi:include href="StandardColors.agdd"/> ! <section DTD_version = "v8" author = "C.Arnault, Julius Hrivnac" ! date = "2005-01-05" name = "positioners" top_volume = "TEST" Index: Copies.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data/Copies.agdd,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Copies.agdd 23 Nov 2005 16:13:10 -0000 1.4 --- Copies.agdd 12 Jan 2007 14:18:37 -0000 1.5 *************** *** 3,6 **** --- 3,9 ---- <!-- $Log$ + Revision 1.5 2007/01/12 14:18:37 hrivnac + new version 0.8.0 started, corresponding to AGDD v8; small changes to XSD + Revision 1.4 2005/11/23 16:13:10 hrivnac media and colors added, buildingBlock added *************** *** 28,32 **** <!-- @author Jul...@ce... --> ! <AGDD DTD_version = "v7" xmlns:xi="http://www.w3.org/2001/XInclude"> --- 31,35 ---- <!-- @author Jul...@ce... --> ! <AGDD DTD_version = "v8" xmlns:xi="http://www.w3.org/2001/XInclude"> *************** *** 35,42 **** <xi:include href="StandardColors.agdd"/> ! <section DTD_version = "v7" name = "Copies" version = "$Id$" ! date = "5 January 2005" author = "Julius Hrivnac" top_volume = "TEST"> --- 38,45 ---- <xi:include href="StandardColors.agdd"/> ! <section DTD_version = "v8" name = "Copies" version = "$Id$" ! date = "2005-01-05" author = "Julius Hrivnac" top_volume = "TEST"> Index: stacks.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data/stacks.agdd,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** stacks.agdd 23 Nov 2005 16:13:10 -0000 1.4 --- stacks.agdd 12 Jan 2007 14:18:37 -0000 1.5 *************** *** 3,6 **** --- 3,9 ---- <!-- $Log$ + Revision 1.5 2007/01/12 14:18:37 hrivnac + new version 0.8.0 started, corresponding to AGDD v8; small changes to XSD + Revision 1.4 2005/11/23 16:13:10 hrivnac media and colors added, buildingBlock added *************** *** 28,32 **** <!-- @author Jul...@ce... --> ! <AGDD DTD_version = "v7" xmlns:xi="http://www.w3.org/2001/XInclude"> --- 31,35 ---- <!-- @author Jul...@ce... --> ! <AGDD DTD_version = "v8" xmlns:xi="http://www.w3.org/2001/XInclude"> *************** *** 35,41 **** <xi:include href="StandardColors.agdd"/> ! <section DTD_version = "v7" author = "C.Arnault, Julius Hrivnac" ! date = "5 January 2005" name = "stacks" top_volume = "TEST" --- 38,44 ---- <xi:include href="StandardColors.agdd"/> ! <section DTD_version = "v8" author = "C.Arnault, Julius Hrivnac" ! date = "2005-01-05" name = "stacks" top_volume = "TEST" Index: Colors.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data/Colors.agdd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Colors.agdd 23 Nov 2005 16:13:10 -0000 1.2 --- Colors.agdd 12 Jan 2007 14:18:37 -0000 1.3 *************** *** 3,6 **** --- 3,9 ---- <!-- $Log$ + Revision 1.3 2007/01/12 14:18:37 hrivnac + new version 0.8.0 started, corresponding to AGDD v8; small changes to XSD + Revision 1.2 2005/11/23 16:13:10 hrivnac media and colors added, buildingBlock added *************** *** 13,17 **** <!-- @author Jul...@ce... --> ! <AGDD DTD_version = "v7" xmlns:xi="http://www.w3.org/2001/XInclude"> --- 16,20 ---- <!-- @author Jul...@ce... --> ! <AGDD DTD_version = "v8" xmlns:xi="http://www.w3.org/2001/XInclude"> *************** *** 20,27 **** <xi:include href="StandardColors.agdd"/> ! <section DTD_version = "v7" name = "Colors" version = "$Id$" ! date = "7 September 2005" author = "Julius Hrivnac" top_volume = "TEST"> --- 23,30 ---- <xi:include href="StandardColors.agdd"/> ! <section DTD_version = "v8" name = "Colors" version = "$Id$" ! date = "2005-09-07" author = "Julius Hrivnac" top_volume = "TEST"> |
From: Julius H. <hr...@us...> - 2007-01-12 14:18:41
|
Update of /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Data In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv11589/src/net/hep/AGDD/Data Modified Files: StandardColors.agdd StandardMaterials.agdd StandardMedia.agdd Log Message: new version 0.8.0 started, corresponding to AGDD v8; small changes to XSD Index: StandardColors.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Data/StandardColors.agdd,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** StandardColors.agdd 2 Jun 2006 15:19:57 -0000 1.7 --- StandardColors.agdd 12 Jan 2007 14:18:36 -0000 1.8 *************** *** 3,6 **** --- 3,9 ---- <!-- $Log$ + Revision 1.8 2007/01/12 14:18:36 hrivnac + new version 0.8.0 started, corresponding to AGDD v8; small changes to XSD + Revision 1.7 2006/06/02 15:19:57 hrivnac Color may be invisible *************** *** 31,35 **** date="2005-10-07" author="Julius Hrivnac" ! DTD_version="v7"> <!-- Standards ================================================================ --> --- 34,38 ---- date="2005-10-07" author="Julius Hrivnac" ! DTD_version="v8"> <!-- Standards ================================================================ --> Index: StandardMaterials.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Data/StandardMaterials.agdd,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** StandardMaterials.agdd 20 Dec 2005 23:54:43 -0000 1.4 --- StandardMaterials.agdd 12 Jan 2007 14:18:36 -0000 1.5 *************** *** 3,6 **** --- 3,9 ---- <!-- $Log$ + Revision 1.5 2007/01/12 14:18:36 hrivnac + new version 0.8.0 started, corresponding to AGDD v8; small changes to XSD + Revision 1.4 2005/12/20 23:54:43 hrivnac standard includes moved *************** *** 25,29 **** date="2001-10-03" author="Stan Bentvelsen, Julius Hrivnac" ! DTD_version="v7"> <!-- isotops ================================================================== --> --- 28,32 ---- date="2001-10-03" author="Stan Bentvelsen, Julius Hrivnac" ! DTD_version="v8"> <!-- isotops ================================================================== --> Index: StandardMedia.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Data/StandardMedia.agdd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** StandardMedia.agdd 20 Dec 2005 23:54:43 -0000 1.1 --- StandardMedia.agdd 12 Jan 2007 14:18:36 -0000 1.2 *************** *** 3,6 **** --- 3,9 ---- <!-- $Log$ + Revision 1.2 2007/01/12 14:18:36 hrivnac + new version 0.8.0 started, corresponding to AGDD v8; small changes to XSD + Revision 1.1 2005/12/20 23:54:43 hrivnac standard includes moved *************** *** 16,20 **** date="2005-11-23" author="Julius Hrivnac" ! DTD_version="v7"> <medium name="active" material="Iron" color="random" sensitive="true" parameters=""/> --- 19,23 ---- date="2005-11-23" author="Julius Hrivnac" ! DTD_version="v8"> <medium name="active" material="Iron" color="random" sensitive="true" parameters=""/> |
From: Julius H. <hr...@us...> - 2007-01-12 14:18:41
|
Update of /cvsroot/graxml/DetDescr/AGDD/ant In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv11589/ant Modified Files: ToDo.txt build.xml Log Message: new version 0.8.0 started, corresponding to AGDD v8; small changes to XSD Index: ToDo.txt =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/ant/ToDo.txt,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ToDo.txt 11 Jan 2007 14:15:28 -0000 1.4 --- ToDo.txt 12 Jan 2007 14:18:35 -0000 1.5 *************** *** 8,12 **** - Reflective volumes ? - date in AGDD is the date (as in materials) - - section doesn't have to have DTD_version - Standardmaterials.agdd and Included.agdd should not be tested --- 8,11 ---- Index: build.xml =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/ant/build.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** build.xml 11 Jan 2007 14:15:28 -0000 1.10 --- build.xml 12 Jan 2007 14:18:36 -0000 1.11 *************** *** 12,16 **** <property name="env.ANT_SITE" value="dist"/> <property file="ant/config-${env.ANT_SITE}.properties"/> ! <property name="version" value="0.7.0"/> <path id="classpath.build"> --- 12,16 ---- <property name="env.ANT_SITE" value="dist"/> <property file="ant/config-${env.ANT_SITE}.properties"/> ! <property name="version" value="0.8.0"/> <path id="classpath.build"> |
From: Julius H. <hr...@us...> - 2007-01-12 14:18:41
|
Update of /cvsroot/graxml/DetDescr/AGDD/src In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv11589/src Modified Files: index.html Log Message: new version 0.8.0 started, corresponding to AGDD v8; small changes to XSD Index: index.html =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/index.html,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** index.html 11 Jan 2007 14:15:28 -0000 1.20 --- index.html 12 Jan 2007 14:18:36 -0000 1.21 *************** *** 141,144 **** --- 141,158 ---- </ul> </li> + <li><u>0.8.0:</u> + <ul> + <li>New features: + <ul> + <li>Supports AGDD v8.</li> + </ul> + </li> + <li>Bug fixes: + <ul> + <li>***</li> + </ul> + </li> + </ul> + </li> </ul> <h2>Related Develoment</h2> |
From: Julius H. <hr...@us...> - 2007-01-11 14:23:26
|
Update of /cvsroot/graxml/DetDescr/GDML/src/net/hep/geant4/GDML/GeometricModel In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv3650/src/net/hep/geant4/GDML/GeometricModel Modified Files: Solid.java Log Message: version 0.5.3 Index: Solid.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/GDML/src/net/hep/geant4/GDML/GeometricModel/Solid.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Solid.java 30 Mar 2005 13:51:16 -0000 1.1 --- Solid.java 11 Jan 2007 14:23:21 -0000 1.2 *************** *** 30,33 **** --- 30,36 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/11 14:23:21 hrivnac + * version 0.5.3 + * * Revision 1.1 2005/03/30 13:51:16 hrivnac * GDML added *************** *** 161,165 **** /** Verify if element is already registered in ! * {@link et.hep.graphics.GraXML.Optimisator.OptimisationDB} database, * use it if yes. * @param nameCore The name of the element (without ordering extension). --- 164,168 ---- /** Verify if element is already registered in ! * {@link net.hep.graphics.GraXML.Optimisator.OptimisationDB} database, * use it if yes. * @param nameCore The name of the element (without ordering extension). |
From: Julius H. <hr...@us...> - 2007-01-11 14:23:23
|
Update of /cvsroot/graxml/DetDescr/GDML/ant In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv3650/ant Modified Files: build.xml Log Message: version 0.5.3 Index: build.xml =================================================================== RCS file: /cvsroot/graxml/DetDescr/GDML/ant/build.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** build.xml 23 Dec 2005 00:19:38 -0000 1.6 --- build.xml 11 Jan 2007 14:23:21 -0000 1.7 *************** *** 12,16 **** <property name="env.ANT_SITE" value="dist"/> <property file="ant/config-${env.ANT_SITE}.properties"/> ! <property name="version" value="pre-0.5.3"/> <path id="classpath.build"> --- 12,16 ---- <property name="env.ANT_SITE" value="dist"/> <property file="ant/config-${env.ANT_SITE}.properties"/> ! <property name="version" value="0.5.3"/> <path id="classpath.build"> *************** *** 29,35 **** <pathelement path="${JAXB.impl}"/> <pathelement path="${JAXB.xjc}"/> - <pathelement path="${JWSDP.namespace}"/> <pathelement path="${JWSDP.relax}"/> - <pathelement path="${JWSDP.qname}"/> <pathelement path="${JWSDP.xsd}"/> <pathelement path="${Log4J.core}"/> --- 29,33 ---- *************** *** 79,85 **** <fileset file="${JAXB.impl}"/> <fileset file="${JAXB.xjc}"/> - <fileset file="${JWSDP.namespace}"/> <fileset file="${JWSDP.relax}"/> - <fileset file="${JWSDP.qname}"/> <fileset file="${JWSDP.xsd}"/> <fileset file="${Log4J.core}"/> --- 77,81 ---- |
From: Julius H. <hr...@us...> - 2007-01-11 14:15:33
|
Update of /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Schema In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv595/src/net/hep/AGDD/Schema Modified Files: AGDD.xsd Log Message: version 0.7.0 Index: AGDD.xsd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Schema/AGDD.xsd,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** AGDD.xsd 2 Jun 2006 15:19:57 -0000 1.9 --- AGDD.xsd 11 Jan 2007 14:15:28 -0000 1.10 *************** *** 2,5 **** --- 2,8 ---- <!-- $Log$ + Revision 1.10 2007/01/11 14:15:28 hrivnac + version 0.7.0 + Revision 1.9 2006/06/02 15:19:57 hrivnac Color may be invisible *************** *** 80,84 **** Author: <a href="http://home.cern.ch/hrivnac">J.Hrivnac</a>. <br></br> ! Version: V6 ($Id$). </p><p> Following text corresponds to the AGDD.dtd version 4 updated to the version 6 --- 83,87 ---- Author: <a href="http://home.cern.ch/hrivnac">J.Hrivnac</a>. <br></br> ! Version: v7 ($Id$. </p><p> Following text corresponds to the AGDD.dtd version 4 updated to the version 6 |
From: Julius H. <hr...@us...> - 2007-01-11 14:15:32
|
Update of /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv595/src/net/hep/AGDD/GeometricModel Modified Files: AGDDBuilder.java Solid.java Log Message: version 0.7.0 Index: Solid.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel/Solid.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Solid.java 2 Jun 2006 15:19:57 -0000 1.5 --- Solid.java 11 Jan 2007 14:15:28 -0000 1.6 *************** *** 33,36 **** --- 33,39 ---- * <pre> * $Log$ + * Revision 1.6 2007/01/11 14:15:28 hrivnac + * version 0.7.0 + * * Revision 1.5 2006/06/02 15:19:57 hrivnac * Color may be invisible *************** *** 139,143 **** /** Verify if element is already registered in ! * {@link et.hep.graphics.GraXML.Optimisator.OptimisationDB} database, * use it if yes. * @param nameCore The name of the element (without ordering extension). --- 142,146 ---- /** Verify if element is already registered in ! * {@link net.hep.graphics.GraXML.Optimisator.OptimisationDB} database, * use it if yes. * @param nameCore The name of the element (without ordering extension). Index: AGDDBuilder.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel/AGDDBuilder.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** AGDDBuilder.java 19 Sep 2006 15:28:30 -0000 1.6 --- AGDDBuilder.java 11 Jan 2007 14:15:28 -0000 1.7 *************** *** 30,33 **** --- 30,36 ---- * <pre> * $Log$ + * Revision 1.7 2007/01/11 14:15:28 hrivnac + * version 0.7.0 + * * Revision 1.6 2006/09/19 15:28:30 hrivnac * Identifiers enabled *************** *** 136,140 **** * @param name The name of the colored object. * @param rgb The red, green and blue components within <0; 255>. ! * if null, {@link mMasterBuilder} uses standard strategy.} * @param transparency The level of transparency <0.0; 1.0>. * @return The created {@link Appearance}. */ --- 139,143 ---- * @param name The name of the colored object. * @param rgb The red, green and blue components within <0; 255>. ! * if null, {@link MasterBuilder} uses standard strategy.} * @param transparency The level of transparency <0.0; 1.0>. * @return The created {@link Appearance}. */ |
From: Julius H. <hr...@us...> - 2007-01-11 14:15:32
|
Update of /cvsroot/graxml/DetDescr/AGDD/ant In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv595/ant Modified Files: ToDo.txt build.xml Log Message: version 0.7.0 Index: ToDo.txt =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/ant/ToDo.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ToDo.txt 23 Dec 2005 12:47:47 -0000 1.3 --- ToDo.txt 11 Jan 2007 14:15:28 -0000 1.4 *************** *** 10,11 **** --- 10,12 ---- - section doesn't have to have DTD_version - Standardmaterials.agdd and Included.agdd should not be tested + Index: build.xml =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/ant/build.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** build.xml 23 Dec 2005 12:47:47 -0000 1.9 --- build.xml 11 Jan 2007 14:15:28 -0000 1.10 *************** *** 12,16 **** <property name="env.ANT_SITE" value="dist"/> <property file="ant/config-${env.ANT_SITE}.properties"/> ! <property name="version" value="pre-0.6.1"/> <path id="classpath.build"> --- 12,16 ---- <property name="env.ANT_SITE" value="dist"/> <property file="ant/config-${env.ANT_SITE}.properties"/> ! <property name="version" value="0.7.0"/> <path id="classpath.build"> *************** *** 29,35 **** <pathelement path="${JAXB.impl}"/> <pathelement path="${JAXB.xjc}"/> - <pathelement path="${JWSDP.namespace}"/> <pathelement path="${JWSDP.relax}"/> - <pathelement path="${JWSDP.qname}"/> <pathelement path="${JWSDP.xsd}"/> <pathelement path="${Log4J.core}"/> --- 29,33 ---- *************** *** 83,89 **** <fileset file="${JAXB.impl}"/> <fileset file="${JAXB.xjc}"/> - <fileset file="${JWSDP.namespace}"/> <fileset file="${JWSDP.relax}"/> - <fileset file="${JWSDP.qname}"/> <fileset file="${JWSDP.xsd}"/> <fileset file="${Log4J.core}"/> --- 81,85 ---- |
From: Julius H. <hr...@us...> - 2007-01-11 14:15:32
|
Update of /cvsroot/graxml/DetDescr/AGDD/src In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv595/src Modified Files: index.html Log Message: version 0.7.0 Index: index.html =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/index.html,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** index.html 19 Sep 2006 15:28:30 -0000 1.19 --- index.html 11 Jan 2007 14:15:28 -0000 1.20 *************** *** 120,127 **** </ul> </li> ! <li><u>0.6.1:</u> <ul> <li>New features: <ul> <li>Media and Materials included.<li> <li>Flexible Color specification included.</li> --- 120,128 ---- </ul> </li> ! <li><u>0.7.0:</u> <ul> <li>New features: <ul> + <li>Supports AGDD v7.</li> <li>Media and Materials included.<li> <li>Flexible Color specification included.</li> |
From: Julius H. <hr...@us...> - 2007-01-11 14:08:27
|
Update of /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/GeometricModel/Reps In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv30133/src/net/hep/atlas/graphics/JiveEvent/GeometricModel/Reps Modified Files: STr.java Log Message: version 0.1.3 Index: STr.java =================================================================== RCS file: /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/GeometricModel/Reps/STr.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** STr.java 30 Mar 2005 13:10:21 -0000 1.1 --- STr.java 11 Jan 2007 14:08:22 -0000 1.2 *************** *** 52,55 **** --- 52,58 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/11 14:08:22 hrivnac + * version 0.1.3 + * * Revision 1.1 2005/03/30 13:10:21 hrivnac * JiveEvent introduced *************** *** 217,222 **** /** Set <code>pt</code> cut for text. STrs with smaller pt are described with text. ! * @param ptCut The minimal pt of the STr to have textual description, ! * the default is <code>1.0</code>. * @see #setText . */ public static final void setTextPtCut(float textPtCut) { --- 220,225 ---- /** Set <code>pt</code> cut for text. STrs with smaller pt are described with text. ! * @param textPtCut The minimal pt of the STr to have textual description, ! * the default is <code>1.0</code>. * @see #setText . */ public static final void setTextPtCut(float textPtCut) { |
From: Julius H. <hr...@us...> - 2007-01-11 14:08:23
|
Update of /cvsroot/graxml/Graphics/JiveEvent/ant In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv30133/ant Modified Files: build.xml Log Message: version 0.1.3 Index: build.xml =================================================================== RCS file: /cvsroot/graxml/Graphics/JiveEvent/ant/build.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** build.xml 23 Dec 2005 00:19:05 -0000 1.6 --- build.xml 11 Jan 2007 14:08:21 -0000 1.7 *************** *** 12,16 **** <property name="env.ANT_SITE" value="dist"/> <property file="ant/config-${env.ANT_SITE}.properties"/> ! <property name="version" value="pre-0.1.3"/> <path id="classpath.build"> --- 12,16 ---- <property name="env.ANT_SITE" value="dist"/> <property file="ant/config-${env.ANT_SITE}.properties"/> ! <property name="version" value="0.1.3"/> <path id="classpath.build"> *************** *** 28,34 **** <pathelement path="${JAXB.impl}"/> <pathelement path="${JAXB.xjc}"/> - <pathelement path="${JWSDP.namespace}"/> <pathelement path="${JWSDP.relax}"/> - <pathelement path="${JWSDP.qname}"/> <pathelement path="${JWSDP.xsd}"/> <pathelement path="${Log4J.core}"/> --- 28,32 ---- *************** *** 77,83 **** <fileset file="${JAXB.impl}"/> <fileset file="${JAXB.xjc}"/> - <fileset file="${JWSDP.namespace}"/> <fileset file="${JWSDP.relax}"/> - <fileset file="${JWSDP.qname}"/> <fileset file="${JWSDP.xsd}"/> <fileset file="${Log4J.core}"/> --- 75,79 ---- |
From: Julius H. <hr...@us...> - 2007-01-11 14:02:40
|
Update of /cvsroot/graxml/Graphics/HEP3D/ant In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv27835 Modified Files: build.xml Log Message: version 1.1.3 Index: build.xml =================================================================== RCS file: /cvsroot/graxml/Graphics/HEP3D/ant/build.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** build.xml 8 Sep 2005 21:56:33 -0000 1.4 --- build.xml 11 Jan 2007 14:02:36 -0000 1.5 *************** *** 12,16 **** <property name="env.ANT_SITE" value="dist"/> <property file="ant/config-${env.ANT_SITE}.properties"/> ! <property name="version" value="pre-1.1.3"/> <path id="classpath.build"> --- 12,16 ---- <property name="env.ANT_SITE" value="dist"/> <property file="ant/config-${env.ANT_SITE}.properties"/> ! <property name="version" value="1.1.3"/> <path id="classpath.build"> |
From: Julius H. <hr...@us...> - 2007-01-11 13:57:15
|
Update of /cvsroot/graxml/Graphics/GraXML/ant In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv25418/ant Modified Files: build.xml Log Message: version 3.1.10 Index: build.xml =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/ant/build.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** build.xml 17 Jan 2006 17:39:16 -0000 1.9 --- build.xml 11 Jan 2007 13:57:11 -0000 1.10 *************** *** 12,16 **** <property name="env.ANT_SITE" value="dist"/> <property file="ant/config-${env.ANT_SITE}.properties"/> ! <property name="version" value="pre-3.1.10"/> <path id="classpath.build"> --- 12,16 ---- <property name="env.ANT_SITE" value="dist"/> <property file="ant/config-${env.ANT_SITE}.properties"/> ! <property name="version" value="3.1.10"/> <path id="classpath.build"> |
From: Julius H. <hr...@us...> - 2007-01-11 13:56:59
|
Update of /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/Disconnecter In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv24978/src/net/hep/graphics/GraXML/Disconnecter Modified Files: ConnectionsDB.java Log Message: version 3.1.10 Index: ConnectionsDB.java =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/Disconnecter/ConnectionsDB.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ConnectionsDB.java 30 Mar 2005 12:44:29 -0000 1.1 --- ConnectionsDB.java 11 Jan 2007 13:56:47 -0000 1.2 *************** *** 18,21 **** --- 18,24 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/11 13:56:47 hrivnac + * version 3.1.10 + * * Revision 1.1 2005/03/30 12:44:29 hrivnac * GraXML introduced *************** *** 106,110 **** /** Set detaching levels limit. * @param levelLimit The number of levels to switch on ! * nested {@link DetachableConnection}s., * default is <code>2</code> */ public static final void setLevelLimit(int levelLimit) { --- 109,113 ---- /** Set detaching levels limit. * @param levelLimit The number of levels to switch on ! * nested {@link DetachableConnection}s, * default is <code>2</code> */ public static final void setLevelLimit(int levelLimit) { |
From: Julius H. <hr...@us...> - 2007-01-11 13:56:59
|
Update of /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/Java3DExtensions/Interactivity In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv24978/src/net/hep/graphics/GraXML/Java3DExtensions/Interactivity Modified Files: Interacter.java Log Message: version 3.1.10 Index: Interacter.java =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/Java3DExtensions/Interactivity/Interacter.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Interacter.java 9 Jun 2006 13:09:25 -0000 1.6 --- Interacter.java 11 Jan 2007 13:56:48 -0000 1.7 *************** *** 27,30 **** --- 27,33 ---- * <pre> * $Log$ + * Revision 1.7 2007/01/11 13:56:48 hrivnac + * version 3.1.10 + * * Revision 1.6 2006/06/09 13:09:25 hrivnac * cleaning *************** *** 240,245 **** /** Enable/Disable solid. ! * @param outlined If solid should be enabled, ! * the default is <code>true</code>. */ public static final void setSolid(boolean solid) { _solid = solid; --- 243,248 ---- /** Enable/Disable solid. ! * @param solid If solid should be enabled, ! * the default is <code>true</code>. */ public static final void setSolid(boolean solid) { _solid = solid; |
From: Julius H. <hr...@us...> - 2007-01-11 13:56:58
|
Update of /cvsroot/graxml/Graphics/GraXML/ant In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv24978/ant Modified Files: ToDo.txt Log Message: version 3.1.10 Index: ToDo.txt =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/ant/ToDo.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ToDo.txt 30 Mar 2005 14:37:19 -0000 1.2 --- ToDo.txt 11 Jan 2007 13:56:47 -0000 1.3 *************** *** 1,2 **** --- 1,4 ---- + make section.data xsd:date (it is xs:string now) + unused imports |
From: Julius H. <hr...@us...> - 2007-01-11 13:56:58
|
Update of /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/doc-files In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv24978/src/net/hep/graphics/GraXML/doc-files Modified Files: Guide.html Log Message: version 3.1.10 Index: Guide.html =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/doc-files/Guide.html,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** Guide.html 7 Jun 2006 16:00:22 -0000 1.13 --- Guide.html 11 Jan 2007 13:56:48 -0000 1.14 *************** *** 647,652 **** <li>Animation (rotation).</li> <li>Possibility to save output XML file.</li> - <li>*** Possibility to save binary internal format (so that long Geometric Model - optimisation can be skipped).</li> <li>Interface between Java3D and OpenInventor.</li> <li>Overlap detection.</li> --- 647,650 ---- *************** *** 659,662 **** --- 657,665 ---- <li>Partial optimisation (for subgraph).</li> <li>Optimisation/quality effects documentation.</li> + <li>Possibility to save binary internal format (so that long Geometric Model + optimisation can be skipped).</li> + <li>Building subset of Trees (using "contex" attribute).</li> + <li>Command-line based positioning.</li> + </ul> <u>Found Bugs</u> |
From: Julius H. <hr...@us...> - 2006-09-20 14:17:53
|
Update of /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv1022/net/hep/AGDD/GeometricModel Modified Files: Positioner.java Log Message: multiple identifiers per postioner possible Index: Positioner.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel/Positioner.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Positioner.java 19 Sep 2006 15:28:30 -0000 1.2 --- Positioner.java 20 Sep 2006 14:17:48 -0000 1.3 *************** *** 26,29 **** --- 26,31 ---- import java.util.List; import java.util.ArrayList; + import java.util.Map; + import java.util.HashMap; // Log4J *************** *** 36,39 **** --- 38,44 ---- * <pre> * $Log$ + * Revision 1.3 2006/09/20 14:17:48 hrivnac + * multiple identifiers per postioner possible + * * Revision 1.2 2006/09/19 15:28:30 hrivnac * Identifiers enabled *************** *** 95,109 **** Evaluator evaluator = builder().evaluator(); List<String> variables = new ArrayList<String>(); // - Identifiers first for (Object o : volumes) { if (o instanceof Identifier) { if (!_initialised) { ! _field = ((Identifier)o).getField(); ! _value = evaluator.valueOf(((Identifier)o).getValue(), "1")[0]; ! _initialised = true; } ! _step = evaluator.valueOf(((Identifier)o).getStep(), "1")[0]; } } // - Data and Volumes next for (Object o : volumes) { --- 100,114 ---- Evaluator evaluator = builder().evaluator(); List<String> variables = new ArrayList<String>(); + String message; // - Identifiers first for (Object o : volumes) { if (o instanceof Identifier) { if (!_initialised) { ! _identifiers.put(((Identifier)o).getField(), evaluator.valueOf(((Identifier)o).getValue(), "1")[0]); } ! _steps.put(((Identifier)o).getField(), evaluator.valueOf(((Identifier)o).getStep(), "1")[0]); } } + _initialised = true; // - Data and Volumes next for (Object o : volumes) { *************** *** 117,121 **** if (vv instanceof Element) { builder().traverse((Element)vv, tr, parent); ! log.debug("Assigning Identifier for " + builder().name() + ": " + _field + "=" + _value); } } --- 122,130 ---- if (vv instanceof Element) { builder().traverse((Element)vv, tr, parent); ! message = "Assigning Identifiers for " + builder().name() + ": "; ! for (String field : _identifiers.keySet()) { ! message += "\t" + field + "=" + _identifiers.get(field) + ", "; ! } ! log.debug(message); } } *************** *** 129,154 **** } ! /** Give the name <em>Identifier</em> field. ! * @return The name of the <em>Identifier</em> field. */ ! public String idField() { ! return _field; ! } ! ! /** Give the value of the <em>Identifier</em>. ! * @return The value of the <em>Identifier</em>. */ ! public float idValue() { ! return _value; ! } ! ! /** Add step to the <em>Identifier</em>. */ public void step() { ! _value += _step; } ! private String _field; ! ! private float _value = 0f; ! private float _step = 1f; private boolean _initialised = false; --- 138,154 ---- } ! /** Add step to <em>Identifier</em>s. */ public void step() { ! float value; ! for (String field : _identifiers.keySet()) { ! value = _identifiers.get(field); ! value += _steps.get(field); ! _identifiers.put(field, value); ! } } ! private Map<String, Float> _identifiers = new HashMap<String, Float>(); ! private Map<String, Float> _steps = new HashMap<String, Float>(); private boolean _initialised = false; |
From: Julius H. <hr...@us...> - 2006-09-20 14:17:52
|
Update of /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv1022/net/hep/AGDD/Test/data Modified Files: Identifiers.agdd Log Message: multiple identifiers per postioner possible Index: Identifiers.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data/Identifiers.agdd,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Identifiers.agdd 19 Sep 2006 15:28:30 -0000 1.4 --- Identifiers.agdd 20 Sep 2006 14:17:48 -0000 1.5 *************** *** 3,8 **** <!-- $Log$ ! Revision 1.4 2006/09/19 15:28:30 hrivnac ! Identifiers enabled Revision 1.3 2005/11/23 16:13:10 hrivnac --- 3,8 ---- <!-- $Log$ ! Revision 1.5 2006/09/20 14:17:48 hrivnac ! multiple identifiers per postioner possible Revision 1.3 2005/11/23 16:13:10 hrivnac *************** *** 39,52 **** <composition name="TEST"> <posXYZ X_Y_Z="6000; 6000; 0"> <volume name="box"/> - <identifier field="singleIdentifier" value="0"/> </posXYZ> <posXYZ X_Y_Z="-6000; -6000; 0"> <volume name="box"/> - <identifier field="singleIdentifier" value="var * 2"/> </posXYZ> <mposZ ncopy="3" dZ="2000"> <volume name="box"/> ! <identifier field="multipleIdentifier" value="0" step="2"/> </mposZ> </composition> --- 39,54 ---- <composition name="TEST"> <posXYZ X_Y_Z="6000; 6000; 0"> + <identifier field="firstIdentifier" value="0"/> + <identifier field="secondIdentifier" value="var"/> <volume name="box"/> </posXYZ> <posXYZ X_Y_Z="-6000; -6000; 0"> + <identifier field="thirdIdentifier" value="var * 2"/> <volume name="box"/> </posXYZ> <mposZ ncopy="3" dZ="2000"> <volume name="box"/> ! <identifier field="fourthIdentifier" value="0" step="2"/> ! <identifier field="fifthIdentifier" value="var" step="2"/> </mposZ> </composition> |
From: starXML <st...@us...> - 2006-09-19 18:48:56
|
Update of /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/TGeoModel/Reps In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv4783/DetDescr/AGDD/src/net/hep/AGDD/TGeoModel/Reps Modified Files: AGDDmedium.java Box.java Composition.java Pcon.java Log Message: Waypoint checkin Index: Box.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/TGeoModel/Reps/Box.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Box.java 9 Feb 2006 20:09:47 -0000 1.2 --- Box.java 19 Sep 2006 18:48:52 -0000 1.3 *************** *** 36,39 **** --- 36,42 ---- * <pre> * $Log$ + * Revision 1.3 2006/09/19 18:48:52 starxml + * Waypoint checkin + * * Revision 1.2 2006/02/09 20:09:47 starxml * Updated the code for better structure. Para and Trap still not functional. *************** *** 59,62 **** --- 62,66 ---- BoxType box = (BoxType)element; + // not used: box.isSensitive(); String lUnit = box.getUnitLength(); Index: Pcon.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/TGeoModel/Reps/Pcon.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Pcon.java 8 Feb 2006 22:31:18 -0000 1.1 --- Pcon.java 19 Sep 2006 18:48:52 -0000 1.2 *************** *** 35,38 **** --- 35,41 ---- * <pre> * $Log$ + * Revision 1.2 2006/09/19 18:48:52 starxml + * Waypoint checkin + * * Revision 1.1 2006/02/08 22:31:18 starxml * First cut *************** *** 81,88 **** float[] rioz; ! double[] ri = new double[planes.size()]; ! double[] ro = new double[planes.size()]; ! double[] z = new double[planes.size()]; ! double[] zs = new double[planes.size()]; int i = 0; --- 84,94 ---- float[] rioz; ! int pSize=planes.size(); ! double[] ri = new double[pSize]; ! double[] ro = new double[pSize]; ! // need 3 copies ! double[] z = new double[pSize]; ! double[] zs = new double[pSize]; ! double[] zk = new double[pSize]; int i = 0; *************** *** 92,105 **** ri[i] = rioz[0]; ro[i] = rioz[1]; z[i] = rioz[2]; zs[i] = rioz[2]; i++; } } ! // double delz = (z[z.length - 1] - z[0]) / 2.0; ! // for (int j = 0; j < i; j++) { ! // z[j] -= delz; ! // } --- 98,116 ---- ri[i] = rioz[0]; ro[i] = rioz[1]; + // we have to store 3 copies of that number: + // one for GraXML positioning, one for TGeo positioning and one for the correct key z[i] = rioz[2]; zs[i] = rioz[2]; + zk[i] = rioz[2]; i++; } } ! double delz = (z[z.length - 1] - z[0]) / 2.0; ! for (int j = 0; j < i; j++) { ! z[j] -= delz; ! ! System.out.println("z: "+ z[j]); ! } *************** *** 122,125 **** --- 133,137 ---- String[] Rout = new String[i]; String[] Z = new String[i]; + String[] Zkey = new String[i]; double zOff = (zs[0]+zs[i-1])/2.0; *************** *** 130,136 **** for(int nSec=0;nSec<i;nSec++) { Z[nSec] = evaluator.formatted(zs[nSec]); Rin[nSec] = evaluator.formatted(ri[nSec]); Rout[nSec] = evaluator.formatted(ro[nSec]); ! key+=";"+Rin[nSec]+";"+Rout[nSec]+";"+Z[nSec]; } --- 142,149 ---- for(int nSec=0;nSec<i;nSec++) { Z[nSec] = evaluator.formatted(zs[nSec]); + Zkey[nSec] = evaluator.formatted(zk[nSec]); Rin[nSec] = evaluator.formatted(ri[nSec]); Rout[nSec] = evaluator.formatted(ro[nSec]); ! key+=";"+Rin[nSec]+";"+Rout[nSec]+";"+Zkey[nSec]; } Index: Composition.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/TGeoModel/Reps/Composition.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Composition.java 8 Feb 2006 22:31:18 -0000 1.1 --- Composition.java 19 Sep 2006 18:48:52 -0000 1.2 *************** *** 34,37 **** --- 34,40 ---- * <pre> * $Log$ + * Revision 1.2 2006/09/19 18:48:52 starxml + * Waypoint checkin + * * Revision 1.1 2006/02/08 22:31:18 starxml * First cut *************** *** 119,122 **** --- 122,126 ---- // Pop the parent: String popped = builder.popComp(); // System.out.println("Envelope from stack: "+popped); + builder.ToCompHash(popped,"done"); } Index: AGDDmedium.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/TGeoModel/Reps/AGDDmedium.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AGDDmedium.java 8 Feb 2006 22:31:18 -0000 1.1 --- AGDDmedium.java 19 Sep 2006 18:48:52 -0000 1.2 *************** *** 22,25 **** --- 22,28 ---- * <pre> * $Log$ + * Revision 1.2 2006/09/19 18:48:52 starxml + * Waypoint checkin + * * Revision 1.1 2006/02/08 22:31:18 starxml * First cut *************** *** 41,47 **** Medium medium = (net.hep.AGDD.JAXB.Medium) jaxbSolid.getMedium(); ! setName (medium.getName()); ! setColor (medium.getColor()); ! setMaterial(medium.getMaterial()); } --- 44,51 ---- Medium medium = (net.hep.AGDD.JAXB.Medium) jaxbSolid.getMedium(); ! setName (medium.getName()); ! setColor (medium.getColor()); ! setMaterial (medium.getMaterial()); ! setSensitive(medium.isSensitive()); } |
From: starXML <st...@us...> - 2006-09-19 18:47:10
|
Update of /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/TGeoModel In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv4008/DetDescr/AGDD/src/net/hep/AGDD/TGeoModel Modified Files: Solid.java Log Message: Waypoint checkin Index: Solid.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/TGeoModel/Solid.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Solid.java 8 Feb 2006 21:29:52 -0000 1.1 --- Solid.java 19 Sep 2006 18:47:07 -0000 1.2 *************** *** 43,46 **** --- 43,49 ---- * <pre> * $Log$ + * Revision 1.2 2006/09/19 18:47:07 starxml + * Waypoint checkin + * * Revision 1.1 2006/02/08 21:29:52 starxml * Adding first cut of working components *************** *** 245,249 **** if (AGDDmedium.InHash(_medName)==0) { // only construct if not already have done so Integer medNumber = AGDDmedium.ToHash(_medName); ! System.out.println("Creating medium No."+medNumber.toString()+":"+_medName); AGDDmaterial material = getAGDDmaterial(medium); --- 248,253 ---- if (AGDDmedium.InHash(_medName)==0) { // only construct if not already have done so Integer medNumber = AGDDmedium.ToHash(_medName); ! Integer isvol = medium.isSensitive()?1:0; ! System.out.println("Creating medium No."+medNumber.toString()+":"+_medName+" isvol:"+isvol.toString()); AGDDmaterial material = getAGDDmaterial(medium); *************** *** 259,263 **** } - Integer isvol = medium.isSensitive()?1:0; builder().cxx(medium.ctor(medNumber,_matName,isvol)); } --- 263,266 ---- |