graxml-commit Mailing List for GraXML (Page 15)
Brought to you by:
hrivnac
Menu
▾
▴
graxml-commit — CVS commit notifications of GraXML
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-24 16:59:27
|
Update of /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/Disconnecter In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv25011/net/hep/graphics/GraXML/Disconnecter Modified Files: ConnectionsDB.java Log Message: migrated to JAXB 2.0 Index: ConnectionsDB.java =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/Disconnecter/ConnectionsDB.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ConnectionsDB.java 18 Jan 2007 15:33:12 -0000 1.4 --- ConnectionsDB.java 24 Jan 2007 16:59:25 -0000 1.5 *************** *** 1,4 **** --- 1,6 ---- package net.hep.graphics.GraXML.Disconnecter; + import net.hep.graphics.GraXML.GUI.RootWindow; + // Java import java.util.Map; *************** *** 7,10 **** --- 9,13 ---- // Java3D import javax.media.j3d.BranchGroup; + import javax.media.j3d.RestrictedAccessException; // Log4J *************** *** 18,21 **** --- 21,27 ---- * <pre> * $Log$ + * Revision 1.5 2007/01/24 16:59:25 hrivnac + * migrated to JAXB 2.0 + * * Revision 1.4 2007/01/18 15:33:12 hrivnac * multiple loading possible *************** *** 90,94 **** public final void compile() { for (DetachableConnection connection : _connections.values()) { ! connection.branch().compile(); } } --- 96,105 ---- public final void compile() { for (DetachableConnection connection : _connections.values()) { ! try { ! connection.branch().compile(); ! } ! catch (RestrictedAccessException e) { ! RootWindow.reportException("Cant't compile subgraph", e, log); ! } } } |
|
From: Julius H. <hr...@us...> - 2007-01-24 14:00:41
|
Update of /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/Schema In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv19672/net/hep/atlas/graphics/JiveGeometry/Schema Modified Files: AGeometry.xsd Added Files: AMuonGeometry.dtd Log Message: new geom files added Index: AGeometry.xsd =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/Schema/AGeometry.xsd,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** AGeometry.xsd 22 Jan 2007 17:50:18 -0000 1.3 --- AGeometry.xsd 24 Jan 2007 14:00:36 -0000 1.4 *************** *** 1,7 **** <!-- JiveGeometry Schema. --> <!-- This schema has been semi-automaticaly extracted from Atlantis ! example XML files. --> <!-- $Log$ Revision 1.3 2007/01/22 17:50:18 hrivnac Calo geometry improved --- 1,11 ---- <!-- JiveGeometry Schema. --> <!-- This schema has been semi-automaticaly extracted from Atlantis ! example XML files AGeometry.xml and AMuonGeometry.xml. ! Both DTDs have been merged. --> <!-- $Log$ + Revision 1.4 2007/01/24 14:00:36 hrivnac + new geom files added + Revision 1.3 2007/01/22 17:50:18 hrivnac Calo geometry improved *************** *** 29,32 **** --- 33,39 ---- <xs:element ref="ABarrelTRTDetector"/> <xs:element ref="AEndcapTRTDetector"/> + <xs:element ref="ABox"/> + <xs:element ref="ATBx"/> + <xs:element ref="ATrd"/> </xs:choice> </xs:complexType> *************** *** 233,236 **** --- 240,297 ---- </xs:complexType> </xs:element> + + <xs:element name="ABox"> + <xs:complexType> + <xs:attribute name="n" type="xs:string" use="required"/> + <xs:attribute name="zi" type="xs:double" use="required"/> + <xs:attribute name="zo" type="xs:double" use="required"/> + <xs:attribute name="ri" type="xs:double" use="required"/> + <xs:attribute name="ro" type="xs:double" use="required"/> + <xs:attribute name="w" type="xs:double" use="required"/> + <xs:attribute name="eta" type="xs:double" use="required"/> + <xs:attribute name="phi" type="xs:string" use="required"/> + <xs:attribute name="dphi" type="xs:double" use="required"/> + <xs:attribute name="sh" type="xs:double" use="required"/> + <xs:attribute name="RPCi" type="xs:double" use="required"/> + <xs:attribute name="RPCo" type="xs:double" use="required"/> + </xs:complexType> + </xs:element> + + <xs:element name="ATBx"> + <xs:complexType> + <xs:attribute name="n" type="xs:string" use="required"/> + <xs:attribute name="zi" type="xs:double" use="required"/> + <xs:attribute name="zo" type="xs:double" use="required"/> + <xs:attribute name="ri" type="xs:double" use="required"/> + <xs:attribute name="ro" type="xs:double" use="required"/> + <xs:attribute name="w" type="xs:double" use="required"/> + <xs:attribute name="eta" type="xs:double" use="required"/> + <xs:attribute name="phi" type="xs:string" use="required"/> + <xs:attribute name="dphi" type="xs:double" use="required"/> + <xs:attribute name="sh" type="xs:double" use="required"/> + <xs:attribute name="RPCi" type="xs:double" use="required"/> + <xs:attribute name="RPCo" type="xs:double" use="required"/> + <xs:attribute name="zis" type="xs:double" use="required"/> + <xs:attribute name="zos" type="xs:double" use="required"/> + <xs:attribute name="ws" type="xs:double" use="required"/> + <xs:attribute name="or" type="xs:double" use="required"/> + </xs:complexType> + </xs:element> + + <xs:element name="ATrd"> + <xs:complexType> + <xs:attribute name="n" type="xs:string" use="required"/> + <xs:attribute name="zi" type="xs:double" use="required"/> + <xs:attribute name="zo" type="xs:double" use="required"/> + <xs:attribute name="ri" type="xs:double" use="required"/> + <xs:attribute name="ro" type="xs:double" use="required"/> + <xs:attribute name="wi" type="xs:double" use="required"/> + <xs:attribute name="wo" type="xs:double" use="required"/> + <xs:attribute name="eta" type="xs:double" use="required"/> + <xs:attribute name="phi" type="xs:string" use="required"/> + <xs:attribute name="dphi" type="xs:double" use="required"/> + <xs:attribute name="a" type="xs:double" use="required"/> + </xs:complexType> + </xs:element> </xs:schema> --- NEW FILE: AMuonGeometry.dtd --- <?xml version="1.0"?> <!DOCTYPE AMuonGeometry [ <!ELEMENT AMuonGeometry (section)> <!ELEMENT section (ABox | ATBx | ATrd)*> <!ATTLIST section name CDATA " " version CDATA " " date CDATA " " author CDATA " " top_volume CDATA " " DTD_version CDATA " "> <!ELEMENT ABox EMPTY > <!ATTLIST ABox n CDATA #REQUIRED zi CDATA #REQUIRED zo CDATA #REQUIRED ri CDATA #REQUIRED ro CDATA #REQUIRED w CDATA #REQUIRED eta CDATA #REQUIRED phi CDATA #REQUIRED dphi CDATA "0" sh CDATA "0" RPCi CDATA "0" RPCo CDATA "0"> <!ELEMENT ATBx EMPTY > <!ATTLIST ATBx n CDATA #REQUIRED zi CDATA #REQUIRED zo CDATA #REQUIRED ri CDATA #REQUIRED ro CDATA #REQUIRED w CDATA #REQUIRED eta CDATA #REQUIRED phi CDATA #REQUIRED sh CDATA "0" dphi CDATA "0" RPCi CDATA "0" RPCo CDATA "0" zis CDATA #REQUIRED zos CDATA #REQUIRED ws CDATA #REQUIRED or CDATA "0"> <!ELEMENT ATrd EMPTY > <!ATTLIST ATrd n CDATA #REQUIRED zi CDATA #REQUIRED zo CDATA #REQUIRED ri CDATA #REQUIRED ro CDATA #REQUIRED wi CDATA #REQUIRED wo CDATA #REQUIRED eta CDATA #REQUIRED phi CDATA #REQUIRED dphi CDATA "0" sh CDATA "0" a CDATA "0"> ]> |
|
From: Julius H. <hr...@us...> - 2007-01-24 14:00:40
|
Update of /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/Test/data In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv19672/net/hep/atlas/graphics/JiveGeometry/Test/data Modified Files: AGeometry.xml AGeometryFast.xml Added Files: AMuonGeometry.xml AMuonGeometryTB.xml AMuonGeometry_O_09.xml AMuonGeometry_P_03.xml Log Message: new geom files added --- NEW FILE: AMuonGeometryTB.xml --- <?xml version="1.0"?> <AGeometry> <AGeneralPath p="YX" c="MDT" n="MDT_BIL" numPoints="4"> <APoint x="2358.9" y="-133.575" /> <APoint x="2371.21" y="-133.575" /> <APoint x="2371.21" y="133.575" /> <APoint x="2358.9" y="133.575" /> </AGeneralPath> <AGeneralPath p="RZ" c="MDT" n="MDT_BIL" numPoints="6"> <APoint x="-55.5648" y="2358.9" /> <APoint x="54.063" y="2358.9" /> <APoint x="54.063" y="2362.68" /> <APoint x="54.063" y="2374.97" /> <APoint x="-55.5648" y="2374.97" /> <APoint x="-55.5648" y="2362.68" /> </AGeneralPath> <AGeneralPath p="YX" c="MDT" n="MDT_BIL" numPoints="4"> <APoint x="2388.21" y="-133.575" /> <APoint x="2400.51" y="-133.575" /> <APoint x="2400.51" y="133.575" /> <APoint x="2388.21" y="133.575" /> </AGeneralPath> <AGeneralPath p="RZ" c="MDT" n="MDT_BIL" numPoints="6"> <APoint x="-55.5648" y="2388.21" /> <APoint x="54.063" y="2388.21" /> <APoint x="54.063" y="2391.94" /> <APoint x="54.063" y="2404.23" /> <APoint x="-55.5648" y="2404.23" /> <APoint x="-55.5648" y="2391.94" /> </AGeneralPath> <AGeneralPath p="YX" c="MDT" n="MDT_BIL" numPoints="6"> <APoint x="3359.74" y="-125.321" /> <APoint x="3388.12" y="-125.321" /> <APoint x="3400" y="-125.106" /> <APoint x="3395.5" y="142.003" /> <APoint x="3367.12" y="142.003" /> <APoint x="3355.24" y="141.789" /> </AGeneralPath> <AGeneralPath p="RZ" c="MDT" n="MDT_BIL" numPoints="7"> <APoint x="107.622" y="3357.5" /> <APoint x="110.807" y="3369.39" /> <APoint x="111.41" y="3373.95" /> <APoint x="5.51775" y="3402.3" /> <APoint x="4.31103" y="3398.47" /> <APoint x="1.12627" y="3386.58" /> <APoint x="1.72963" y="3385.87" /> </AGeneralPath> <AGeneralPath p="YX" c="MDT" n="MDT_BIL" numPoints="6"> <APoint x="3388.05" y="-124.809" /> <APoint x="3416.42" y="-124.809" /> <APoint x="3428.31" y="-124.594" /> <APoint x="3423.8" y="142.515" /> <APoint x="3395.43" y="142.515" /> <APoint x="3383.54" y="142.3" /> </AGeneralPath> <AGeneralPath p="RZ" c="MDT" n="MDT_BIL" numPoints="7"> <APoint x="115.206" y="3385.81" /> <APoint x="118.391" y="3397.69" /> <APoint x="118.994" y="3402.21" /> <APoint x="13.1018" y="3430.57" /> <APoint x="11.8951" y="3426.77" /> <APoint x="8.71033" y="3414.88" /> <APoint x="9.31369" y="3414.18" /> </AGeneralPath> <AGeneralPath p="YX" c="MDT" n="MDT_BIL" numPoints="6"> <APoint x="3388.21" y="-125.321" /> <APoint x="3416.59" y="-125.321" /> <APoint x="3428.47" y="-125.106" /> <APoint x="3423.97" y="142.003" /> <APoint x="3395.59" y="142.003" /> <APoint x="3383.71" y="141.789" /> </AGeneralPath> <AGeneralPath p="RZ" c="MDT" n="MDT_BIL" numPoints="7"> <APoint x="1.37" y="3385.97" /> <APoint x="4.55475" y="3397.86" /> <APoint x="5.15811" y="3402.4" /> <APoint x="-100.734" y="3430.75" /> <APoint x="-101.941" y="3426.91" /> <APoint x="-105.126" y="3415.03" /> <APoint x="-104.522" y="3414.34" /> </AGeneralPath> <AGeneralPath p="YX" c="MDT" n="MDT_BIL" numPoints="6"> <APoint x="3416.52" y="-124.809" /> <APoint x="3444.89" y="-124.809" /> <APoint x="3456.78" y="-124.594" /> <APoint x="3452.27" y="142.515" /> <APoint x="3423.9" y="142.515" /> <APoint x="3412.01" y="142.3" /> </AGeneralPath> <AGeneralPath p="RZ" c="MDT" n="MDT_BIL" numPoints="7"> <APoint x="8.95405" y="3414.28" /> <APoint x="12.1388" y="3426.16" /> <APoint x="12.7422" y="3430.67" /> <APoint x="-93.1502" y="3459.02" /> <APoint x="-94.3569" y="3455.21" /> <APoint x="-97.5417" y="3443.33" /> <APoint x="-96.9383" y="3442.65" /> </AGeneralPath> <AGeneralPath p="YX" c="MDT" n="MDT_BML" numPoints="6"> <APoint x="3567.4" y="-165.575" /> <APoint x="3611.32" y="-165.575" /> <APoint x="3620.69" y="-165.405" /> <APoint x="3614.71" y="189.691" /> <APoint x="3570.79" y="189.691" /> <APoint x="3561.41" y="189.521" /> </AGeneralPath> <AGeneralPath p="RZ" c="MDT" n="MDT_BML" numPoints="7"> <APoint x="163.072" y="3564.43" /> <APoint x="165.584" y="3573.8" /> <APoint x="166.386" y="3580.6" /> <APoint x="2.47066" y="3624.47" /> <APoint x="0.866445" y="3619.68" /> <APoint x="-1.6452" y="3610.31" /> <APoint x="-0.843086" y="3608.35" /> </AGeneralPath> <AGeneralPath p="YX" c="MDT" n="MDT_BML" numPoints="6"> <APoint x="3607.39" y="-164.852" /> <APoint x="3651.31" y="-164.852" /> <APoint x="3660.68" y="-164.683" /> <APoint x="3654.7" y="190.413" /> <APoint x="3610.77" y="190.413" /> <APoint x="3601.4" y="190.244" /> </AGeneralPath> <AGeneralPath p="RZ" c="MDT" n="MDT_BML" numPoints="7"> <APoint x="173.787" y="3604.42" /> <APoint x="176.299" y="3613.79" /> <APoint x="177.101" y="3620.51" /> <APoint x="13.1857" y="3664.39" /> <APoint x="11.5815" y="3659.65" /> <APoint x="9.06983" y="3650.28" /> <APoint x="9.87194" y="3648.34" /> </AGeneralPath> <AGeneralPath p="YX" c="MDT" n="MDT_BML" numPoints="6"> <APoint x="3611.4" y="-165.575" /> <APoint x="3655.32" y="-165.575" /> <APoint x="3664.69" y="-165.405" /> <APoint x="3658.71" y="189.691" /> <APoint x="3614.79" y="189.691" /> <APoint x="3605.41" y="189.521" /> </AGeneralPath> <AGeneralPath p="RZ" c="MDT" n="MDT_BML" numPoints="7"> <APoint x="-1.13454" y="3608.43" /> <APoint x="1.3771" y="3617.8" /> <APoint x="2.17921" y="3624.55" /> <APoint x="-161.736" y="3668.42" /> <APoint x="-163.341" y="3663.62" /> <APoint x="-165.852" y="3654.25" /> <APoint x="-165.05" y="3652.35" /> </AGeneralPath> <AGeneralPath p="YX" c="MDT" n="MDT_BML" numPoints="6"> <APoint x="3651.39" y="-164.852" /> <APoint x="3695.31" y="-164.852" /> <APoint x="3704.68" y="-164.683" /> <APoint x="3698.7" y="190.413" /> <APoint x="3654.77" y="190.413" /> <APoint x="3645.4" y="190.244" /> </AGeneralPath> <AGeneralPath p="RZ" c="MDT" n="MDT_BML" numPoints="7"> <APoint x="9.58049" y="3648.42" /> <APoint x="12.0921" y="3657.79" /> <APoint x="12.8942" y="3664.46" /> <APoint x="-151.021" y="3708.34" /> <APoint x="-152.626" y="3703.59" /> <APoint x="-155.137" y="3694.22" /> <APoint x="-154.335" y="3692.34" /> </AGeneralPath> <AGeneralPath p="YX" c="MDT" n="MDT_BOL" numPoints="6"> <APoint x="3796.56" y="-231.944" /> <APoint x="3852.92" y="-231.944" /> <APoint x="3862.29" y="-231.775" /> <APoint x="3853.93" y="264.3" /> <APoint x="3797.57" y="264.3" /> <APoint x="3788.2" y="264.13" /> </AGeneralPath> <AGeneralPath p="RZ" c="MDT" n="MDT_BOL" numPoints="7"> <APoint x="224.168" y="3792.41" /> <APoint x="226.68" y="3801.79" /> <APoint x="227.8" y="3812.99" /> <APoint x="17.4661" y="3869.24" /> <APoint x="15.225" y="3862.98" /> <APoint x="12.7134" y="3853.62" /> <APoint x="13.8339" y="3848.77" /> </AGeneralPath> <AGeneralPath p="YX" c="MDT" n="MDT_BOL" numPoints="6"> <APoint x="3836.55" y="-231.222" /> <APoint x="3892.91" y="-231.222" /> <APoint x="3902.28" y="-231.052" /> <APoint x="3893.92" y="265.022" /> <APoint x="3837.56" y="265.022" /> <APoint x="3828.19" y="264.853" /> </AGeneralPath> <AGeneralPath p="RZ" c="MDT" n="MDT_BOL" numPoints="7"> <APoint x="234.883" y="3832.4" /> <APoint x="237.395" y="3841.78" /> <APoint x="238.515" y="3852.86" /> <APoint x="28.1812" y="3909.12" /> <APoint x="25.94" y="3902.93" /> <APoint x="23.4284" y="3893.56" /> <APoint x="24.549" y="3888.76" /> </AGeneralPath> <AGeneralPath p="YX" c="MDT" n="MDT_BOL" numPoints="6"> <APoint x="3852.98" y="-231.944" /> <APoint x="3909.34" y="-231.944" /> <APoint x="3918.72" y="-231.775" /> <APoint x="3910.35" y="264.3" /> <APoint x="3853.99" y="264.3" /> <APoint x="3844.62" y="264.13" /> </AGeneralPath> <AGeneralPath p="RZ" c="MDT" n="MDT_BOL" numPoints="7"> <APoint x="13.596" y="3848.83" /> <APoint x="16.1076" y="3858.21" /> <APoint x="17.2282" y="3869.3" /> <APoint x="-193.106" y="3925.56" /> <APoint x="-195.347" y="3919.27" /> <APoint x="-197.859" y="3909.91" /> <APoint x="-196.738" y="3905.19" /> </AGeneralPath> <AGeneralPath p="YX" c="MDT" n="MDT_BOL" numPoints="6"> <APoint x="3892.97" y="-231.222" /> <APoint x="3949.33" y="-231.222" /> <APoint x="3958.7" y="-231.052" /> <APoint x="3950.34" y="265.022" /> <APoint x="3893.98" y="265.022" /> <APoint x="3884.61" y="264.853" /> </AGeneralPath> <AGeneralPath p="RZ" c="MDT" n="MDT_BOL" numPoints="7"> <APoint x="24.311" y="3888.83" /> <APoint x="26.8227" y="3898.2" /> <APoint x="27.9432" y="3909.18" /> <APoint x="-182.391" y="3965.44" /> <APoint x="-184.632" y="3959.22" /> <APoint x="-187.144" y="3949.86" /> <APoint x="-186.023" y="3945.18" /> </AGeneralPath> <AGeneralPath p="YX" c="MDT" n="MDT_BOS" numPoints="4"> <APoint x="1222.39" y="-248.665" /> <APoint x="1232.1" y="-248.665" /> <APoint x="1232.1" y="128.665" /> <APoint x="1222.39" y="128.665" /> </AGeneralPath> <AGeneralPath p="RZ" c="MDT" n="MDT_BOS" numPoints="4"> <APoint x="-109.754" y="1223.87" /> <APoint x="108" y="1223.87" /> <APoint x="108" y="1256.94" /> <APoint x="-109.754" y="1256.94" /> </AGeneralPath> <AGeneralPath p="YX" c="MDT" n="MDT_BOS" numPoints="4"> <APoint x="1180.99" y="-248.665" /> <APoint x="1190.69" y="-248.665" /> <APoint x="1190.69" y="128.665" /> <APoint x="1180.99" y="128.665" /> </AGeneralPath> <AGeneralPath p="RZ" c="MDT" n="MDT_BOS" numPoints="4"> <APoint x="-109.754" y="1182.51" /> <APoint x="108" y="1182.51" /> <APoint x="108" y="1216.38" /> <APoint x="-109.754" y="1216.38" /> </AGeneralPath> <AGeneralPath p="YX" c="MDT" n="MDT_EIL" numPoints="7"> <APoint x="4148.24" y="-150.001" /> <APoint x="4160.12" y="-150.001" /> <APoint x="4174.59" y="-147.656" /> <APoint x="4189.06" y="-145.312" /> <APoint x="4177.97" y="26.5763" /> <APoint x="4166.08" y="26.5763" /> <APoint x="4139.96" y="-21.7767" /> </AGeneralPath> <AGeneralPath p="RZ" c="MDT" n="MDT_EIL" numPoints="8"> <APoint x="66.6393" y="4140.02" /> <APoint x="69.8246" y="4151.91" /> <APoint x="38.9439" y="4162.83" /> <APoint x="-69.0608" y="4191.58" /> <APoint x="-72.246" y="4179.7" /> <APoint x="-51.5479" y="4172.05" /> <APoint x="-30.8498" y="4166.17" /> <APoint x="17.8947" y="4153.02" /> </AGeneralPath> <AGeneralPath p="YX" c="MDT" n="MDT_EIL" numPoints="7"> <APoint x="4171.81" y="-150.001" /> <APoint x="4183.7" y="-150.001" /> <APoint x="4198.17" y="-147.656" /> <APoint x="4212.64" y="-145.312" /> <APoint x="4201.55" y="26.5763" /> <APoint x="4189.66" y="26.5763" /> <APoint x="4163.54" y="-21.7767" /> </AGeneralPath> <AGeneralPath p="RZ" c="MDT" n="MDT_EIL" numPoints="8"> <APoint x="72.9563" y="4163.59" /> <APoint x="76.1416" y="4175.48" /> <APoint x="45.2609" y="4186.39" /> <APoint x="-62.7438" y="4215.14" /> <APoint x="-65.929" y="4203.26" /> <APoint x="-45.2309" y="4195.63" /> <APoint x="-24.5328" y="4189.74" /> <APoint x="24.2117" y="4176.6" /> </AGeneralPath> <AGeneralPath p="YX" c="MDT" n="MDT_EML" numPoints="8"> <APoint x="4789.7" y="-180.339" /> <APoint x="4799.07" y="-180.339" /> <APoint x="4850.35" y="-174.225" /> <APoint x="4841.38" y="-35.1575" /> <APoint x="4832.41" y="103.91" /> <APoint x="4823.03" y="103.91" /> <APoint x="4777.01" y="16.2912" /> <APoint x="4783.35" y="-82.024" /> </AGeneralPath> <AGeneralPath p="RZ" c="MDT" n="MDT_EML" numPoints="6"> <APoint x="106.369" y="4777.04" /> <APoint x="108.882" y="4786.41" /> <APoint x="61.5265" y="4802.46" /> <APoint x="-129.854" y="4853.48" /> <APoint x="-132.366" y="4844.11" /> <APoint x="-98.8744" y="4832.13" /> </AGeneralPath> <AGeneralPath p="YX" c="MDT" n="MDT_EML" numPoints="8"> <APoint x="4815.49" y="-180.339" /> <APoint x="4824.87" y="-180.339" /> <APoint x="4876.15" y="-174.225" /> <APoint x="4867.18" y="-35.1575" /> <APoint x="4858.2" y="103.91" /> <APoint x="4848.83" y="103.91" /> <APoint x="4802.81" y="16.2912" /> <APoint x="4809.15" y="-82.024" /> </AGeneralPath> <AGeneralPath p="RZ" c="MDT" n="MDT_EML" numPoints="6"> <APoint x="113.282" y="4802.83" /> <APoint x="115.794" y="4812.21" /> <APoint x="68.4386" y="4828.24" /> <APoint x="-122.942" y="4879.26" /> <APoint x="-125.454" y="4869.89" /> <APoint x="-91.9624" y="4857.93" /> </AGeneralPath> <AGeneralPath p="YX" c="MDT" n="MDT_EMS" numPoints="6"> <APoint x="4744.69" y="-1.4952" /> <APoint x="4754.07" y="-1.4952" /> <APoint x="4798.25" y="93.4802" /> <APoint x="4768.76" y="247.459" /> <APoint x="4759.39" y="247.459" /> <APoint x="4722.96" y="111.969" /> </AGeneralPath> <AGeneralPath p="RZ" c="MDT" n="MDT_EMS" numPoints="8"> <APoint x="150.044" y="4724.29" /> <APoint x="152.556" y="4733.66" /> <APoint x="16.6134" y="4775.18" /> <APoint x="-93.4425" y="4799.16" /> <APoint x="-95.9545" y="4789.79" /> <APoint x="-13.5044" y="4767.01" /> <APoint x="68.9458" y="4744.69" /> <APoint x="109.495" y="4734.15" /> </AGeneralPath> <AGeneralPath p="YX" c="MDT" n="MDT_EMS" numPoints="6"> <APoint x="4770.49" y="-1.4952" /> <APoint x="4779.86" y="-1.4952" /> <APoint x="4824.05" y="93.4802" /> <APoint x="4794.56" y="247.459" /> <APoint x="4785.18" y="247.459" /> <APoint x="4748.76" y="111.969" /> </AGeneralPath> <AGeneralPath p="RZ" c="MDT" n="MDT_EMS" numPoints="8"> <APoint x="156.956" y="4750.08" /> <APoint x="159.468" y="4759.45" /> <APoint x="23.5255" y="4800.94" /> <APoint x="-86.5305" y="4824.95" /> <APoint x="-89.0425" y="4815.58" /> <APoint x="-6.59234" y="4792.8" /> <APoint x="75.8578" y="4770.49" /> <APoint x="116.407" y="4759.94" /> </AGeneralPath> <AGeneralPath p="YX" c="MDT" n="MDT_EOL" numPoints="7"> <APoint x="5584.71" y="-218.839" /> <APoint x="5594.08" y="-218.839" /> <APoint x="5613.31" y="-215.773" /> <APoint x="5632.54" y="-212.707" /> <APoint x="5606.99" y="183.319" /> <APoint x="5597.61" y="183.319" /> <APoint x="5562.91" y="118.969" /> </AGeneralPath> <AGeneralPath p="RZ" c="MDT" n="MDT_EOL" numPoints="7"> <APoint x="63.5596" y="5564.18" /> <APoint x="66.0716" y="5573.55" /> <APoint x="-15.2836" y="5598.36" /> <APoint x="-158.821" y="5636.56" /> <APoint x="-161.333" y="5627.19" /> <APoint x="-113.645" y="5610.41" /> <APoint x="22.882" y="5574.03" /> </AGeneralPath> <AGeneralPath p="YX" c="MDT" n="MDT_EOL" numPoints="7"> <APoint x="5610.5" y="-218.839" /> <APoint x="5619.88" y="-218.839" /> <APoint x="5639.11" y="-215.773" /> <APoint x="5658.34" y="-212.707" /> <APoint x="5632.78" y="183.319" /> <APoint x="5623.41" y="183.319" /> <APoint x="5588.7" y="118.969" /> </AGeneralPath> <AGeneralPath p="RZ" c="MDT" n="MDT_EOL" numPoints="7"> <APoint x="70.4716" y="5589.97" /> <APoint x="72.9836" y="5599.34" /> <APoint x="-8.37156" y="5624.14" /> <APoint x="-151.909" y="5662.34" /> <APoint x="-154.421" y="5652.97" /> <APoint x="-106.733" y="5636.21" /> <APoint x="29.794" y="5599.83" /> </AGeneralPath> <AGeneralPath p="YX" c="MDT" n="MDT_EOS" numPoints="6"> <APoint x="5603.97" y="78.1037" /> <APoint x="5613.34" y="78.1037" /> <APoint x="5651.97" y="161.68" /> <APoint x="5610.57" y="377.878" /> <APoint x="5601.19" y="377.878" /> <APoint x="5569.21" y="259.574" /> </AGeneralPath> <AGeneralPath p="RZ" c="MDT" n="MDT_EOS" numPoints="8"> <APoint x="198.049" y="5575.26" /> <APoint x="200.561" y="5584.62" /> <APoint x="81.2066" y="5623.28" /> <APoint x="-73.3199" y="5654.28" /> <APoint x="-75.8319" y="5644.91" /> <APoint x="-3.74437" y="5624.56" /> <APoint x="68.3431" y="5604.51" /> <APoint x="133.196" y="5589.14" /> </AGeneralPath> <AGeneralPath p="YX" c="MDT" n="MDT_EOS" numPoints="6"> <APoint x="5629.76" y="78.1037" /> <APoint x="5639.14" y="78.1037" /> <APoint x="5677.77" y="161.68" /> <APoint x="5636.36" y="377.878" /> <APoint x="5626.99" y="377.878" /> <APoint x="5595.01" y="259.574" /> </AGeneralPath> <AGeneralPath p="RZ" c="MDT" n="MDT_EOS" numPoints="8"> <APoint x="204.961" y="5601.02" /> <APoint x="207.473" y="5610.39" /> <APoint x="88.1187" y="5649.02" /> <APoint x="-66.4078" y="5680.07" /> <APoint x="-68.9199" y="5670.7" /> <APoint x="3.16765" y="5650.35" /> <APoint x="75.2552" y="5630.3" /> <APoint x="140.108" y="5614.92" /> </AGeneralPath> <AGeneralPath p="YX" c="MDT" n="MDT_EIS" numPoints="6"> <APoint x="4102.69" y="-48.2103" /> <APoint x="4114.58" y="-48.2103" /> <APoint x="4143.63" y="14.6957" /> <APoint x="4124.81" y="112.967" /> <APoint x="4112.92" y="112.967" /> <APoint x="4088.86" y="24.0163" /> </AGeneralPath> <AGeneralPath p="RZ" c="MDT" n="MDT_EIS" numPoints="6"> <APoint x="100.091" y="4088.93" /> <APoint x="103.276" y="4100.82" /> <APoint x="13.4689" y="4126.36" /> <APoint x="-56.7704" y="4143.66" /> <APoint x="-59.9557" y="4131.77" /> <APoint x="74.279" y="4095.79" /> </AGeneralPath> <AGeneralPath p="YX" c="MDT" n="MDT_EIS" numPoints="6"> <APoint x="4126.27" y="-48.2103" /> <APoint x="4138.16" y="-48.2103" /> <APoint x="4167.21" y="14.6957" /> <APoint x="4148.39" y="112.967" /> <APoint x="4136.5" y="112.967" /> <APoint x="4112.44" y="24.0163" /> </AGeneralPath> <AGeneralPath p="RZ" c="MDT" n="MDT_EIS" numPoints="6"> <APoint x="106.408" y="4112.51" /> <APoint x="109.593" y="4124.39" /> <APoint x="19.7859" y="4149.93" /> <APoint x="-50.4534" y="4167.23" /> <APoint x="-53.6387" y="4155.35" /> <APoint x="80.596" y="4119.37" /> </AGeneralPath> <AGeneralPath p="YX" c="CSC" n="CSC_CSL" numPoints="6"> <APoint x="4011" y="-49.115" /> <APoint x="4038.72" y="-49.115" /> <APoint x="4042.08" y="7.345" /> <APoint x="4045.44" y="63.805" /> <APoint x="4004.29" y="63.805" /> <APoint x="4007.65" y="7.345" /> </AGeneralPath> <AGeneralPath p="RZ" c="CSC" n="CSC_CSL" numPoints="6"> <APoint x="54.512" y="4004.8" /> <APoint x="57.7084" y="4016.73" /> <APoint x="-51.3156" y="4045.94" /> <APoint x="-54.512" y="4034.01" /> <APoint x="-41.9888" y="4030.16" /> <APoint x="41.9888" y="4007.66" /> </AGeneralPath> <AGeneralPath p="YX" c="RPC" n="RPC_BML" numPoints="6"> <APoint x="3559.48" y="-160.142" /> <APoint x="3582" y="-160.142" /> <APoint x="3586.44" y="-160.061" /> <APoint x="3580.65" y="183.886" /> <APoint x="3558.13" y="183.886" /> <APoint x="3553.69" y="183.806" /> </AGeneralPath> <AGeneralPath p="RZ" c="RPC" n="RPC_BML" numPoints="7"> <APoint x="160.977" y="3556.6" /> <APoint x="162.167" y="3561.05" /> <APoint x="162.944" y="3567.52" /> <APoint x="78.9086" y="3590.01" /> <APoint x="77.3548" y="3585.36" /> <APoint x="76.1644" y="3580.92" /> <APoint x="76.9413" y="3579.12" /> </AGeneralPath> <AGeneralPath p="YX" c="RPC" n="RPC_BML" numPoints="6"> <APoint x="3575.62" y="-160.229" /> <APoint x="3598.14" y="-160.229" /> <APoint x="3602.58" y="-160.149" /> <APoint x="3596.78" y="183.799" /> <APoint x="3574.26" y="183.799" /> <APoint x="3569.82" y="183.719" /> </AGeneralPath> <AGeneralPath p="RZ" c="RPC" n="RPC_BML" numPoints="7"> <APoint x="81.443" y="3572.74" /> <APoint x="82.6334" y="3577.18" /> <APoint x="83.4103" y="3583.64" /> <APoint x="-0.625266" y="3606.14" /> <APoint x="-2.17912" y="3601.47" /> <APoint x="-3.36951" y="3597.03" /> <APoint x="-2.59258" y="3595.26" /> </AGeneralPath> <AGeneralPath p="YX" c="RPC" n="RPC_BML" numPoints="6"> <APoint x="3624.97" y="-158.958" /> <APoint x="3647.49" y="-158.958" /> <APoint x="3651.93" y="-158.878" /> <APoint x="3646.13" y="185.07" /> <APoint x="3623.61" y="185.07" /> <APoint x="3619.17" y="184.989" /> </AGeneralPath> <AGeneralPath p="RZ" c="RPC" n="RPC_BML" numPoints="7"> <APoint x="178.523" y="3622.09" /> <APoint x="179.714" y="3626.53" /> <APoint x="180.49" y="3632.89" /> <APoint x="96.4549" y="3655.38" /> <APoint x="94.9011" y="3650.82" /> <APoint x="93.7107" y="3646.38" /> <APoint x="94.4876" y="3644.61" /> </AGeneralPath> <AGeneralPath p="YX" c="RPC" n="RPC_BML" numPoints="6"> <APoint x="3641.1" y="-159.046" /> <APoint x="3663.62" y="-159.046" /> <APoint x="3668.06" y="-158.965" /> <APoint x="3662.26" y="184.982" /> <APoint x="3639.75" y="184.982" /> <APoint x="3635.3" y="184.902" /> </AGeneralPath> <AGeneralPath p="RZ" c="RPC" n="RPC_BML" numPoints="7"> <APoint x="98.9893" y="3638.23" /> <APoint x="100.18" y="3642.67" /> <APoint x="100.957" y="3649.01" /> <APoint x="16.921" y="3671.51" /> <APoint x="15.3672" y="3666.93" /> <APoint x="14.1768" y="3662.49" /> <APoint x="14.9537" y="3660.74" /> </AGeneralPath> <AGeneralPath p="YX" c="RPC" n="RPC_BML" numPoints="6"> <APoint x="3603.48" y="-160.142" /> <APoint x="3626" y="-160.142" /> <APoint x="3630.44" y="-160.061" /> <APoint x="3624.65" y="183.886" /> <APoint x="3602.13" y="183.886" /> <APoint x="3597.69" y="183.806" /> </AGeneralPath> <AGeneralPath p="RZ" c="RPC" n="RPC_BML" numPoints="7"> <APoint x="-3.23014" y="3600.6" /> <APoint x="-2.03975" y="3605.05" /> <APoint x="-1.26283" y="3611.48" /> <APoint x="-85.2984" y="3633.97" /> <APoint x="-86.8522" y="3629.31" /> <APoint x="-88.0426" y="3624.87" /> <APoint x="-87.2657" y="3623.12" /> </AGeneralPath> <AGeneralPath p="YX" c="RPC" n="RPC_BML" numPoints="6"> <APoint x="3619.62" y="-160.229" /> <APoint x="3642.14" y="-160.229" /> <APoint x="3646.58" y="-160.149" /> <APoint x="3640.78" y="183.799" /> <APoint x="3618.26" y="183.799" /> <APoint x="3613.82" y="183.719" /> </AGeneralPath> <AGeneralPath p="RZ" c="RPC" n="RPC_BML" numPoints="7"> <APoint x="-82.764" y="3616.74" /> <APoint x="-81.5736" y="3621.18" /> <APoint x="-80.7967" y="3627.6" /> <APoint x="-164.832" y="3650.09" /> <APoint x="-166.386" y="3645.42" /> <APoint x="-167.577" y="3640.98" /> <APoint x="-166.8" y="3639.26" /> </AGeneralPath> <AGeneralPath p="YX" c="RPC" n="RPC_BML" numPoints="6"> <APoint x="3668.97" y="-158.958" /> <APoint x="3691.49" y="-158.958" /> <APoint x="3695.93" y="-158.878" /> <APoint x="3690.13" y="185.07" /> <APoint x="3667.61" y="185.07" /> <APoint x="3663.17" y="184.989" /> </AGeneralPath> <AGeneralPath p="RZ" c="RPC" n="RPC_BML" numPoints="7"> <APoint x="14.3162" y="3666.09" /> <APoint x="15.5065" y="3670.53" /> <APoint x="16.2835" y="3676.84" /> <APoint x="-67.7521" y="3699.34" /> <APoint x="-69.3059" y="3694.77" /> <APoint x="-70.4963" y="3690.33" /> <APoint x="-69.7194" y="3688.61" /> </AGeneralPath> <AGeneralPath p="YX" c="RPC" n="RPC_BML" numPoints="6"> <APoint x="3685.1" y="-159.046" /> <APoint x="3707.62" y="-159.046" /> <APoint x="3712.06" y="-158.965" /> <APoint x="3706.26" y="184.982" /> <APoint x="3683.75" y="184.982" /> <APoint x="3679.3" y="184.902" /> </AGeneralPath> <AGeneralPath p="RZ" c="RPC" n="RPC_BML" numPoints="7"> <APoint x="-65.2177" y="3682.23" /> <APoint x="-64.0273" y="3686.67" /> <APoint x="-63.2504" y="3692.97" /> <APoint x="-147.286" y="3715.47" /> <APoint x="-148.84" y="3710.88" /> <APoint x="-150.03" y="3706.44" /> <APoint x="-149.253" y="3704.74" /> </AGeneralPath> <AGeneralPath p="YX" c="RPC" n="RPC_BOL" numPoints="6"> <APoint x="3847.95" y="-225.44" /> <APoint x="3876.68" y="-225.44" /> <APoint x="3881.12" y="-225.359" /> <APoint x="3872.94" y="259.567" /> <APoint x="3844.22" y="259.567" /> <APoint x="3839.77" y="259.486" /> </AGeneralPath> <AGeneralPath p="RZ" c="RPC" n="RPC_BOL" numPoints="7"> <APoint x="237.963" y="3843.9" /> <APoint x="239.153" y="3848.34" /> <APoint x="240.248" y="3858.98" /> <APoint x="133.031" y="3887.66" /> <APoint x="130.84" y="3881.63" /> <APoint x="129.649" y="3877.19" /> <APoint x="130.745" y="3872.63" /> </AGeneralPath> <AGeneralPath p="YX" c="RPC" n="RPC_BOL" numPoints="6"> <APoint x="3879.95" y="-225.352" /> <APoint x="3908.68" y="-225.352" /> <APoint x="3913.13" y="-225.272" /> <APoint x="3904.95" y="259.654" /> <APoint x="3876.22" y="259.654" /> <APoint x="3871.78" y="259.574" /> </AGeneralPath> <AGeneralPath p="RZ" c="RPC" n="RPC_BOL" numPoints="7"> <APoint x="137.834" y="3875.9" /> <APoint x="139.025" y="3880.35" /> <APoint x="140.12" y="3890.92" /> <APoint x="32.9022" y="3919.6" /> <APoint x="30.7114" y="3913.57" /> <APoint x="29.521" y="3909.13" /> <APoint x="30.6164" y="3904.63" /> </AGeneralPath> <AGeneralPath p="YX" c="RPC" n="RPC_BOL" numPoints="6"> <APoint x="3904.37" y="-225.44" /> <APoint x="3933.1" y="-225.44" /> <APoint x="3937.54" y="-225.359" /> <APoint x="3929.37" y="259.567" /> <APoint x="3900.64" y="259.567" /> <APoint x="3896.19" y="259.486" /> </AGeneralPath> <AGeneralPath p="RZ" c="RPC" n="RPC_BOL" numPoints="7"> <APoint x="27.3905" y="3900.32" /> <APoint x="28.5809" y="3904.76" /> <APoint x="29.6763" y="3915.3" /> <APoint x="-77.5415" y="3943.99" /> <APoint x="-79.7323" y="3937.93" /> <APoint x="-80.9226" y="3933.49" /> <APoint x="-79.8273" y="3929.05" /> </AGeneralPath> <AGeneralPath p="YX" c="RPC" n="RPC_BOL" numPoints="6"> <APoint x="3936.38" y="-225.352" /> <APoint x="3965.1" y="-225.352" /> <APoint x="3969.55" y="-225.272" /> <APoint x="3961.37" y="259.654" /> <APoint x="3932.64" y="259.654" /> <APoint x="3928.2" y="259.574" /> </AGeneralPath> <AGeneralPath p="RZ" c="RPC" n="RPC_BOL" numPoints="7"> <APoint x="-72.7378" y="3932.32" /> <APoint x="-71.5474" y="3936.77" /> <APoint x="-70.452" y="3947.25" /> <APoint x="-177.67" y="3975.93" /> <APoint x="-179.861" y="3969.87" /> <APoint x="-181.051" y="3965.43" /> <APoint x="-179.956" y="3961.05" /> </AGeneralPath> <AGeneralPath p="YX" c="RPC" n="RPC_BOS" numPoints="4"> <APoint x="1235.3" y="-243" /> <APoint x="1239.9" y="-243" /> <APoint x="1239.9" y="123" /> <APoint x="1235.3" y="123" /> </AGeneralPath> <AGeneralPath p="RZ" c="RPC" n="RPC_BOS" numPoints="4"> <APoint x="-3" y="1236.76" /> <APoint x="108" y="1236.76" /> <APoint x="108" y="1263.49" /> <APoint x="-3" y="1263.49" /> </AGeneralPath> <AGeneralPath p="YX" c="RPC" n="RPC_BOS" numPoints="4"> <APoint x="1240.3" y="-243" /> <APoint x="1244.9" y="-243" /> <APoint x="1244.9" y="123" /> <APoint x="1240.3" y="123" /> </AGeneralPath> <AGeneralPath p="RZ" c="RPC" n="RPC_BOS" numPoints="4"> <APoint x="-108" y="1241.75" /> <APoint x="3" y="1241.75" /> <APoint x="3" y="1268.39" /> <APoint x="-108" y="1268.39" /> </AGeneralPath> <AGeneralPath p="YX" c="TGC" n="TGC_T1E" numPoints="6"> <APoint x="4716.49" y="-75.5" /> <APoint x="4723.25" y="-75.5" /> <APoint x="4723.25" y="77.33" /> <APoint x="4716.49" y="77.33" /> <APoint x="4684.14" y="69.135" /> <APoint x="4684.14" y="-67.305" /> </AGeneralPath> <AGeneralPath p="RZ" c="TGC" n="TGC_T1E" numPoints="6"> <APoint x="0" y="4684.14" /> <APoint x="1.81173" y="4690.9" /> <APoint x="1.81173" y="4691.41" /> <APoint x="-118.929" y="4723.89" /> <APoint x="-120.741" y="4717.13" /> <APoint x="-120.741" y="4716.49" /> </AGeneralPath> <AGeneralPath p="YX" c="TGC" n="TGC_T2E" numPoints="6"> <APoint x="4903.06" y="-75.5" /> <APoint x="4907.28" y="-75.5" /> <APoint x="4907.28" y="77.33" /> <APoint x="4903.06" y="77.33" /> <APoint x="4870.7" y="69.135" /> <APoint x="4870.7" y="-67.305" /> </AGeneralPath> <AGeneralPath p="RZ" c="TGC" n="TGC_T2E" numPoints="6"> <APoint x="0" y="4870.7" /> <APoint x="1.13104" y="4874.92" /> <APoint x="1.13104" y="4875.41" /> <APoint x="-119.61" y="4907.89" /> <APoint x="-120.741" y="4903.67" /> <APoint x="-120.741" y="4903.06" /> </AGeneralPath> <AGeneralPath p="YX" c="TGC" n="TGC_T3E" numPoints="6"> <APoint x="4916.58" y="-75.5" /> <APoint x="4920.8" y="-75.5" /> <APoint x="4920.8" y="77.33" /> <APoint x="4916.58" y="77.33" /> <APoint x="4884.23" y="69.135" /> <APoint x="4884.23" y="-67.305" /> </AGeneralPath> <AGeneralPath p="RZ" c="TGC" n="TGC_T3E" numPoints="6"> <APoint x="0" y="4884.23" /> <APoint x="1.13104" y="4888.45" /> <APoint x="1.13104" y="4888.94" /> <APoint x="-119.61" y="4921.41" /> <APoint x="-120.741" y="4917.19" /> <APoint x="-120.741" y="4916.58" /> </AGeneralPath> </AGeometry> Index: AGeometry.xml =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/Test/data/AGeometry.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** AGeometry.xml 23 Jan 2007 11:19:41 -0000 1.2 --- AGeometry.xml 24 Jan 2007 14:00:36 -0000 1.3 *************** *** 64,76 **** <AEndcapCalorimeter c="ECAL" n="LAr Outer Endcap" sampling="3" region="0" rMin="29.0" rMax="203.4" zMin="415.624" zMax="424.326" eta0="1.50867" deta="0.05" neta="20" meta="0" phi0="-0.234375" nphi="256" /> <AEndcapCalorimeter c="ECAL" n="LAr Inner Endcap" sampling="1" region="0" rMin="29.0" rMax="203.4" zMin="375.424" zMax="420.125" eta0="2.51004" deta="0.1" neta="7" meta="0" phi0="-0.234375" nphi="64" /> ! <AEndcapCalorimeter c="ECAL" n="LAr Inner Endcap" sampling="2" region="0" rMin="29.0" rMax="203.4" zMin="420.125" zMax="424.326" eta0="2.5094" deta="0.1" neta="7" meta="0" phi0="-0.234375" nphi="64" /> ! <AEndcapCalorimeter c="HCAL" n="HEC" sampling="0" region="0" rMin="37.2" rMax="203.4" zMin="435" zMax="463" eta0="1.50824" deta="0.1" neta="10" meta="0" phi0="0" nphi="64" /> ! <AEndcapCalorimeter c="HCAL" n="HEC" sampling="0" region="1" rMin="37.2" rMax="203.4" zMin="435" zMax="463" eta0="2.50892" deta="0.2" neta="4" meta="0" phi0="0" nphi="32" /> ! <AEndcapCalorimeter c="HCAL" n="HEC" sampling="1" region="0" rMin="48.5" rMax="203.4" zMin="463" zMax="510" eta0="1.50755" deta="0.1" neta="10" meta="0" phi0="0" nphi="64" /> ! <AEndcapCalorimeter c="HCAL" n="HEC" sampling="1" region="1" rMin="48.5" rMax="203.4" zMin="463" zMax="510" eta0="2.50817" deta="0.2" neta="3" meta="0" phi0="0" nphi="32" /> ! <AEndcapCalorimeter c="HCAL" n="HEC" sampling="2" region="0" rMin="48.5" rMax="203.4" zMin="513" zMax="559" eta0="1.6" deta="0.1" neta="9" meta="1" phi0="0" nphi="64" /> ! <AEndcapCalorimeter c="HCAL" n="HEC" sampling="2" region="1" rMin="48.5" rMax="203.4" zMin="513" zMax="559" eta0="2.5" deta="0.2" neta="3" meta="0" phi0="-7.95139e-16" nphi="32" /> ! <AEndcapCalorimeter c="HCAL" n="HEC" sampling="3" region="0" rMin="48.5" rMax="203.4" zMin="559" zMax="605" eta0="1.7" deta="0.1" neta="8" meta="2" phi0="-3.97569e-16" nphi="64" /> ! <AEndcapCalorimeter c="HCAL" n="HEC" sampling="3" region="1" rMin="48.5" rMax="203.4" zMin="559" zMax="605" eta0="2.5" deta="0.2" neta="4" meta="0" phi0="-7.95139e-16" nphi="32" /> <ADisc p="YX" c="ECAL" n="FCAL EM" rIn="7.84392" rOut="47.5" /> <ARectangle p="RZ" c="ECAL" n="FCAL EM" xMin="466.85" xMax="511.85" yMin="7.84392" yMax="47.5" /> --- 64,76 ---- <AEndcapCalorimeter c="ECAL" n="LAr Outer Endcap" sampling="3" region="0" rMin="29.0" rMax="203.4" zMin="415.624" zMax="424.326" eta0="1.50867" deta="0.05" neta="20" meta="0" phi0="-0.234375" nphi="256" /> <AEndcapCalorimeter c="ECAL" n="LAr Inner Endcap" sampling="1" region="0" rMin="29.0" rMax="203.4" zMin="375.424" zMax="420.125" eta0="2.51004" deta="0.1" neta="7" meta="0" phi0="-0.234375" nphi="64" /> ! <AEndcapCalorimeter c="ECAL" n="LAr Inner Endcap" sampling="2" region="0" rMin="29.0" rMax="203.4" zMin="420.125" zMax="424.326" eta0="2.5094" deta="0.1" neta="7" meta="0" phi0="-0.234375" nphi="64" /> ! <AEndcapCalorimeter c="HCAL" n="HEC" sampling="0" region="0" rMin="37.2" rMax="203.4" zMin="435" zMax="463" eta0="1.50824" deta="0.1" neta="10" meta="0" phi0="0" nphi="64" /> ! <AEndcapCalorimeter c="HCAL" n="HEC" sampling="0" region="1" rMin="37.2" rMax="203.4" zMin="435" zMax="463" eta0="2.50892" deta="0.2" neta="4" meta="0" phi0="0" nphi="32" /> ! <AEndcapCalorimeter c="HCAL" n="HEC" sampling="1" region="0" rMin="48.5" rMax="203.4" zMin="463" zMax="510" eta0="1.50755" deta="0.1" neta="10" meta="0" phi0="0" nphi="64" /> ! <AEndcapCalorimeter c="HCAL" n="HEC" sampling="1" region="1" rMin="48.5" rMax="203.4" zMin="463" zMax="510" eta0="2.50817" deta="0.2" neta="3" meta="0" phi0="0" nphi="32" /> ! <AEndcapCalorimeter c="HCAL" n="HEC" sampling="2" region="0" rMin="48.5" rMax="203.4" zMin="513" zMax="559" eta0="1.6" deta="0.1" neta="9" meta="1" phi0="0" nphi="64" /> ! <AEndcapCalorimeter c="HCAL" n="HEC" sampling="2" region="1" rMin="48.5" rMax="203.4" zMin="513" zMax="559" eta0="2.5" deta="0.2" neta="3" meta="0" phi0="-7.95139e-16" nphi="32" /> ! <AEndcapCalorimeter c="HCAL" n="HEC" sampling="3" region="0" rMin="48.5" rMax="203.4" zMin="559" zMax="605" eta0="1.7" deta="0.1" neta="8" meta="2" phi0="-3.97569e-16" nphi="64" /> ! <AEndcapCalorimeter c="HCAL" n="HEC" sampling="3" region="1" rMin="48.5" rMax="203.4" zMin="559" zMax="605" eta0="2.5" deta="0.2" neta="4" meta="0" phi0="-7.95139e-16" nphi="32" /> <ADisc p="YX" c="ECAL" n="FCAL EM" rIn="7.84392" rOut="47.5" /> <ARectangle p="RZ" c="ECAL" n="FCAL EM" xMin="466.85" xMax="511.85" yMin="7.84392" yMax="47.5" /> *************** *** 79,93 **** <ADisc p="YX" c="HCAL" n="FCAL HAD 2" rIn="7.96007" rOut="47.5" /> <ARectangle p="RZ" c="HCAL" n="FCAL HAD 2" xMin="559.75" xMax="604.75" yMin="7.96007" yMax="47.5" /> ! <ABarrelCalorimeter c="HCAL" n="TILE Barrel" sampling="0" region="0" rMin="229" rMax="260" zMin="0" zMax="282" eta0="0" deta="0.1" neta="10" meta="0" phi0="0" nphi="64" /> ! <ABarrelCalorimeter c="HCAL" n="TILE Barrel" sampling="1" region="0" rMin="260" rMax="344" zMin="0" zMax="282" eta0="0" deta="0.1" neta="9" meta="0" phi0="0" nphi="64" /> ! <ABarrelCalorimeter c="HCAL" n="TILE Barrel" sampling="2" region="0" rMin="344" rMax="386" zMin="-36.5199" zMax="282" eta0="-0.1" deta="0.2" neta="4" meta="0" phi0="0" nphi="64" /> ! <ABarrelCalorimeter c="HCAL" n="Extended TILE" sampling="0" region="0" rMin="229" rMax="260" zMin="355.95" zMax="615" eta0="1.1" deta="0.1" neta="5" meta="11" phi0="0" nphi="64" /> ! <ABarrelCalorimeter c="HCAL" n="Extended TILE" sampling="1" region="0" rMin="260" rMax="314" zMin="355.95" zMax="615" eta0="1" deta="0.1" neta="5" meta="10" phi0="0" nphi="64" /> ! <ABarrelCalorimeter c="HCAL" n="Extended TILE" sampling="2" region="0" rMin="314" rMax="386" zMin="355.95" zMax="615" eta0="0.9" deta="0.2" neta="2" meta="10" phi0="0" nphi="64" /> ! <AGapCalorimeter c="HCAL" n="ITC Gap" sampling="1" region="0" rMin="299" rMax="344" zMin="346.435" zMax="355.92" eta="9" phi0="0" nphi="64" /> ! <AGapCalorimeter c="HCAL" n="ITC Gap" sampling="2" region="0" rMin="344" rMax="386" zMin="325.05" zMax="355.95" eta="8" phi0="0" nphi="64" /> ! <AGapCalorimeter c="HCAL" n="ITC Gap" sampling="3" region="0" rMin="264.6" rMax="295.9" zMin="354.45" zMax="355.95" eta="10" phi0="0" nphi="64" /> ! <AGapCalorimeter c="HCAL" n="ITC Gap" sampling="3" region="0" rMin="230.5" rMax="264.6" zMin="354.45" zMax="355.95" eta="11" phi0="0" nphi="64" /> ! <AGapCalorimeter c="HCAL" n="ITC Gap" sampling="3" region="0" rMin="182.7" rMax="230.5" zMin="353.2" zMax="354" eta="13" phi0="0" nphi="64" /> ! <AGapCalorimeter c="HCAL" n="ITC Gap" sampling="3" region="0" rMin="146.5" rMax="182.7" zMin="353.2" zMax="354" eta="15" phi0="0" nphi="64" /> </AGeometry> --- 79,93 ---- <ADisc p="YX" c="HCAL" n="FCAL HAD 2" rIn="7.96007" rOut="47.5" /> <ARectangle p="RZ" c="HCAL" n="FCAL HAD 2" xMin="559.75" xMax="604.75" yMin="7.96007" yMax="47.5" /> ! <ABarrelCalorimeter c="HCAL" n="TILE Barrel" sampling="0" region="0" rMin="229" rMax="260" zMin="0" zMax="282" eta0="0" deta="0.1" neta="10" meta="0" phi0="0" nphi="64" /> ! <ABarrelCalorimeter c="HCAL" n="TILE Barrel" sampling="1" region="0" rMin="260" rMax="344" zMin="0" zMax="282" eta0="0" deta="0.1" neta="9" meta="0" phi0="0" nphi="64" /> ! <ABarrelCalorimeter c="HCAL" n="TILE Barrel" sampling="2" region="0" rMin="344" rMax="386" zMin="-36.5199" zMax="282" eta0="-0.1" deta="0.2" neta="4" meta="0" phi0="0" nphi="64" /> ! <ABarrelCalorimeter c="HCAL" n="Extended TILE" sampling="0" region="0" rMin="229" rMax="260" zMin="355.95" zMax="615" eta0="1.1" deta="0.1" neta="5" meta="11" phi0="0" nphi="64" /> ! <ABarrelCalorimeter c="HCAL" n="Extended TILE" sampling="1" region="0" rMin="260" rMax="314" zMin="355.95" zMax="615" eta0="1" deta="0.1" neta="5" meta="10" phi0="0" nphi="64" /> ! <ABarrelCalorimeter c="HCAL" n="Extended TILE" sampling="2" region="0" rMin="314" rMax="386" zMin="355.95" zMax="615" eta0="0.9" deta="0.2" neta="2" meta="10" phi0="0" nphi="64" /> ! <AGapCalorimeter c="HCAL" n="ITC Gap" sampling="1" region="0" rMin="299" rMax="344" zMin="346.435" zMax="355.92" eta="9" phi0="0" nphi="64" /> ! <AGapCalorimeter c="HCAL" n="ITC Gap" sampling="2" region="0" rMin="344" rMax="386" zMin="325.05" zMax="355.95" eta="8" phi0="0" nphi="64" /> ! <AGapCalorimeter c="HCAL" n="ITC Gap" sampling="3" region="0" rMin="264.6" rMax="295.9" zMin="354.45" zMax="355.95" eta="10" phi0="0" nphi="64" /> ! <AGapCalorimeter c="HCAL" n="ITC Gap" sampling="3" region="0" rMin="230.5" rMax="264.6" zMin="354.45" zMax="355.95" eta="11" phi0="0" nphi="64" /> ! <AGapCalorimeter c="HCAL" n="ITC Gap" sampling="3" region="0" rMin="182.7" rMax="230.5" zMin="353.2" zMax="354" eta="13" phi0="0" nphi="64" /> ! <AGapCalorimeter c="HCAL" n="ITC Gap" sampling="3" region="0" rMin="146.5" rMax="182.7" zMin="353.2" zMax="354" eta="15" phi0="0" nphi="64" /> </AGeometry> --- NEW FILE: AMuonGeometry.xml --- <?xml version="1.0"?> <Geometry> <ABox n="MDT_BIL" zi="33" zo="124.607" ri="474.091" ro="515.705" w="267.15" eta="1" phi="1 2 3 7" /> <ABox n="MDT_BIL" zi="51" zo="124.586" ri="474.091" ro="515.705" w="267.15" eta="1" phi="4" /> <ABox n="MDT_BIL" zi="56" zo="147.607" ri="525.691" ro="567.305" w="267.15" eta="1" phi="5" /> <ABox n="MDT_BIL" zi="125" zo="234.628" ri="474.091" ro="515.705" w="267.15" eta="2" phi="1 2 3 4 5 7" /> <ABox n="MDT_BIL" zi="235" zo="326.607" ri="474.091" ro="515.705" w="267.15" eta="3" phi="1 2 4 5 7" /> <ABox n="MDT_BIL" zi="235" zo="344.628" ri="474.091" ro="515.705" w="267.15" eta="3" phi="3" /> <ABox n="MDT_BIL" zi="345" zo="454.628" ri="474.091" ro="515.705" w="267.15" eta="4" phi="1 2 3 4 5" /> <ABox n="MDT_BIL" zi="345" zo="436.607" ri="474.091" ro="515.705" w="267.15" eta="4" phi="7" /> <ABox n="MDT_BIL" zi="455" zo="546.607" ri="474.091" ro="515.705" w="267.15" eta="5" phi="1 2 3 4 5" /> <ABox n="MDT_BIL" zi="437" zo="528.607" ri="474.091" ro="515.705" w="267.15" eta="5" phi="7" /> <ABox n="MDT_BIL" zi="547" zo="656.628" ri="474.091" ro="515.705" w="267.15" eta="6" phi="1 2 3 5" /> <ABox n="MDT_BIL" zi="547" zo="638.607" ri="474.091" ro="515.705" w="267.15" eta="6" phi="4 7" /> <ABox n="MDT_BIS" zi="1" zo="110.628" ri="440.793" ro="474.707" w="167.15" eta="1" phi="1 2 3 4 5 6 7 8" dphi="22.5" /> <ABox n="MDT_BIS" zi="111" zo="202.607" ri="440.793" ro="474.707" w="167.15" eta="2" phi="1 2 3 4 5 6 7 8" dphi="22.5" /> <ABox n="MDT_BIS" zi="203" zo="294.607" ri="440.793" ro="474.707" w="167.15" eta="3" phi="1 2 3 4 5 6 7 8" dphi="22.5" /> <ABox n="MDT_BIS" zi="295" zo="386.607" ri="440.793" ro="474.707" w="167.15" eta="4" phi="1 2 3" dphi="22.5" /> <ABox n="MDT_BIS" zi="313" zo="404.607" ri="440.793" ro="474.707" w="167.15" eta="4" phi="4 5 6 7 8" dphi="22.5" /> <ABox n="MDT_BIS" zi="387" zo="478.607" ri="440.793" ro="474.707" w="167.15" eta="5" phi="1 2 3" dphi="22.5" /> <ABox n="MDT_BIS" zi="405" zo="496.607" ri="440.793" ro="474.707" w="167.15" eta="5" phi="4 5 6 7 8" dphi="22.5" /> <ABox n="MDT_BIS" zi="479" zo="570.607" ri="440.793" ro="474.707" w="167.15" eta="6" phi="1 2 3" dphi="22.5" /> <ABox n="MDT_BIS" zi="497" zo="588.607" ri="440.793" ro="474.707" w="167.15" eta="6" phi="4 5 6 7 8" dphi="22.5" /> <ABox n="MDT_BIS" zi="571" zo="680.628" ri="440.793" ro="474.707" w="167.15" eta="7" phi="1 2 3" dphi="22.5" /> <ABox n="MDT_BIS" zi="589" zo="680.607" ri="440.793" ro="474.707" w="167.15" eta="7" phi="4 5 6 7 8" dphi="22.5" /> <ABox n="MDT_BIS" zi="681" zo="730.558" ri="454.864" ro="471.645" w="85.15" eta="8" phi="1 2 3 4 5 6 7 8" dphi="22.5" /> <ABox n="MDT_BML" zi="15" zo="184.698" ri="675.194" ro="754.205" w="357.6" eta="1" phi="1 2" RPCi="15" RPCo="15" /> <ABox n="MDT_BML" zi="39" zo="184.67" ri="675.194" ro="754.205" w="357.6" eta="1" phi="3 7" RPCi="15" RPCo="15" /> <ABox n="MDT_BML" zi="87" zo="184.614" ri="675.194" ro="753.005" w="357.6" eta="1" phi="4 5" RPCi="15" RPCo="15" /> <ABox n="MDT_BML" zi="63" zo="184.642" ri="675.194" ro="753.005" w="357.6" eta="1" phi="6 8" RPCi="15" RPCo="15" /> <ABox n="MDT_BML" zi="185" zo="354.698" ri="675.194" ro="754.205" w="357.6" eta="2" phi="1 2 3 4 5 6 7 8" RPCi="15" RPCo="15" /> <ABox n="MDT_BML" zi="355" zo="524.698" ri="675.194" ro="754.205" w="357.6" eta="3" phi="1 2 3 4 5 6 7 8" RPCi="15" RPCo="15" /> <ABox n="MDT_BML" zi="525" zo="646.642" ri="675.194" ro="753.005" w="357.6" eta="4" phi="1 2 3 4 5 6 8" RPCi="15" RPCo="15" /> <ABox n="MDT_BML" zi="647" zo="768.642" ri="675.194" ro="753.005" w="357.6" eta="4" phi="7" RPCi="15" RPCo="15" /> <ABox n="MDT_BML" zi="647" zo="768.642" ri="675.194" ro="753.005" w="357.6" eta="5" phi="1 2 3 4 5 6 8" RPCi="15" RPCo="15" /> <ABox n="MDT_BML" zi="769" zo="914.67" ri="675.194" ro="754.205" w="357.6" eta="5" phi="7" RPCi="15" RPCo="15" /> <ABox n="MDT_BML" zi="769" zo="914.67" ri="675.194" ro="754.205" w="357.6" eta="6" phi="1 2 3 4 5 6 8" RPCi="15" RPCo="15" /> <ABox n="MDT_BML" zi="918" zo="966" ri="755.75" ro="765.75" w="304" eta="6" phi="7" RPCi="15" RPCo="15" /> <ABox n="MDT_BML" zi="918" zo="966" ri="755.75" ro="765.75" w="304" eta="7" phi="1 2 3 4 5 6 8" RPCi="15" RPCo="15" /> <ABox n="MDT_BMS" zi="15" zo="184.698" ri="777.694" ro="842.905" w="309.6" eta="1" phi="1 2 3 4 5 8" dphi="22.5" RPCi="15" RPCo="15" /> <ABox n="MDT_BMS" zi="185" zo="364.5" ri="777.694" ro="842.905" w="309.6" eta="2" phi="1 2 3 4 5 8" dphi="22.5" RPCi="15" RPCo="15" /> <ABox n="MDT_BMS" zi="368" zo="513.67" ri="777.694" ro="842.905" w="309.6" eta="3" phi="1 2 3 4 5 8" dphi="22.5" RPCi="15" RPCo="15" /> <ABox n="MDT_BMS" zi="514" zo="691.35" ri="777.694" ro="842.905" w="309.6" eta="4" phi="1 2 3 4 5 8" dphi="22.5" RPCi="15" RPCo="15" /> <ABox n="MDT_BMS" zi="692.5" zo="790.114" ri="777.694" ro="841.705" w="309.6" eta="5" phi="1 2 3 4 5 8" dphi="22.5" RPCi="15" RPCo="15" /> <ABox n="MDT_BMS" zi="790.5" zo="936.17" ri="777.694" ro="842.905" w="309.6" eta="6" phi="1 2 3 4 5 8" dphi="22.5" RPCi="15" RPCo="15" /> <ABox n="MDT_BOL" zi="15" zo="232.754" ri="924.444" ro="989.055" w="498.6" eta="1" phi="1 2" RPCo="15" /> <ABox n="MDT_BOL" zi="39" zo="232.726" ri="924.444" ro="989.055" w="498.6" eta="1" phi="3" RPCo="15" /> <ABox n="MDT_BOL" zi="87" zo="232.67" ri="924.444" ro="989.055" w="498.6" eta="1" phi="4 5" RPCo="15" /> <ABox n="MDT_BOL" zi="63" zo="232.698" ri="924.444" ro="989.055" w="498.6" eta="1" phi="6 7 8" RPCo="15" /> <ABox n="MDT_BOL" zi="233" zo="450.754" ri="924.444" ro="989.055" w="498.6" eta="2" phi="1 2 3 4 5 6 8" RPCo="15" /> <ABox n="MDT_BOL" zi="233" zo="378.67" ri="924.444" ro="989.055" w="498.6" eta="2" phi="7" RPCo="15" /> <ABox n="MDT_BOL" zi="451" zo="620.698" ri="924.444" ro="989.055" w="498.6" eta="3" phi="1 2 3 4 5 6 8" RPCo="15" /> <ABox n="MDT_BOL" zi="379" zo="524.67" ri="924.444" ro="989.055" w="498.6" eta="3" phi="7" RPCo="15" /> <ABox n="MDT_BOL" zi="621" zo="838.754" ri="924.444" ro="989.055" w="498.6" eta="4" phi="1 2 3 4 5 6 7 8" RPCo="15" /> <ABox n="MDT_BOL" zi="839" zo="1056.75" ri="924.444" ro="989.055" w="498.6" eta="5" phi="1 2 3 4 5 6 7 8" RPCo="15" /> <ABox n="MDT_BOL" zi="1057" zo="1226.7" ri="924.444" ro="989.055" w="498.6" eta="6" phi="1 2 3 4 5 6 7 8" RPCo="15" /> <ABox n="MDT_BOS" zi="1" zo="218.754" ri="1019.19" ro="1082.46" w="379.6" eta="1" phi="1 2 3 5 8" dphi="22.5" RPCi="15" /> <ABox n="MDT_BOS" zi="73" zo="218.67" ri="1019.19" ro="1082.46" w="379.6" eta="1" phi="4" dphi="22.5" RPCi="15" /> <ABox n="MDT_BOS" zi="219" zo="436.754" ri="1019.19" ro="1082.46" w="379.6" eta="2" phi="1 2 3 4 5 8" dphi="22.5" RPCi="15" /> <ABox n="MDT_BOS" zi="437" zo="654.754" ri="1019.19" ro="1082.46" w="379.6" eta="3" phi="1 2 3 4 5 8" dphi="22.5" RPCi="15" /> <ABox n="MDT_BOS" zi="655" zo="872.754" ri="1019.19" ro="1082.46" w="379.6" eta="4" phi="1 2 3 4 5 8" dphi="22.5" RPCi="15" /> <ABox n="MDT_BOS" zi="873" zo="1090.75" ri="1019.19" ro="1082.46" w="379.6" eta="5" phi="1 2 3 4 5 8" dphi="22.5" RPCi="15" /> <ABox n="MDT_BOS" zi="1091" zo="1284.73" ri="1019.19" ro="1082.46" w="379.6" eta="6" phi="1 2 3 4 5 8" dphi="22.5" RPCi="15" /> <ABox n="MDT_BEE" zi="889" zo="1034.67" ri="433.023" ro="452.33" w="91.15" eta="1" phi="1 2 3 4 5 6 7 8" dphi="22.5" /> <ABox n="MDT_BEE" zi="1035" zo="1180.67" ri="433.023" ro="452.33" w="91.15" eta="2" phi="1 2 3 4 5 6 7 8" dphi="22.5" /> <ABox n="MDT_BIR" zi="52" zo="143.607" ri="584.903" ro="626.517" w="267.15" eta="1" phi="6" sh="11.65" /> <ABox n="MDT_BIR" zi="52" zo="143.607" ri="584.903" ro="626.517" w="267.15" eta="1" phi="8" sh="-11.65" /> <ABox n="MDT_BIR" zi="200" zo="291.607" ri="588.642" ro="630.255" w="153.65" eta="2" phi="6" sh="68.4" /> <ABox n="MDT_BIR" zi="200" zo="291.607" ri="588.642" ro="630.255" w="153.65" eta="2" phi="8" sh="-68.4" /> <ABox n="MDT_BIR" zi="292" zo="392.617" ri="586.601" ro="628.214" w="110.55" eta="3" phi="6" sh="46.85" /> <ABox n="MDT_BIR" zi="292" zo="392.617" ri="586.601" ro="628.214" w="110.55" eta="3" phi="8" sh="-46.85" /> <ABox n="MDT_BIR" zi="394" zo="485.607" ri="588.642" ro="630.255" w="153.65" eta="4" phi="6" sh="68.4" /> <ABox n="MDT_BIR" zi="394" zo="485.607" ri="588.642" ro="630.255" w="153.65" eta="4" phi="8" sh="-68.4" /> <ABox n="MDT_BIR" zi="541" zo="614.586" ri="588.642" ro="630.255" w="153.65" eta="5" phi="6" sh="68.4" /> <ABox n="MDT_BIR" zi="541" zo="614.586" ri="588.642" ro="630.255" w="153.65" eta="5" phi="8" sh="-68.4" /> <ABox n="MDT_BIR" zi="616" zo="725.628" ri="586.601" ro="628.214" w="110.55" eta="6" phi="6" sh="46.85" /> <ABox n="MDT_BIR" zi="616" zo="725.628" ri="586.601" ro="628.214" w="110.55" eta="6" phi="8" sh="-46.85" /> <ABox n="MDT_BMF" zi="62.5" zo="280.254" ri="777.694" ro="842.905" w="309.6" eta="1" phi="6 7" dphi="22.5" RPCi="15" RPCo="15" /> <ABox n="MDT_BMF" zi="406" zo="599.726" ri="777.694" ro="842.905" w="309.6" eta="2" phi="6 7" dphi="22.5" RPCi="15" RPCo="15" /> <ABox n="MDT_BMF" zi="728" zo="873.67" ri="777.694" ro="842.905" w="309.6" eta="3" phi="6 7" dphi="22.5" RPCi="15" RPCo="15" /> <ABox n="MDT_BOF" zi="62.57" zo="280.324" ri="1028.19" ro="1093.06" w="379.6" eta="1" phi="6 7" dphi="22.5" RPCo="15" /> <ABox n="MDT_BOF" zi="405.46" zo="599.186" ri="1028.19" ro="1107.41" w="379.6" eta="2" phi="6 7" dphi="22.5" RPCo="15" /> <ABox n="MDT_BOF" zi="727.92" zo="873.59" ri="1028.19" ro="1107.41" w="379.6" eta="3" phi="6 7" dphi="22.5" RPCo="15" /> <ABox n="MDT_BOF" zi="1002.6" zo="1124.24" ri="1028.19" ro="1106.21" w="379.6" eta="4" phi="6 7" dphi="22.5" RPCo="15" /> <ABox n="MDT_BOG" zi="-60" zo="61.6418" ri="1028.19" ro="1093.06" w="379.6" eta="0" phi="6 7" dphi="22.5" RPCo="15" /> <ABox n="MDT_BOG" zi="282.07" zo="403.712" ri="1028.19" ro="1093.06" w="379.6" eta="1" phi="6 7" dphi="22.5" RPCo="15" /> <ABox n="MDT_BOG" zi="602.73" zo="724.372" ri="1028.19" ro="1093.06" w="379.6" eta="2" phi="6 7" dphi="22.5" RPCo="15" /> <ABox n="MDT_BOG" zi="877.14" zo="998.782" ri="1028.19" ro="1106.21" w="379.6" eta="3" phi="6 7" dphi="22.5" RPCo="15" /> <ABox n="MDT_BOG" zi="1147.2" zo="1268.84" ri="1028.19" ro="1106.21" w="379.6" eta="4" phi="6 7" dphi="22.5" RPCo="15" /> <ATrd n="MDT_EIL1" zi="749.146" zo="785.86" ri="207.6" ro="317.228" wi="132.15" wo="186.9" eta="1" phi="1 2 3 4 5 6 7 8" /> <ATrd n="MDT_EIL2" zi="749.146" zo="785.86" ri="319.1" ro="428.728" wi="186.15" wo="240.9" eta="2" phi="1 2 3 4 5 6 7 8" /> <ATrd n="MDT_EIL3" zi="749.146" zo="785.86" ri="427.23" ro="464.774" wi="207.15" wo="207.15" eta="3" phi="1 2 3 4 5 7" /> <ATrd n="MDT_EIL3" zi="749.146" zo="785.86" ri="427.535" ro="465.079" wi="174.15" wo="174.15" eta="3" phi="6" sh="-16.5" /> <ATrd n="MDT_EIL3" zi="749.146" zo="785.86" ri="427.535" ro="465.079" wi="174.15" wo="174.15" eta="3" phi="8" sh="16.5" /> <ATrd n="MDT_EIL4" zi="745.796" zo="782.51" ri="472" ro="509.544" wi="153.65" wo="153.65" eta="4" phi="1 5" /> <ATrd n="MDT_EIL4" zi="745.796" zo="782.51" ri="472" ro="635.691" wi="235.15" wo="316.9" eta="4" phi="2 3 7" /> <ATrd n="MDT_EIL4" zi="745.796" zo="782.51" ri="473.105" ro="636.796" wi="165.15" wo="246.9" eta="4" phi="4" sh="35" /> <ATrd n="MDT_EIL4" zi="745.796" zo="782.51" ri="511.445" ro="639.094" wi="128.15" wo="191.9" eta="4" phi="6" sh="-62.5" /> <ATrd n="MDT_EIL4" zi="745.796" zo="782.51" ri="511.445" ro="639.094" wi="128.15" wo="191.9" eta="4" phi="8" sh="62.5" /> <ATrd n="MDT_EIL5" zi="745.796" zo="782.51" ri="508.04" ro="635.689" wi="253.15" wo="316.9" eta="5" phi="1 5" /> <ATrd n="MDT_EML1" zi="1411.25" zo="1447.66" ri="177" ro="346.698" wi="118.65" wo="203.4" eta="1" phi="1 2 3 4 5 6 7 8" /> <ATrd n="MDT_EML2" zi="1411.25" zo="1447.66" ri="348.5" ro="542.226" wi="202.65" wo="299.4" eta="2" phi="1 2 3 4 5 6 7 8" /> <ATrd n="MDT_EML3" zi="1411.25" zo="1447.66" ri="544" ro="737.726" wi="298.65" wo="395.4" eta="3" phi="1 2 3 4 5 6 7 8" /> <ATrd n="MDT_EML4" zi="1411.25" zo="1447.66" ri="739.5" ro="933.226" wi="394.65" wo="491.4" eta="4" phi="1 2 3 4 5 6 7 8" /> <ATrd n="MDT_EML5" zi="1411.25" zo="1447.66" ri="935" ro="1128.73" wi="490.65" wo="587.4" eta="5" phi="1 2 3 4 5 6 7 8" /> <ATrd n="MDT_EMS1" zi="1369.65" zo="1406.06" ri="177" ro="370.726" wi="83.55" wo="141.6" eta="1" phi="1 2 3 4 5 6 7 8" dphi="22.5" /> <ATrd n="MDT_EMS2" zi="1369.65" zo="1406.06" ri="372.5" ro="566.226" wi="141.15" wo="199.2" eta="2" phi="1 2 3 4 5 6 7 8" dphi="22.5" /> <ATrd n="MDT_EMS3" zi="1369.65" zo="1406.06" ri="568" ro="761.726" wi="198.75" wo="256.8" eta="3" phi="1 2 3 4 5 6 7 8" dphi="22.5" /> <ATrd n="MDT_EMS4" zi="1369.65" zo="1406.06" ri="763.5" ro="957.226" wi="256.35" wo="314.4" eta="4" phi="1 2 3 4 5 6 7 8" dphi="22.5" /> <ATrd n="MDT_EMS5" zi="1369.65" zo="1406.06" ri="959" ro="1152.73" wi="313.95" wo="372" eta="5" phi="1 2 3 4 5 6 7 8" dphi="22.5" /> <ATrd n="MDT_EOL1" zi="2117.5" zo="2153.91" ri="277" ro="446.698" wi="168.15" wo="252.9" eta="1" phi="1 2 3 4 5 6 7 8" /> <ATrd n="MDT_EOL2" zi="2117.5" zo="2153.91" ri="448.5" ro="618.198" wi="264.15" wo="348.9" eta="2" phi="1 2 3 4 5 6 7 8" /> <ATrd n="MDT_EOL3" zi="2117.5" zo="2153.91" ri="620" ro="765.67" wi="348.15" wo="420.9" eta="3" phi="1 2 3 4 5 6 7 8" /> <ATrd n="MDT_EOL4" zi="2117.5" zo="2153.91" ri="767.5" ro="913.17" wi="420.15" wo="492.9" eta="4" phi="1 2 3 4 5 6 7 8" /> <ATrd n="MDT_EOL5" zi="2117.5" zo="2153.91" ri="915" ro="1060.67" wi="492.15" wo="564.9" eta="5" phi="1 2 3 4 5 6 7 8" /> <ATrd n="MDT_EOL6" zi="2117.5" zo="2153.91" ri="1062.5" ro="1208.17" wi="564.15" wo="636.9" eta="6" phi="1 2 3 4 5 6 7 8" /> <ATrd n="MDT_EOS1" zi="2158.4" zo="2194.81" ri="277" ro="446.698" wi="124.95" wo="175.8" eta="1" phi="1 2 3 4 5 6 7 8" dphi="22.5" /> <ATrd n="MDT_EOS2" zi="2158.4" zo="2194.81" ri="448.5" ro="618.198" wi="175.35" wo="226.2" eta="2" phi="1 2 3 4 5 6 7 8" dphi="22.5" /> <ATrd n="MDT_EOS3" zi="2158.4" zo="2194.81" ri="620" ro="789.698" wi="225.75" wo="276.6" eta="3" phi="1 2 3 4 5 6 7 8" dphi="22.5" /> <ATrd n="MDT_EOS4" zi="2158.4" zo="2194.81" ri="791.5" ro="937.17" wi="276.15" wo="319.8" eta="4" phi="1 2 3 4 5 6 7 8" dphi="22.5" /> <ATrd n="MDT_EOS5" zi="2158.4" zo="2194.81" ri="939" ro="1084.67" wi="319.35" wo="363" eta="5" phi="1 2 3 4 5 6 7 8" dphi="22.5" /> <ATrd n="MDT_EOS6" zi="2158.4" zo="2194.81" ri="1086.5" ro="1232.17" wi="362.55" wo="406.2" eta="6" phi="1 2 3 4 5 6 7 8" dphi="22.5" /> <ATrd n="TGC_T1F1" zi="1327.15" zo="1334.15" ri="190" ro="397.54" wi="57.69" wo="112.34" eta="1" phi="1 3 5 7 9 11 13 15 17 19 21 23" dphi="7.5" /> <ATrd n="TGC_T1F1" zi="1345.05" zo="1352.05" ri="190" ro="397.54" wi="57.69" wo="112.34" eta="1" phi="2 4 6 8 10 12 14 16 18 20 22 24" dphi="7.5" /> <ATrd n="TGC_T1E1" zi="1345.05" zo="1359.95" ri="388" ro="1068.2" wi="64.49" wo="154.85" eta="1" phi="1 3 5 7 9 11 13 15 17 19 21 23 25 27 29 31 33 35 37 39 41 43 45 47" dphi="3.75" /> <ATrd n="TGC_T1E1" zi="1327.15" zo="1342.05" ri="388" ro="1068.2" wi="64.49" wo="154.85" eta="1" phi="2 4 6 8 10 12 14 16 18 20 22 24 26 28 30 32 34 36 38 40 42 44 46 48" dphi="3.75" /> <ATrd n="TGC_T2F1" zi="1460.05" zo="1464.42" ri="252.59" ro="432.15" wi="75.51" wo="122.78" eta="1" phi="1 3 5 7 9 11 13 15 17 19 21 23" dphi="7.5" /> <ATrd n="TGC_T2F1" zi="1475.55" zo="1479.92" ri="252.59" ro="432.15" wi="75.51" wo="122.78" eta="1" phi="2 4 6 8 10 12 14 16 18 20 22 24" dphi="7.5" /> <ATrd n="TGC_T2E1" zi="1475.55" zo="1485.42" ri="418.4" ro="1191.7" wi="68.47" wo="170.84" eta="1" phi="1 3 5 7 9 11 13 15 17 19 21 23 25 27 29 31 33 35 37 39 41 43 45 47" dphi="3.75" /> <ATrd n="TGC_T2E1" zi="1460.05" zo="1469.92" ri="418.4" ro="1191.7" wi="68.47" wo="170.84" eta="1" phi="2 4 6 8 10 12 14 16 18 20 22 24 26 28 30 32 34 36 38 40 42 44 46 48" dphi="3.75" /> <ATrd n="TGC_T3F1" zi="1502.05" zo="1506.42" ri="261" ro="440.56" wi="75.51" wo="122.79" eta="1" phi="1 3 5 7 9 11 13 15 17 19 21 23" dphi="7.5" /> <ATrd n="TGC_T3F1" zi="1517.55" zo="1521.92" ri="261" ro="440.56" wi="75.51" wo="122.79" eta="1" phi="2 4 6 8 10 12 14 16 18 20 22 24" dphi="7.5" /> <ATrd n="TGC_T3E1" zi="1517.55" zo="1527.42" ri="436.56" ro="1191.7" wi="70.84" wo="170.84" eta="1" phi="1 3 5 7 9 11 13 15 17 19 21 23 25 27 29 31 33 35 37 39 41 43 45 47" dphi="3.75" /> <ATrd n="TGC_T3E1" zi="1502.05" zo="1511.92" ri="436.56" ro="1191.7" wi="70.84" wo="170.84" eta="1" phi="2 4 6 8 10 12 14 16 18 20 22 24 26 28 30 32 34 36 38 40 42 44 46 48" dphi="3.75" /> <ATrd n="TGC_T4F1" zi="698.06" zo="702.43" ri="217" ro="443.4" wi="62.38" wo="121.99" eta="1" phi="1 3 4 6 7 9 10 12 13 15 16 18 19 21 22 24" dphi="7.5" /> <ATrd n="TGC_T4F1" zi="693.04" zo="697.41" ri="217" ro="433.4" wi="62.38" wo="119.36" eta="1" phi="2 5 8 11 14 17 20 23" dphi="7.5" /> <ATrd n="TGC_T4E1" zi="730.87" zo="735.24" ri="470" ro="619" wi="83.33" wo="108.09" eta="1" phi="1 4 7" /> <ATrd n="TGC_T4E1" zi="737.53" zo="741.9" ri="520" ro="619" wi="91.64" wo="108.09" eta="1" phi="2" dphi="-5.5" /> <ATrd n="TGC_T4E1" zi="737.53" zo="741.9" ri="470" ro="619" wi="83.33" wo="108.09" eta="1" phi="3 6" dphi="5.5" /> <ATrd n="TGC_T4E1" zi="737.53" zo="741.9" ri="470" ro="619" wi="83.33" wo="108.09" eta="1" phi="5 8" dphi="-5.5" /> <ATrd n="TGC_T4E1" zi="730.87" zo="735.24" ri="470" ro="619" wi="83.33" wo="108.09" eta="1" phi="9 12" dphi="15" /> <ATrd n="TGC_T4E1" zi="737.53" zo="741.9" ri="470" ro="619" wi="83.33" wo="108.09" eta="1" phi="10" dphi="9.5" /> <ATrd n="TGC_T4E1" zi="737.53" zo="741.9" ri="520" ro="619" wi="91.64" wo="108.09" eta="1" phi="11 14" dphi="20.5" /> <ATrd n="TGC_T4E1" zi="737.53" zo="741.9" ri="520" ro="619" wi="91.64" wo="108.09" eta="1" phi="13" dphi="9.5" /> <ATrd n="TGC_T4E1" zi="730.87" zo="735.24" ri="520" ro="619" wi="91.64" wo="108.09" eta="1" phi="15" dphi="15" /> <ATrd n="TGC_T4E1" zi="737.53" zo="741.9" ri="470" ro="619" wi="83.33" wo="108.09" eta="1" phi="16" dphi="35.5" /> <ATrd n="TGC_T4E1" zi="730.87" zo="735.24" ri="470" ro="619" wi="83.33" wo="108.09" eta="1" phi="17" dphi="30" /> <ATrd n="TGC_T4E1" zi="737.53" zo="741.9" ri="470" ro="619" wi="83.33" wo="108.09" eta="1" phi="18" dphi="24.5" /> <ATrd n="TGC_T4E1" zi="730.87" zo="735.24" ri="520" ro="619" wi="91.64" wo="108.09" eta="1" phi="19" dphi="45" /> <ATrd n="TGC_T4E1" zi="737.53" zo="741.9" ri="520" ro="619" wi="91.64" wo="108.09" eta="1" phi="20" dphi="39.5" /> <ATrd n="TGC_T4E1" zi="737.53" zo="741.9" ri="520" ro="619" wi="91.64" wo="108.09" eta="1" phi="21" dphi="50.5" /> <ATrd n="MDT_EIS1" zi="707.746" zo="744.46" ri="207.6" ro="335.249" wi="89.85" wo="128.1" eta="1" phi="1 2 3 4 5 6 7 8" dphi="22.5" /> <ATrd n="MDT_EIS2" zi="707.746" zo="744.46" ri="337.1" ro="446.728" wi="127.65" wo="160.5" eta="2" phi="1 2 3 4 5 6 7 8" dphi="22.5" /> <ATrd n="CSC_CSS1" zi="708.06" zo="724.63" ri="87.0128" ro="206.473" wi="40.29" wo="74.75" eta="1" phi="1 2 3 4 5 6 7 8" dphi="22.5" a="-11.587" /> <ATrd n="CSC_CSL1" zi="744.319" zo="760.889" ri="92.4354" ro="207.125" wi="61.01" wo="112.87" eta="1" phi="1 2 3 4 5 6 7 8" a="-11.587" /> <ABox n="MDT_BIM" zi="107" zo="216.628" ri="519.465" ro="561.079" w="153.65" eta="1" phi="6" sh="-56.6" /> <ABox n="MDT_BIM" zi="107" zo="216.628" ri="519.465" ro="561.079" w="153.65" eta="1" phi="8" sh="56.6" /> <ABox n="MDT_BIM" zi="217" zo="326.628" ri="519.465" ro="561.079" w="153.65" eta="2" phi="6" sh="-56.6" /> <ABox n="MDT_BIM" zi="217" zo="326.628" ri="519.465" ro="561.079" w="153.65" eta="2" phi="8" sh="56.6" /> <ABox n="MDT_BIM" zi="327" zo="436.628" ri="519.465" ro="561.079" w="153.65" eta="3" phi="6" sh="-56.6" /> <ABox n="MDT_BIM" zi="327" zo="436.628" ri="519.465" ro="561.079" w="153.65" eta="3" phi="8" sh="56.6" /> <ABox n="MDT_BIM" zi="437" zo="546.628" ri="519.465" ro="561.079" w="153.65" eta="4" phi="6" sh="-56.6" /> <ABox n="MDT_BIM" zi="437" zo="546.628" ri="519.465" ro="561.079" w="153.65" eta="4" phi="8" sh="56.6" /> <ABox n="MDT_BIM" zi="547" zo="656.628" ri="519.465" ro="561.079" w="153.65" eta="5" phi="6" sh="-56.6" /> <ABox n="MDT_BIM" zi="547" zo="656.628" ri="519.465" ro="561.079" w="153.65" eta="5" phi="8" sh="56.6" /> </AGeometry> --- NEW FILE: AMuonGeometry_P_03.xml --- <?xml version="1.0"?> <AGeometry> <!-- ========== BIS ========== BIS ========== BIS ========== BIS ========== BIS ========== BIS ========== BIS ========== BIS ========== BIS ========== BIS ===== --> <!-- Define for 8 BIS chambers the Atlantis Graphics data --> <ABox n="MDT_BIS1" zi=" 1.000" zo=" 110.620" ri=" 438.297" ro=" 466.703" w="167.150" s="12345678" dphi=" 22.500" /> <ABox n="MDT_BIS2" zi=" 111.000" zo=" 202.600" ri=" 438.297" ro=" 466.703" w="167.150" s="12345678" dphi=" 22.500" /> <ABox n="MDT_BIS3" zi=" 203.000" zo=" 294.600" ri=" 438.297" ro=" 466.703" w="167.150" s="12345678" dphi=" 22.500" /> <ABox n="MDT_BIS4" zi=" 295.000" zo=" 386.600" ri=" 438.297" ro=" 466.703" w="167.150" s="12345678" dphi=" 22.500" /> <ABox n="MDT_BIS5" zi=" 387.000" zo=" 478.600" ri=" 438.297" ro=" 466.703" w="167.150" s="12345678" dphi=" 22.500" /> <ABox n="MDT_BIS6" zi=" 479.000" zo=" 570.600" ri=" 438.297" ro=" 466.703" w="167.150" s="12345678" dphi=" 22.500" /> <ABox n="MDT_BIS7" zi=" 571.000" zo=" 680.620" ri=" 438.297" ro=" 466.703" w="167.150" s="12345678" dphi=" 22.500" /> <ABox n="MDT_BIS8" zi=" 681.000" zo=" 754.580" ri=" 449.823" ro=" 466.776" w=" 85.150" sh=" 6.000" s="12345678" dphi=" 22.500" /> <!-- ========== BEE ========== BEE ========== BEE ========== BEE ========== BEE ========== BEE ========== BEE ========== BEE ========== BEE ========== BEE ===== --> <!-- Define for 2 BEE chambers the Atlantis Graphics data --> <ABox n="MDT_BEE1" zi=" 879.000" zo="1024.670" ri=" 434.523" ro=" 451.477" w=" 91.150" s="12345678" dphi=" 22.500" /> <ABox n="MDT_BEE2" zi="1025.000" zo="1170.670" ri=" 434.523" ro=" 451.477" w=" 91.150" s="12345678" dphi=" 22.500" /> <!-- ========== BIL ========== BIL ========== BIL ========== BIL ========== BIL ========== BIL ========== BIL ========== BIL ========== BIL ========== BIL ===== --> <!-- Define for 9 BIL chambers the Atlantis Graphics data --> <ABox n="MDT_BIL1" zi=" 15.100" zo=" 124.720" ri... [truncated message content] |
|
From: Julius H. <hr...@us...> - 2007-01-24 14:00:40
|
Update of /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv19672/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps Modified Files: AGeometry.java Removed Files: AGeneralPath.java Log Message: new geom files added Index: AGeometry.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps/AGeometry.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** AGeometry.java 23 Jan 2007 17:00:14 -0000 1.5 --- AGeometry.java 24 Jan 2007 14:00:35 -0000 1.6 *************** *** 6,10 **** // Generic Model import net.hep.atlas.graphics.JiveGeometry.JAXB.AGeometryType; - import net.hep.atlas.graphics.JiveGeometry.JAXB.AGeneralPathType; import net.hep.atlas.graphics.JiveGeometry.JAXB.ABarrelCalorimeterType; import net.hep.atlas.graphics.JiveGeometry.JAXB.AEndcapCalorimeterType; --- 6,9 ---- *************** *** 38,41 **** --- 37,43 ---- * <pre> * $Log$ + * Revision 1.6 2007/01/24 14:00:35 hrivnac + * new geom files added + * * Revision 1.5 2007/01/23 17:00:14 hrivnac * TRT and Silicons added *************** *** 96,100 **** // TBD: simplify BranchGroup branch = new BranchGroup();; - AGeneralPathType aGeneralPath; ABarrelCalorimeterType aBarrelCalorimeter; AEndcapCalorimeterType aEndcapCalorimeter; --- 98,101 ---- *************** *** 105,115 **** AEndcapSiliconDetectorType aEndcapSiliconDetector; for (Object o : aGeometry.getAGeometryConstantOrAGeneralPathOrADisc()) { ! // - AGeneralPath ! if (o instanceof AGeneralPathType) { ! aGeneralPath = (AGeneralPathType)o; ! (new AGeneralPath()).traverse(builder, aGeneralPath, branch, name); ! } // - ABarrelCalorimeter ! else if (o instanceof ABarrelCalorimeterType) { aBarrelCalorimeter = (ABarrelCalorimeterType)o; (new ABarrelCalorimeter()).traverse(builder, aBarrelCalorimeter, branch, name); --- 106,112 ---- AEndcapSiliconDetectorType aEndcapSiliconDetector; for (Object o : aGeometry.getAGeometryConstantOrAGeneralPathOrADisc()) { ! // - AGeneralPath, ADisc, ARectangle // - ABarrelCalorimeter ! if (o instanceof ABarrelCalorimeterType) { aBarrelCalorimeter = (ABarrelCalorimeterType)o; (new ABarrelCalorimeter()).traverse(builder, aBarrelCalorimeter, branch, name); --- AGeneralPath.java DELETED --- |
|
From: Julius H. <hr...@us...> - 2007-01-23 17:00:26
|
Update of /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv18003/net/hep/atlas/graphics/JiveGeometry/GeometricModel Modified Files: JiveGeometryBuilder.java JiveRep.java Log Message: TRT and Silicons added Index: JiveRep.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/JiveRep.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** JiveRep.java 23 Jan 2007 11:19:41 -0000 1.3 --- JiveRep.java 23 Jan 2007 17:00:13 -0000 1.4 *************** *** 36,39 **** --- 36,42 ---- * <pre> * $Log$ + * Revision 1.4 2007/01/23 17:00:13 hrivnac + * TRT and Silicons added + * * Revision 1.3 2007/01/23 11:19:41 hrivnac * Calorimeter works *************** *** 80,84 **** * @param r The r-coordinates of one solid quadrant * @param reflect The whether z-reflected solid should be created too. - * @param phi0 The solid start in phi. * @param nPhi The number of solid' subdivisions in phi. * @param color The name of the solid' color. --- 83,86 ---- *************** *** 87,98 **** double[] r, boolean reflect, - double phi0, int nPhi, String color, String name) { - // BUG: the real phi0 sjould be used - phi0 = 0.0; - // Set info String info = name; --- 89,96 ---- *************** *** 100,104 **** // Set Appearance _appearance = builder().appearance(name, color); ! _appearance. setTransparencyAttributes(new TransparencyAttributes(TransparencyAttributes.NICEST, 0.5f)); // Create PolyGoneSegments --- 98,102 ---- // Set Appearance _appearance = builder().appearance(name, color); ! //_appearance. setTransparencyAttributes(new TransparencyAttributes(TransparencyAttributes.NICEST, 0.5f)); // Create PolyGoneSegments *************** *** 109,122 **** // z+- if (reflect) { ! use(new PolyGoneSegment(rmins, rmaxs, zmins, zmaxs, phi0, phi0 + 2*PI, nPhi, _appearance), name + "+", info); zmins = new double[]{- zmins[1], - zmins[0]}; zmaxs = new double[]{- zmaxs[1], - zmaxs[0]}; rmins = new double[]{ rmins[1], rmins[0]}; rmaxs = new double[]{ rmaxs[1], rmaxs[0]}; ! use(new PolyGoneSegment(rmins, rmaxs, zmins, zmaxs, phi0, phi0 + 2*PI, nPhi, _appearance), name + "-", info); } // only one else { ! use(new PolyGoneSegment(rmins, rmaxs, zmins, zmaxs, phi0, phi0 + 2*PI, nPhi, _appearance), name, info); } } --- 107,120 ---- // z+- if (reflect) { ! use(new PolyGoneSegment(rmins, rmaxs, zmins, zmaxs, 0.0, 2*PI, nPhi, _appearance), name + "+", info); zmins = new double[]{- zmins[1], - zmins[0]}; zmaxs = new double[]{- zmaxs[1], - zmaxs[0]}; rmins = new double[]{ rmins[1], rmins[0]}; rmaxs = new double[]{ rmaxs[1], rmaxs[0]}; ! use(new PolyGoneSegment(rmins, rmaxs, zmins, zmaxs, 0.0, 2*PI, nPhi, _appearance), name + "-", info); } // only one else { ! use(new PolyGoneSegment(rmins, rmaxs, zmins, zmaxs, 0.0, 2*PI, nPhi, _appearance), name, info); } } Index: JiveGeometryBuilder.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/JiveGeometryBuilder.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** JiveGeometryBuilder.java 23 Jan 2007 11:19:41 -0000 1.5 --- JiveGeometryBuilder.java 23 Jan 2007 17:00:12 -0000 1.6 *************** *** 22,25 **** --- 22,28 ---- * <pre> * $Log$ + * Revision 1.6 2007/01/23 17:00:12 hrivnac + * TRT and Silicons added + * * Revision 1.5 2007/01/23 11:19:41 hrivnac * Calorimeter works *************** *** 45,49 **** /** Perform configuration. */ public void configure() { ! //BuildOptions.setColorPerMaterial(true); } --- 48,52 ---- /** Perform configuration. */ public void configure() { ! BuildOptions.setColorPerMaterial(true); } |
|
From: Julius H. <hr...@us...> - 2007-01-23 17:00:25
|
Update of /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv18003/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps Modified Files: ABarrelCalorimeter.java AEndcapCalorimeter.java AGapCalorimeter.java AGeometry.java Added Files: ABarrelSiliconDetector.java ABarrelTRTDetector.java AEndcapSiliconDetector.java AEndcapTRTDetector.java Log Message: TRT and Silicons added --- NEW FILE: ABarrelTRTDetector.java --- package net.hep.atlas.graphics.JiveGeometry.GeometricModel.Reps; import net.hep.atlas.graphics.JiveGeometry.GeometricModel.JiveGeometryBuilder; import net.hep.atlas.graphics.JiveGeometry.GeometricModel.JiveRep; // Generic Model import net.hep.atlas.graphics.JiveGeometry.JAXB.ABarrelTRTDetectorType; // GraXML import net.hep.graphics.GraXML.GraXMLJAXBRep; import net.hep.graphics.GraXML.MasterBuilder; import net.hep.graphics.GraXML.Disconnecter.DetachableConnection; import net.hep.graphics.GraXML.Disconnecter.ConnectionsDB; // Java3D import javax.media.j3d.Group; import javax.media.j3d.BranchGroup; import javax.vecmath.Point3d; import javax.media.j3d.Appearance; // JAXB import javax.xml.bind.Element; // Java import static java.lang.Math.PI; import static java.lang.Math.sinh; import static java.lang.Math.toRadians; // Log4J import org.apache.log4j.Logger; /** GraXML representation {@link GraXMLJAXBRep} of <code>ABarrelTRTDetector</code> JiveGeometry element * connected via JAXB {@link net.hep.atlas.graphics.JiveGeometry.JAXB.ABarrelTRTDetector} generic JAXB * interface. * <p><font color="#880088"> * <pre> * $Log: ABarrelTRTDetector.java,v $ * Revision 1.1 2007/01/23 17:00:14 hrivnac * TRT and Silicons added * * </pre> * </font></p> * @version $Id: ABarrelTRTDetector.java,v 1.1 2007/01/23 17:00:14 hrivnac Exp $ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ public final class ABarrelTRTDetector extends JiveRep { public final void traverse(JiveGeometryBuilder builder, ABarrelTRTDetectorType ABarrelTRTDetector, Group tg, String parent) { // Set values set(builder, tg, parent); // Get element properties String color = ABarrelTRTDetector.getC(); String name = ABarrelTRTDetector.getN(); int layer = ABarrelTRTDetector.getLayer(); double rMin = ABarrelTRTDetector.getRMin() / builder.norm(); double rMax = ABarrelTRTDetector.getRMax() / builder.norm(); double zMin = ABarrelTRTDetector.getZMin() / builder.norm(); double zMax = ABarrelTRTDetector.getZMax() / builder.norm(); double phiIn = toRadians(ABarrelTRTDetector.getPhiIn()); double phiOut = toRadians(ABarrelTRTDetector.getPhiOut()); int nPhi = ABarrelTRTDetector.getNphi(); double dPhi = 2.0 * PI / nPhi; // Find dimensions name += "[" + layer + "]"; // Construct Atlantis representation double[] z = new double[] {zMax, zMin, zMin, zMax}; double[] r = new double[] {rMax, rMax, rMin, rMin}; // Use Atlantis representation atlantis2GraXML(z, r, false, nPhi, color, name); } private static int k = 0; /** Logging . */ private static Logger log = Logger.getLogger(ABarrelTRTDetector.class); } --- NEW FILE: ABarrelSiliconDetector.java --- package net.hep.atlas.graphics.JiveGeometry.GeometricModel.Reps; import net.hep.atlas.graphics.JiveGeometry.GeometricModel.JiveGeometryBuilder; import net.hep.atlas.graphics.JiveGeometry.GeometricModel.JiveRep; // Generic Model import net.hep.atlas.graphics.JiveGeometry.JAXB.ABarrelSiliconDetectorType; // GraXML import net.hep.graphics.GraXML.GraXMLJAXBRep; import net.hep.graphics.GraXML.MasterBuilder; import net.hep.graphics.GraXML.Disconnecter.DetachableConnection; import net.hep.graphics.GraXML.Disconnecter.ConnectionsDB; // Java3D import javax.media.j3d.Group; import javax.media.j3d.BranchGroup; import javax.vecmath.Point3d; import javax.media.j3d.Appearance; // JAXB import javax.xml.bind.Element; // Java import static java.lang.Math.PI; import static java.lang.Math.abs; import static java.lang.Math.sin; import static java.lang.Math.cos; import static java.lang.Math.sinh; import static java.lang.Math.toRadians; // Log4J import org.apache.log4j.Logger; /** GraXML representation {@link GraXMLJAXBRep} of <code>ABarrelSiliconDetector</code> JiveGeometry element * connected via JAXB {@link net.hep.atlas.graphics.JiveGeometry.JAXB.ABarrelSiliconDetector} generic JAXB * interface. * <p><font color="#880088"> * <pre> * $Log: ABarrelSiliconDetector.java,v $ * Revision 1.1 2007/01/23 17:00:14 hrivnac * TRT and Silicons added * * </pre> * </font></p> * @version $Id: ABarrelSiliconDetector.java,v 1.1 2007/01/23 17:00:14 hrivnac Exp $ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ public final class ABarrelSiliconDetector extends JiveRep { public final void traverse(JiveGeometryBuilder builder, ABarrelSiliconDetectorType ABarrelSiliconDetector, Group tg, String parent) { // Set values set(builder, tg, parent); // Get element properties String color = ABarrelSiliconDetector.getC(); String name = ABarrelSiliconDetector.getN(); int layer = ABarrelSiliconDetector.getLayer(); double length = ABarrelSiliconDetector.getLength() / builder.norm(); double width = ABarrelSiliconDetector.getWidth() / builder.norm(); double thickness = ABarrelSiliconDetector.getThickness() / builder.norm(); double tilt = ABarrelSiliconDetector.getTilt() / builder.norm(); double r0 = ABarrelSiliconDetector.getR0() / builder.norm(); double phi0 = ABarrelSiliconDetector.getPhi0() / builder.norm(); double zMin = ABarrelSiliconDetector.getZMin() / builder.norm(); double zMax = ABarrelSiliconDetector.getZMax() / builder.norm(); int nZ = ABarrelSiliconDetector.getNz(); int nPhi = ABarrelSiliconDetector.getNphi(); double dZ = (zMax - zMin) / nZ; double dPhi = 2.0 * PI / nPhi; // Find dimensions double rMin = r0 - abs(thickness * cos(tilt)) - abs(width * sin(tilt)); double rMax = r0 + abs(thickness * cos(tilt)) + abs(width * sin(tilt)); name += "[" + layer + "]"; // Construct Atlantis representation double[] z = new double[] {zMax, zMin, zMin, zMax}; double[] r = new double[] {rMax, rMax, rMin, rMin}; // Use Atlantis representation atlantis2GraXML(z, r, false, nPhi, color, name); } private static int k = 0; /** Logging . */ private static Logger log = Logger.getLogger(ABarrelSiliconDetector.class); } --- NEW FILE: AEndcapTRTDetector.java --- package net.hep.atlas.graphics.JiveGeometry.GeometricModel.Reps; import net.hep.atlas.graphics.JiveGeometry.GeometricModel.JiveGeometryBuilder; import net.hep.atlas.graphics.JiveGeometry.GeometricModel.JiveRep; // Generic Model import net.hep.atlas.graphics.JiveGeometry.JAXB.AEndcapTRTDetectorType; // GraXML import net.hep.graphics.GraXML.GraXMLJAXBRep; import net.hep.graphics.GraXML.MasterBuilder; import net.hep.graphics.GraXML.Disconnecter.DetachableConnection; import net.hep.graphics.GraXML.Disconnecter.ConnectionsDB; // Java3D import javax.media.j3d.Group; import javax.media.j3d.BranchGroup; import javax.vecmath.Point3d; import javax.media.j3d.Appearance; // JAXB import javax.xml.bind.Element; // Java import static java.lang.Math.PI; import static java.lang.Math.sinh; import static java.lang.Math.toRadians; // Log4J import org.apache.log4j.Logger; /** GraXML representation {@link GraXMLJAXBRep} of <code>AEndcapTRTDetector</code> JiveGeometry element * connected via JAXB {@link net.hep.atlas.graphics.JiveGeometry.JAXB.AEndcapTRTDetector} generic JAXB * interface. * <p><font color="#880088"> * <pre> * $Log: AEndcapTRTDetector.java,v $ * Revision 1.1 2007/01/23 17:00:14 hrivnac * TRT and Silicons added * * </pre> * </font></p> * @version $Id: AEndcapTRTDetector.java,v 1.1 2007/01/23 17:00:14 hrivnac Exp $ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ public final class AEndcapTRTDetector extends JiveRep { public final void traverse(JiveGeometryBuilder builder, AEndcapTRTDetectorType AEndcapTRTDetector, Group tg, String parent) { // Set values set(builder, tg, parent); // Get element properties String color = AEndcapTRTDetector.getC(); String name = AEndcapTRTDetector.getN(); int layer = AEndcapTRTDetector.getLayer(); double rMin = AEndcapTRTDetector.getRMin() / builder.norm(); double rMax = AEndcapTRTDetector.getRMax() / builder.norm(); double zMin = AEndcapTRTDetector.getZMin() / builder.norm(); double zMax = AEndcapTRTDetector.getZMax() / builder.norm(); double phi0 = toRadians(AEndcapTRTDetector.getPhi0()); int nPhi = AEndcapTRTDetector.getNphi(); double dPhi = 2.0 * PI / nPhi; // Find dimensions name += "[" + layer + "]"; // Construct Atlantis representation double[] z = new double[] {zMax, zMin, zMin, zMax}; double[] r = new double[] {rMax, rMax, rMin, rMin}; // Use Atlantis representation atlantis2GraXML(z, r, true, nPhi, color, name); } private static int k = 0; /** Logging . */ private static Logger log = Logger.getLogger(AEndcapTRTDetector.class); } Index: AGeometry.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps/AGeometry.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** AGeometry.java 23 Jan 2007 11:19:41 -0000 1.4 --- AGeometry.java 23 Jan 2007 17:00:14 -0000 1.5 *************** *** 10,13 **** --- 10,17 ---- import net.hep.atlas.graphics.JiveGeometry.JAXB.AEndcapCalorimeterType; import net.hep.atlas.graphics.JiveGeometry.JAXB.AGapCalorimeterType; + import net.hep.atlas.graphics.JiveGeometry.JAXB.ABarrelTRTDetectorType; + import net.hep.atlas.graphics.JiveGeometry.JAXB.AEndcapTRTDetectorType; + import net.hep.atlas.graphics.JiveGeometry.JAXB.ABarrelSiliconDetectorType; + import net.hep.atlas.graphics.JiveGeometry.JAXB.AEndcapSiliconDetectorType; // GraXML *************** *** 34,37 **** --- 38,44 ---- * <pre> * $Log$ + * Revision 1.5 2007/01/23 17:00:14 hrivnac + * TRT and Silicons added + * * Revision 1.4 2007/01/23 11:19:41 hrivnac * Calorimeter works *************** *** 87,95 **** // Traverse all children and add their representations into branch BranchGroup branch = new BranchGroup();; AGeneralPathType aGeneralPath; ABarrelCalorimeterType aBarrelCalorimeter; AEndcapCalorimeterType aEndcapCalorimeter; ! AGapCalorimeterType aGapCalorimeter; for (Object o : aGeometry.getAGeometryConstantOrAGeneralPathOrADisc()) { // - AGeneralPath --- 94,107 ---- // Traverse all children and add their representations into branch + // TBD: simplify BranchGroup branch = new BranchGroup();; AGeneralPathType aGeneralPath; ABarrelCalorimeterType aBarrelCalorimeter; AEndcapCalorimeterType aEndcapCalorimeter; ! AGapCalorimeterType aGapCalorimeter; ! ABarrelTRTDetectorType aBarrelTRTDetector; ! AEndcapTRTDetectorType aEndcapTRTDetector; ! ABarrelSiliconDetectorType aBarrelSiliconDetector; ! AEndcapSiliconDetectorType aEndcapSiliconDetector; for (Object o : aGeometry.getAGeometryConstantOrAGeneralPathOrADisc()) { // - AGeneralPath *************** *** 113,116 **** --- 125,148 ---- (new AGapCalorimeter()).traverse(builder, aGapCalorimeter, branch, name); } + // - ABarrelTRTDetector + else if (o instanceof ABarrelTRTDetectorType) { + aBarrelTRTDetector = (ABarrelTRTDetectorType)o; + (new ABarrelTRTDetector()).traverse(builder, aBarrelTRTDetector, branch, name); + } + // - AEndcapTRTDetector + else if (o instanceof AEndcapTRTDetectorType) { + aEndcapTRTDetector = (AEndcapTRTDetectorType)o; + (new AEndcapTRTDetector()).traverse(builder, aEndcapTRTDetector, branch, name); + } + // - ABarrelSiliconDetector + else if (o instanceof ABarrelSiliconDetectorType) { + aBarrelSiliconDetector = (ABarrelSiliconDetectorType)o; + (new ABarrelSiliconDetector()).traverse(builder, aBarrelSiliconDetector, branch, name); + } + // - AEndcapSiliconDetector + else if (o instanceof AEndcapSiliconDetectorType) { + aEndcapSiliconDetector = (AEndcapSiliconDetectorType)o; + (new AEndcapSiliconDetector()).traverse(builder, aEndcapSiliconDetector, branch, name); + } // TBD } Index: ABarrelCalorimeter.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps/ABarrelCalorimeter.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ABarrelCalorimeter.java 23 Jan 2007 11:19:41 -0000 1.3 --- ABarrelCalorimeter.java 23 Jan 2007 17:00:14 -0000 1.4 *************** *** 36,39 **** --- 36,42 ---- * <pre> * $Log$ + * Revision 1.4 2007/01/23 17:00:14 hrivnac + * TRT and Silicons added + * * Revision 1.3 2007/01/23 11:19:41 hrivnac * Calorimeter works *************** *** 98,102 **** // Use Atlantis representation ! atlantis2GraXML(z, r, eta0 > 0.0, phi0, nPhi, color, name); } --- 101,105 ---- // Use Atlantis representation ! atlantis2GraXML(z, r, eta0 > 0.0, nPhi, color, name); } Index: AEndcapCalorimeter.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps/AEndcapCalorimeter.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** AEndcapCalorimeter.java 23 Jan 2007 11:19:41 -0000 1.2 --- AEndcapCalorimeter.java 23 Jan 2007 17:00:14 -0000 1.3 *************** *** 36,39 **** --- 36,42 ---- * <pre> * $Log$ + * Revision 1.3 2007/01/23 17:00:14 hrivnac + * TRT and Silicons added + * * Revision 1.2 2007/01/23 11:19:41 hrivnac * Calorimeter works *************** *** 103,107 **** // Use Atlantis representation ! atlantis2GraXML(z, r, eta0 > 0.0, phi0, nPhi, color, name); } --- 106,110 ---- // Use Atlantis representation ! atlantis2GraXML(z, r, eta0 > 0.0, nPhi, color, name); } Index: AGapCalorimeter.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps/AGapCalorimeter.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AGapCalorimeter.java 23 Jan 2007 11:19:41 -0000 1.1 --- AGapCalorimeter.java 23 Jan 2007 17:00:14 -0000 1.2 *************** *** 36,39 **** --- 36,42 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/23 17:00:14 hrivnac + * TRT and Silicons added + * * Revision 1.1 2007/01/23 11:19:41 hrivnac * Calorimeter works *************** *** 72,76 **** // Use Atlantis representation ! atlantis2GraXML(z, r, zMin > 0.0, phi0, nPhi, color, name); } --- 75,79 ---- // Use Atlantis representation ! atlantis2GraXML(z, r, zMin > 0.0, nPhi, color, name); } --- NEW FILE: AEndcapSiliconDetector.java --- package net.hep.atlas.graphics.JiveGeometry.GeometricModel.Reps; import net.hep.atlas.graphics.JiveGeometry.GeometricModel.JiveGeometryBuilder; import net.hep.atlas.graphics.JiveGeometry.GeometricModel.JiveRep; // Generic Model import net.hep.atlas.graphics.JiveGeometry.JAXB.AEndcapSiliconDetectorType; // GraXML import net.hep.graphics.GraXML.GraXMLJAXBRep; import net.hep.graphics.GraXML.MasterBuilder; import net.hep.graphics.GraXML.Disconnecter.DetachableConnection; import net.hep.graphics.GraXML.Disconnecter.ConnectionsDB; // Java3D import javax.media.j3d.Group; import javax.media.j3d.BranchGroup; import javax.vecmath.Point3d; import javax.media.j3d.Appearance; // JAXB import javax.xml.bind.Element; // Java import static java.lang.Math.PI; import static java.lang.Math.abs; import static java.lang.Math.sin; import static java.lang.Math.cos; import static java.lang.Math.sinh; import static java.lang.Math.toRadians; // Log4J import org.apache.log4j.Logger; /** GraXML representation {@link GraXMLJAXBRep} of <code>AEndcapSiliconDetector</code> JiveGeometry element * connected via JAXB {@link net.hep.atlas.graphics.JiveGeometry.JAXB.AEndcapSiliconDetector} generic JAXB * interface. * <p><font color="#880088"> * <pre> * $Log: AEndcapSiliconDetector.java,v $ * Revision 1.1 2007/01/23 17:00:14 hrivnac * TRT and Silicons added * * </pre> * </font></p> * @version $Id: AEndcapSiliconDetector.java,v 1.1 2007/01/23 17:00:14 hrivnac Exp $ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ public final class AEndcapSiliconDetector extends JiveRep { public final void traverse(JiveGeometryBuilder builder, AEndcapSiliconDetectorType AEndcapSiliconDetector, Group tg, String parent) { // Set values set(builder, tg, parent); // Get element properties String color = AEndcapSiliconDetector.getC(); String name = AEndcapSiliconDetector.getN(); int layer = AEndcapSiliconDetector.getLayer(); double length = AEndcapSiliconDetector.getLength() / builder.norm(); double width = AEndcapSiliconDetector.getWidth() / builder.norm(); double thickness = AEndcapSiliconDetector.getThickness() / builder.norm(); double rMin = AEndcapSiliconDetector.getRMin() / builder.norm(); double rMax = AEndcapSiliconDetector.getRMax() / builder.norm(); double phi0 = AEndcapSiliconDetector.getPhi0() / builder.norm(); double zMin = AEndcapSiliconDetector.getZMin() / builder.norm(); double zMax = AEndcapSiliconDetector.getZMax() / builder.norm(); int nZ = AEndcapSiliconDetector.getNz(); int nPhi = AEndcapSiliconDetector.getNphi(); double dZ = (zMax - zMin) / nZ; double dPhi = 2.0 * PI / nPhi; // Find dimensions name += "[" + layer + "]"; // Construct Atlantis representation double[] z = new double[] {zMax, zMin, zMin, zMax}; double[] r = new double[] {rMax, rMax, rMin, rMin}; // Use Atlantis representation atlantis2GraXML(z, r, true, nPhi, color, name); } private static int k = 0; /** Logging . */ private static Logger log = Logger.getLogger(AEndcapSiliconDetector.class); } |
|
From: Julius H. <hr...@us...> - 2007-01-23 11:19:43
|
Update of /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv12343/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps Modified Files: ABarrelCalorimeter.java AEndcapCalorimeter.java AGeneralPath.java AGeometry.java Added Files: AGapCalorimeter.java Log Message: Calorimeter works --- NEW FILE: AGapCalorimeter.java --- package net.hep.atlas.graphics.JiveGeometry.GeometricModel.Reps; import net.hep.atlas.graphics.JiveGeometry.GeometricModel.JiveGeometryBuilder; import net.hep.atlas.graphics.JiveGeometry.GeometricModel.JiveRep; // Generic Model import net.hep.atlas.graphics.JiveGeometry.JAXB.AGapCalorimeterType; // GraXML import net.hep.graphics.GraXML.GraXMLJAXBRep; import net.hep.graphics.GraXML.MasterBuilder; import net.hep.graphics.GraXML.Disconnecter.DetachableConnection; import net.hep.graphics.GraXML.Disconnecter.ConnectionsDB; // Java3D import javax.media.j3d.Group; import javax.media.j3d.BranchGroup; import javax.vecmath.Point3d; import javax.media.j3d.Appearance; // JAXB import javax.xml.bind.Element; // Java import static java.lang.Math.PI; import static java.lang.Math.sinh; import static java.lang.Math.toRadians; // Log4J import org.apache.log4j.Logger; /** GraXML representation {@link GraXMLJAXBRep} of <code>AGapCalorimeter</code> JiveGeometry element * connected via JAXB {@link net.hep.atlas.graphics.JiveGeometry.JAXB.AGapCalorimeter} generic JAXB * interface. * <p><font color="#880088"> * <pre> * $Log: AGapCalorimeter.java,v $ * Revision 1.1 2007/01/23 11:19:41 hrivnac * Calorimeter works * * </pre> * </font></p> * @version $Id: AGapCalorimeter.java,v 1.1 2007/01/23 11:19:41 hrivnac Exp $ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ public final class AGapCalorimeter extends JiveRep { public final void traverse(JiveGeometryBuilder builder, AGapCalorimeterType aGapCalorimeter, Group tg, String parent) { // Set values set(builder, tg, parent); // Get element properties String color = aGapCalorimeter.getC(); String name = aGapCalorimeter.getN(); int sampling = aGapCalorimeter.getSampling(); int region = aGapCalorimeter.getRegion(); double rMin = aGapCalorimeter.getRMin() / builder.norm(); double rMax = aGapCalorimeter.getRMax() / builder.norm(); double zMin = aGapCalorimeter.getZMin() / builder.norm(); double zMax = aGapCalorimeter.getZMax() / builder.norm(); double phi0 = toRadians(aGapCalorimeter.getPhi0()); int nPhi = aGapCalorimeter.getNphi(); double dPhi = 2.0 * PI / nPhi; double eta = aGapCalorimeter.getEta(); // Find dimensions name += "[" + sampling + "/" + region + "]"; // Construct Atlantis representation double[] z = new double[] {zMax, zMin, zMin, zMax}; double[] r = new double[] {rMax, rMax, rMin, rMin}; // Use Atlantis representation atlantis2GraXML(z, r, zMin > 0.0, phi0, nPhi, color, name); } private static int k = 0; /** Logging . */ private static Logger log = Logger.getLogger(AGapCalorimeter.class); } Index: AEndcapCalorimeter.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps/AEndcapCalorimeter.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AEndcapCalorimeter.java 22 Jan 2007 17:50:18 -0000 1.1 --- AEndcapCalorimeter.java 23 Jan 2007 11:19:41 -0000 1.2 *************** *** 22,28 **** import javax.xml.bind.Element; - // FreeHEP - import org.freehep.j3d.PolyGoneSegment; - // Java import static java.lang.Math.PI; --- 22,25 ---- *************** *** 39,42 **** --- 36,42 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/23 11:19:41 hrivnac + * Calorimeter works + * * Revision 1.1 2007/01/22 17:50:18 hrivnac * Calo geometry improved *************** *** 58,72 **** int sampling = aEndcapCalorimeter.getSampling(); int region = aEndcapCalorimeter.getRegion(); ! double rMin = aEndcapCalorimeter.getRMin() / 1000.0; ! double rMax = aEndcapCalorimeter.getRMax() / 1000.0; ! double zMin = aEndcapCalorimeter.getZMin() / 1000.0; ! double zMax = aEndcapCalorimeter.getZMax() / 1000.0; double phi0 = toRadians(aEndcapCalorimeter.getPhi0()); int nPhi = aEndcapCalorimeter.getNphi(); double dPhi = 2.0 * PI / nPhi; ! double eta0 = aEndcapCalorimeter.getMeta(); int nEta = aEndcapCalorimeter.getNeta(); double dEta = aEndcapCalorimeter.getDeta(); double etaMax = eta0 + nEta * dEta; double etaMin = eta0; --- 58,74 ---- int sampling = aEndcapCalorimeter.getSampling(); int region = aEndcapCalorimeter.getRegion(); ! double rMin = aEndcapCalorimeter.getRMin() / builder.norm(); ! double rMax = aEndcapCalorimeter.getRMax() / builder.norm(); ! double zMin = aEndcapCalorimeter.getZMin() / builder.norm(); ! double zMax = aEndcapCalorimeter.getZMax() / builder.norm(); double phi0 = toRadians(aEndcapCalorimeter.getPhi0()); int nPhi = aEndcapCalorimeter.getNphi(); double dPhi = 2.0 * PI / nPhi; ! double eta0 = aEndcapCalorimeter.getEta0(); ! double mEta = aEndcapCalorimeter.getMeta(); int nEta = aEndcapCalorimeter.getNeta(); double dEta = aEndcapCalorimeter.getDeta(); + // Find dimensions double etaMax = eta0 + nEta * dEta; double etaMin = eta0; *************** *** 86,113 **** r2 = zMin / sinh(etaMax); } - name += "[" + sampling + "/" + region + "]"; - String info = name; ! Appearance appearance = builder().appearance(name, color); ! ! setAppearance(appearance); ! ! double[] rmins; ! double[] rmaxs; ! double[] zmins = new double[]{zMin, zMax}; ! double[] zmaxs = new double[]{zMin, zMax}; if (name.indexOf("HEC") >= 0) { ! rmins = new double[]{rMin, rMin}; ! rmaxs = new double[]{rMax, rMax}; } else { ! rmins = new double[]{zMin / sinh(etaMin), zMin / sinh(etaMax)}; ! rmaxs = new double[]{zMax / sinh(etaMin), zMax / sinh(etaMax)}; } ! PolyGoneSegment polygone = new PolyGoneSegment(rmins, rmaxs, zmins, zmaxs, phi0, phi0 + 2*PI, nPhi, appearance); ! use(polygone, name, info); } private static int k = 0; --- 88,110 ---- r2 = zMin / sinh(etaMax); } name += "[" + sampling + "/" + region + "]"; ! // Construct Atlantis representation ! double[] z; ! double[] r; if (name.indexOf("HEC") >= 0) { ! z = new double[] {zMax, zMin, zMin, zMax}; ! r = new double[] {rMax, rMax, rMin, rMin}; } else { ! z = new double[] {zMax, zMin, zMin, zMax }; ! r = new double[] {zMax / sinh(etaMin), zMin / sinh(etaMin), zMin / sinh(etaMax), zMax / sinh(etaMax)}; } ! ! // Use Atlantis representation ! atlantis2GraXML(z, r, eta0 > 0.0, phi0, nPhi, color, name); } + private static int k = 0; Index: AGeometry.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps/AGeometry.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** AGeometry.java 22 Jan 2007 17:50:18 -0000 1.3 --- AGeometry.java 23 Jan 2007 11:19:41 -0000 1.4 *************** *** 9,12 **** --- 9,13 ---- import net.hep.atlas.graphics.JiveGeometry.JAXB.ABarrelCalorimeterType; import net.hep.atlas.graphics.JiveGeometry.JAXB.AEndcapCalorimeterType; + import net.hep.atlas.graphics.JiveGeometry.JAXB.AGapCalorimeterType; // GraXML *************** *** 33,36 **** --- 34,40 ---- * <pre> * $Log$ + * Revision 1.4 2007/01/23 11:19:41 hrivnac + * Calorimeter works + * * Revision 1.3 2007/01/22 17:50:18 hrivnac * Calo geometry improved *************** *** 87,90 **** --- 91,95 ---- ABarrelCalorimeterType aBarrelCalorimeter; AEndcapCalorimeterType aEndcapCalorimeter; + AGapCalorimeterType aGapCalorimeter; for (Object o : aGeometry.getAGeometryConstantOrAGeneralPathOrADisc()) { // - AGeneralPath *************** *** 103,106 **** --- 108,116 ---- (new AEndcapCalorimeter()).traverse(builder, aEndcapCalorimeter, branch, name); } + // - AGapCalorimeter + else if (o instanceof AGapCalorimeterType) { + aGapCalorimeter = (AGapCalorimeterType)o; + (new AGapCalorimeter()).traverse(builder, aGapCalorimeter, branch, name); + } // TBD } Index: AGeneralPath.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps/AGeneralPath.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** AGeneralPath.java 16 Jan 2007 14:44:35 -0000 1.2 --- AGeneralPath.java 23 Jan 2007 11:19:41 -0000 1.3 *************** *** 19,22 **** --- 19,23 ---- import javax.vecmath.Point3d; import javax.media.j3d.Appearance; + import javax.media.j3d.TransparencyAttributes; // JAXB *************** *** 35,38 **** --- 36,42 ---- * <pre> * $Log$ + * Revision 1.3 2007/01/23 11:19:41 hrivnac + * Calorimeter works + * * Revision 1.2 2007/01/16 14:44:35 hrivnac * better xsd, AGeneralPath visible *************** *** 59,63 **** --- 63,69 ---- String name = c + "_" + n + "_" + k++; + Appearance appearance = builder().appearance(name, name); + appearance. setTransparencyAttributes(new TransparencyAttributes(TransparencyAttributes.NICEST, 0.5f)); setAppearance(appearance); *************** *** 69,85 **** aPoint = (APointType)o; if (p.equals("YX")) { ! points[i++] = new Point3d(aPoint.getX() / 1000.0, ! aPoint.getY() / 1000.0, 0.0); } else if (p.equals("RZ")) { ! points[i++] = new Point3d(aPoint.getY() / 1000.0, 0.0, ! aPoint.getX() / 1000.0); } // TBD: else } ! PolyGone polygone = new PolyGone(points, appearance); use(polygone, name, name); --- 75,91 ---- aPoint = (APointType)o; if (p.equals("YX")) { ! points[i++] = new Point3d(aPoint.getX() / builder.norm(), ! aPoint.getY() / builder.norm(), 0.0); } else if (p.equals("RZ")) { ! points[i++] = new Point3d(aPoint.getY() / builder.norm(), 0.0, ! aPoint.getX() / builder.norm()); } // TBD: else } ! PolyGone polygone = new PolyGone(points, null, appearance); use(polygone, name, name); Index: ABarrelCalorimeter.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps/ABarrelCalorimeter.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ABarrelCalorimeter.java 22 Jan 2007 17:50:18 -0000 1.2 --- ABarrelCalorimeter.java 23 Jan 2007 11:19:41 -0000 1.3 *************** *** 22,28 **** import javax.xml.bind.Element; - // FreeHEP - import org.freehep.j3d.PolyGoneSegment; - // Java import static java.lang.Math.PI; --- 22,25 ---- *************** *** 39,42 **** --- 36,42 ---- * <pre> * $Log$ + * Revision 1.3 2007/01/23 11:19:41 hrivnac + * Calorimeter works + * * Revision 1.2 2007/01/22 17:50:18 hrivnac * Calo geometry improved *************** *** 61,75 **** int sampling = aBarrelCalorimeter.getSampling(); int region = aBarrelCalorimeter.getRegion(); ! double rMin = aBarrelCalorimeter.getRMin() / 1000.0; ! double rMax = aBarrelCalorimeter.getRMax() / 1000.0; ! double zMin = aBarrelCalorimeter.getZMin() / 1000.0; ! double zMax = aBarrelCalorimeter.getZMax() / 1000.0; double phi0 = toRadians(aBarrelCalorimeter.getPhi0()); int nPhi = aBarrelCalorimeter.getNphi(); double dPhi = 2.0 * PI / nPhi; ! double eta0 = aBarrelCalorimeter.getMeta(); int nEta = aBarrelCalorimeter.getNeta(); double dEta = aBarrelCalorimeter.getDeta(); double etaMax = eta0 + nEta * dEta; double etaMin; --- 61,77 ---- int sampling = aBarrelCalorimeter.getSampling(); int region = aBarrelCalorimeter.getRegion(); ! double rMin = aBarrelCalorimeter.getRMin() / builder.norm(); ! double rMax = aBarrelCalorimeter.getRMax() / builder.norm(); ! double zMin = aBarrelCalorimeter.getZMin() / builder.norm(); ! double zMax = aBarrelCalorimeter.getZMax() / builder.norm(); double phi0 = toRadians(aBarrelCalorimeter.getPhi0()); int nPhi = aBarrelCalorimeter.getNphi(); double dPhi = 2.0 * PI / nPhi; ! double eta0 = aBarrelCalorimeter.getEta0(); ! double mEta = aBarrelCalorimeter.getMeta(); int nEta = aBarrelCalorimeter.getNeta(); double dEta = aBarrelCalorimeter.getDeta(); + // Find dimensions double etaMax = eta0 + nEta * dEta; double etaMin; *************** *** 81,108 **** etaMin = eta0; } - name += "[" + sampling + "/" + region + "]"; - String info = name; ! Appearance appearance = builder().appearance(name, color); ! ! setAppearance(appearance); ! ! double[] rmins = new double[]{rMin, rMin}; ! double[] rmaxs = new double[]{rMax, rMax}; ! double[] zmins; ! double[] zmaxs; if (name.indexOf("TILE") >= 0) { ! zmins = new double[]{zMin, zMax}; ! zmaxs = new double[]{zMin, zMax}; } else { ! zmins = new double[]{rMin * sinh(etaMin), rMin * sinh(etaMax)}; ! zmaxs = new double[]{rMax * sinh(etaMin), rMax * sinh(etaMax)}; } ! PolyGoneSegment polygone = new PolyGoneSegment(rmins, rmaxs, zmins, zmaxs, phi0, phi0 + 2*PI, nPhi, appearance); ! use(polygone, name, info); } private static int k = 0; --- 83,105 ---- etaMin = eta0; } name += "[" + sampling + "/" + region + "]"; ! // Construct Atlantis representation ! double[] z; ! double[] r; if (name.indexOf("TILE") >= 0) { ! z = new double[] {zMax, zMin, zMin, zMax}; ! r = new double[] {rMax, rMax, rMin, rMin}; } else { ! z = new double[] {rMax * sinh(etaMax), rMax * sinh(etaMin), rMin * sinh(etaMin), rMin * sinh(etaMax)}; ! r = new double[] {rMax, rMax, rMin, rMin }; } ! ! // Use Atlantis representation ! atlantis2GraXML(z, r, eta0 > 0.0, phi0, nPhi, color, name); } + private static int k = 0; |
|
From: Julius H. <hr...@us...> - 2007-01-23 11:19:43
|
Update of /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/Test/data In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv12343/net/hep/atlas/graphics/JiveGeometry/Test/data Modified Files: AGeometry.xml Log Message: Calorimeter works Index: AGeometry.xml =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/Test/data/AGeometry.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AGeometry.xml 16 Jan 2007 14:44:36 -0000 1.1 --- AGeometry.xml 23 Jan 2007 11:19:41 -0000 1.2 *************** *** 64,76 **** <AEndcapCalorimeter c="ECAL" n="LAr Outer Endcap" sampling="3" region="0" rMin="29.0" rMax="203.4" zMin="415.624" zMax="424.326" eta0="1.50867" deta="0.05" neta="20" meta="0" phi0="-0.234375" nphi="256" /> <AEndcapCalorimeter c="ECAL" n="LAr Inner Endcap" sampling="1" region="0" rMin="29.0" rMax="203.4" zMin="375.424" zMax="420.125" eta0="2.51004" deta="0.1" neta="7" meta="0" phi0="-0.234375" nphi="64" /> ! <AEndcapCalorimeter c="ECAL" n="LAr Inner Endcap" sampling="2" region="0" rMin="29.0" rMax="203.4" zMin="420.125" zMax="424.326" eta0="2.5094" deta="0.1" neta="7" meta="0" phi0="-0.234375" nphi="64" /> ! <AEndcapCalorimeter c="HCAL" n="HEC" sampling="0" region="0" rMin="37.2" rMax="203.4" zMin="435" zMax="463" eta0="1.50824" deta="0.1" neta="10" meta="0" phi0="0" nphi="64" /> ! <AEndcapCalorimeter c="HCAL" n="HEC" sampling="0" region="1" rMin="37.2" rMax="203.4" zMin="435" zMax="463" eta0="2.50892" deta="0.2" neta="4" meta="0" phi0="0" nphi="32" /> ! <AEndcapCalorimeter c="HCAL" n="HEC" sampling="1" region="0" rMin="48.5" rMax="203.4" zMin="463" zMax="510" eta0="1.50755" deta="0.1" neta="10" meta="0" phi0="0" nphi="64" /> ! <AEndcapCalorimeter c="HCAL" n="HEC" sampling="1" region="1" rMin="48.5" rMax="203.4" zMin="463" zMax="510" eta0="2.50817" deta="0.2" neta="3" meta="0" phi0="0" nphi="32" /> ! <AEndcapCalorimeter c="HCAL" n="HEC" sampling="2" region="0" rMin="48.5" rMax="203.4" zMin="513" zMax="559" eta0="1.6" deta="0.1" neta="9" meta="1" phi0="0" nphi="64" /> ! <AEndcapCalorimeter c="HCAL" n="HEC" sampling="2" region="1" rMin="48.5" rMax="203.4" zMin="513" zMax="559" eta0="2.5" deta="0.2" neta="3" meta="0" phi0="-7.95139e-16" nphi="32" /> ! <AEndcapCalorimeter c="HCAL" n="HEC" sampling="3" region="0" rMin="48.5" rMax="203.4" zMin="559" zMax="605" eta0="1.7" deta="0.1" neta="8" meta="2" phi0="-3.97569e-16" nphi="64" /> ! <AEndcapCalorimeter c="HCAL" n="HEC" sampling="3" region="1" rMin="48.5" rMax="203.4" zMin="559" zMax="605" eta0="2.5" deta="0.2" neta="4" meta="0" phi0="-7.95139e-16" nphi="32" /> <ADisc p="YX" c="ECAL" n="FCAL EM" rIn="7.84392" rOut="47.5" /> <ARectangle p="RZ" c="ECAL" n="FCAL EM" xMin="466.85" xMax="511.85" yMin="7.84392" yMax="47.5" /> --- 64,76 ---- <AEndcapCalorimeter c="ECAL" n="LAr Outer Endcap" sampling="3" region="0" rMin="29.0" rMax="203.4" zMin="415.624" zMax="424.326" eta0="1.50867" deta="0.05" neta="20" meta="0" phi0="-0.234375" nphi="256" /> <AEndcapCalorimeter c="ECAL" n="LAr Inner Endcap" sampling="1" region="0" rMin="29.0" rMax="203.4" zMin="375.424" zMax="420.125" eta0="2.51004" deta="0.1" neta="7" meta="0" phi0="-0.234375" nphi="64" /> ! <AEndcapCalorimeter c="ECAL" n="LAr Inner Endcap" sampling="2" region="0" rMin="29.0" rMax="203.4" zMin="420.125" zMax="424.326" eta0="2.5094" deta="0.1" neta="7" meta="0" phi0="-0.234375" nphi="64" /> ! <AEndcapCalorimeter c="HCAL" n="HEC" sampling="0" region="0" rMin="37.2" rMax="203.4" zMin="435" zMax="463" eta0="1.50824" deta="0.1" neta="10" meta="0" phi0="0" nphi="64" /> ! <AEndcapCalorimeter c="HCAL" n="HEC" sampling="0" region="1" rMin="37.2" rMax="203.4" zMin="435" zMax="463" eta0="2.50892" deta="0.2" neta="4" meta="0" phi0="0" nphi="32" /> ! <AEndcapCalorimeter c="HCAL" n="HEC" sampling="1" region="0" rMin="48.5" rMax="203.4" zMin="463" zMax="510" eta0="1.50755" deta="0.1" neta="10" meta="0" phi0="0" nphi="64" /> ! <AEndcapCalorimeter c="HCAL" n="HEC" sampling="1" region="1" rMin="48.5" rMax="203.4" zMin="463" zMax="510" eta0="2.50817" deta="0.2" neta="3" meta="0" phi0="0" nphi="32" /> ! <AEndcapCalorimeter c="HCAL" n="HEC" sampling="2" region="0" rMin="48.5" rMax="203.4" zMin="513" zMax="559" eta0="1.6" deta="0.1" neta="9" meta="1" phi0="0" nphi="64" /> ! <AEndcapCalorimeter c="HCAL" n="HEC" sampling="2" region="1" rMin="48.5" rMax="203.4" zMin="513" zMax="559" eta0="2.5" deta="0.2" neta="3" meta="0" phi0="-7.95139e-16" nphi="32" /> ! <AEndcapCalorimeter c="HCAL" n="HEC" sampling="3" region="0" rMin="48.5" rMax="203.4" zMin="559" zMax="605" eta0="1.7" deta="0.1" neta="8" meta="2" phi0="-3.97569e-16" nphi="64" /> ! <AEndcapCalorimeter c="HCAL" n="HEC" sampling="3" region="1" rMin="48.5" rMax="203.4" zMin="559" zMax="605" eta0="2.5" deta="0.2" neta="4" meta="0" phi0="-7.95139e-16" nphi="32" /> <ADisc p="YX" c="ECAL" n="FCAL EM" rIn="7.84392" rOut="47.5" /> <ARectangle p="RZ" c="ECAL" n="FCAL EM" xMin="466.85" xMax="511.85" yMin="7.84392" yMax="47.5" /> *************** *** 79,93 **** <ADisc p="YX" c="HCAL" n="FCAL HAD 2" rIn="7.96007" rOut="47.5" /> <ARectangle p="RZ" c="HCAL" n="FCAL HAD 2" xMin="559.75" xMax="604.75" yMin="7.96007" yMax="47.5" /> ! <ABarrelCalorimeter c="HCAL" n="TILE Barrel" sampling="0" region="0" rMin="229" rMax="260" zMin="0" zMax="282" eta0="0" deta="0.1" neta="10" meta="0" phi0="0" nphi="64" /> ! <ABarrelCalorimeter c="HCAL" n="TILE Barrel" sampling="1" region="0" rMin="260" rMax="344" zMin="0" zMax="282" eta0="0" deta="0.1" neta="9" meta="0" phi0="0" nphi="64" /> ! <ABarrelCalorimeter c="HCAL" n="TILE Barrel" sampling="2" region="0" rMin="344" rMax="386" zMin="-36.5199" zMax="282" eta0="-0.1" deta="0.2" neta="4" meta="0" phi0="0" nphi="64" /> ! <ABarrelCalorimeter c="HCAL" n="Extended TILE" sampling="0" region="0" rMin="229" rMax="260" zMin="355.95" zMax="615" eta0="1.1" deta="0.1" neta="5" meta="11" phi0="0" nphi="64" /> ! <ABarrelCalorimeter c="HCAL" n="Extended TILE" sampling="1" region="0" rMin="260" rMax="314" zMin="355.95" zMax="615" eta0="1" deta="0.1" neta="5" meta="10" phi0="0" nphi="64" /> ! <ABarrelCalorimeter c="HCAL" n="Extended TILE" sampling="2" region="0" rMin="314" rMax="386" zMin="355.95" zMax="615" eta0="0.9" deta="0.2" neta="2" meta="10" phi0="0" nphi="64" /> ! <AGapCalorimeter c="HCAL" n="ITC Gap" sampling="1" region="0" rMin="299" rMax="344" zMin="346.435" zMax="355.92" eta="9" phi0="0" nphi="64" /> ! <AGapCalorimeter c="HCAL" n="ITC Gap" sampling="2" region="0" rMin="344" rMax="386" zMin="325.05" zMax="355.95" eta="8" phi0="0" nphi="64" /> ! <AGapCalorimeter c="HCAL" n="ITC Gap" sampling="3" region="0" rMin="264.6" rMax="295.9" zMin="354.45" zMax="355.95" eta="10" phi0="0" nphi="64" /> ! <AGapCalorimeter c="HCAL" n="ITC Gap" sampling="3" region="0" rMin="230.5" rMax="264.6" zMin="354.45" zMax="355.95" eta="11" phi0="0" nphi="64" /> ! <AGapCalorimeter c="HCAL" n="ITC Gap" sampling="3" region="0" rMin="182.7" rMax="230.5" zMin="353.2" zMax="354" eta="13" phi0="0" nphi="64" /> ! <AGapCalorimeter c="HCAL" n="ITC Gap" sampling="3" region="0" rMin="146.5" rMax="182.7" zMin="353.2" zMax="354" eta="15" phi0="0" nphi="64" /> </AGeometry> --- 79,93 ---- <ADisc p="YX" c="HCAL" n="FCAL HAD 2" rIn="7.96007" rOut="47.5" /> <ARectangle p="RZ" c="HCAL" n="FCAL HAD 2" xMin="559.75" xMax="604.75" yMin="7.96007" yMax="47.5" /> ! <ABarrelCalorimeter c="HCAL" n="TILE Barrel" sampling="0" region="0" rMin="229" rMax="260" zMin="0" zMax="282" eta0="0" deta="0.1" neta="10" meta="0" phi0="0" nphi="64" /> ! <ABarrelCalorimeter c="HCAL" n="TILE Barrel" sampling="1" region="0" rMin="260" rMax="344" zMin="0" zMax="282" eta0="0" deta="0.1" neta="9" meta="0" phi0="0" nphi="64" /> ! <ABarrelCalorimeter c="HCAL" n="TILE Barrel" sampling="2" region="0" rMin="344" rMax="386" zMin="-36.5199" zMax="282" eta0="-0.1" deta="0.2" neta="4" meta="0" phi0="0" nphi="64" /> ! <ABarrelCalorimeter c="HCAL" n="Extended TILE" sampling="0" region="0" rMin="229" rMax="260" zMin="355.95" zMax="615" eta0="1.1" deta="0.1" neta="5" meta="11" phi0="0" nphi="64" /> ! <ABarrelCalorimeter c="HCAL" n="Extended TILE" sampling="1" region="0" rMin="260" rMax="314" zMin="355.95" zMax="615" eta0="1" deta="0.1" neta="5" meta="10" phi0="0" nphi="64" /> ! <ABarrelCalorimeter c="HCAL" n="Extended TILE" sampling="2" region="0" rMin="314" rMax="386" zMin="355.95" zMax="615" eta0="0.9" deta="0.2" neta="2" meta="10" phi0="0" nphi="64" /> ! <AGapCalorimeter c="HCAL" n="ITC Gap" sampling="1" region="0" rMin="299" rMax="344" zMin="346.435" zMax="355.92" eta="9" phi0="0" nphi="64" /> ! <AGapCalorimeter c="HCAL" n="ITC Gap" sampling="2" region="0" rMin="344" rMax="386" zMin="325.05" zMax="355.95" eta="8" phi0="0" nphi="64" /> ! <AGapCalorimeter c="HCAL" n="ITC Gap" sampling="3" region="0" rMin="264.6" rMax="295.9" zMin="354.45" zMax="355.95" eta="10" phi0="0" nphi="64" /> ! <AGapCalorimeter c="HCAL" n="ITC Gap" sampling="3" region="0" rMin="230.5" rMax="264.6" zMin="354.45" zMax="355.95" eta="11" phi0="0" nphi="64" /> ! <AGapCalorimeter c="HCAL" n="ITC Gap" sampling="3" region="0" rMin="182.7" rMax="230.5" zMin="353.2" zMax="354" eta="13" phi0="0" nphi="64" /> ! <AGapCalorimeter c="HCAL" n="ITC Gap" sampling="3" region="0" rMin="146.5" rMax="182.7" zMin="353.2" zMax="354" eta="15" phi0="0" nphi="64" /> </AGeometry> |
|
From: Julius H. <hr...@us...> - 2007-01-23 11:19:43
|
Update of /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv12343/net/hep/atlas/graphics/JiveGeometry/GeometricModel Modified Files: JiveGeometryBuilder.java JiveRep.java Log Message: Calorimeter works Index: JiveRep.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/JiveRep.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** JiveRep.java 15 Jan 2007 14:41:53 -0000 1.2 --- JiveRep.java 23 Jan 2007 11:19:41 -0000 1.3 *************** *** 17,20 **** --- 17,27 ---- import javax.media.j3d.Shape3D; import javax.media.j3d.Appearance; + import javax.media.j3d.TransparencyAttributes; + + // FreeHEP + import org.freehep.j3d.PolyGoneSegment; + + // Java + import static java.lang.Math.PI; // JAXB *************** *** 29,32 **** --- 36,42 ---- * <pre> * $Log$ + * Revision 1.3 2007/01/23 11:19:41 hrivnac + * Calorimeter works + * * Revision 1.2 2007/01/15 14:41:53 hrivnac * makes hierarchy, not yet picture *************** *** 65,68 **** --- 75,125 ---- } + /** Convert Atlantis geometry representation to GraXML one. + * Create corresponding {@link PolyGoneSegment}s. + * @param z The z-coordinates of one solid quadrant. + * @param r The r-coordinates of one solid quadrant + * @param reflect The whether z-reflected solid should be created too. + * @param phi0 The solid start in phi. + * @param nPhi The number of solid' subdivisions in phi. + * @param color The name of the solid' color. + * @param name The solid' name. */ + protected void atlantis2GraXML(double[] z, + double[] r, + boolean reflect, + double phi0, + int nPhi, + String color, + String name) { + + // BUG: the real phi0 sjould be used + phi0 = 0.0; + + // Set info + String info = name; + + // Set Appearance + _appearance = builder().appearance(name, color); + _appearance. setTransparencyAttributes(new TransparencyAttributes(TransparencyAttributes.NICEST, 0.5f)); + + // Create PolyGoneSegments + double[] zmins = new double[] {z[2], z[3]}; + double[] zmaxs = new double[] {z[1], z[0]}; + double[] rmins = new double[] {r[2], r[3]}; + double[] rmaxs = new double[] {r[1], r[0]}; + // z+- + if (reflect) { + use(new PolyGoneSegment(rmins, rmaxs, zmins, zmaxs, phi0, phi0 + 2*PI, nPhi, _appearance), name + "+", info); + zmins = new double[]{- zmins[1], - zmins[0]}; + zmaxs = new double[]{- zmaxs[1], - zmaxs[0]}; + rmins = new double[]{ rmins[1], rmins[0]}; + rmaxs = new double[]{ rmaxs[1], rmaxs[0]}; + use(new PolyGoneSegment(rmins, rmaxs, zmins, zmaxs, phi0, phi0 + 2*PI, nPhi, _appearance), name + "-", info); + } + // only one + else { + use(new PolyGoneSegment(rmins, rmaxs, zmins, zmaxs, phi0, phi0 + 2*PI, nPhi, _appearance), name, info); + } + } + /** Use Java3D {@link BranchGroup} as a GraXML building block: * <ul> Index: JiveGeometryBuilder.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/JiveGeometryBuilder.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** JiveGeometryBuilder.java 20 Jan 2007 00:19:09 -0000 1.4 --- JiveGeometryBuilder.java 23 Jan 2007 11:19:41 -0000 1.5 *************** *** 22,25 **** --- 22,28 ---- * <pre> * $Log$ + * Revision 1.5 2007/01/23 11:19:41 hrivnac + * Calorimeter works + * * Revision 1.4 2007/01/20 00:19:09 hrivnac * ABarrelCalorimeter added *************** *** 42,46 **** /** Perform configuration. */ public void configure() { ! BuildOptions.setColorPerMaterial(true); } --- 45,49 ---- /** Perform configuration. */ public void configure() { ! //BuildOptions.setColorPerMaterial(true); } *************** *** 75,78 **** --- 78,87 ---- return _schemaEmbedded; } + + /** Get renormalisation factor. + * @return The renormalisation factor. */ + public double norm() { + return _norm; + } private static String _schema = "AGeometry.xsd"; *************** *** 82,85 **** --- 91,96 ---- private static String _jaxb = "net.hep.atlas.graphics.JiveGeometry.JAXB"; + private static double _norm = 1000.0; + /** Logging . */ private static Logger log = Logger.getLogger(JiveGeometryBuilder.class); |
|
From: Julius H. <hr...@us...> - 2007-01-22 17:50:28
|
Update of /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/Schema In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv10833/net/hep/atlas/graphics/JiveGeometry/Schema Modified Files: AGeometry.xsd Log Message: Calo geometry improved Index: AGeometry.xsd =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/Schema/AGeometry.xsd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** AGeometry.xsd 20 Jan 2007 00:19:10 -0000 1.2 --- AGeometry.xsd 22 Jan 2007 17:50:18 -0000 1.3 *************** *** 4,7 **** --- 4,10 ---- <!-- $Log$ + Revision 1.3 2007/01/22 17:50:18 hrivnac + Calo geometry improved + Revision 1.2 2007/01/20 00:19:10 hrivnac ABarrelCalorimeter added *************** *** 143,147 **** <xs:attribute name="eta0" type="xs:double" use="required"/> <xs:attribute name="deta" type="xs:double" use="required"/> ! <xs:attribute name="neta" type="xs:double" use="required"/> <xs:attribute name="meta" type="xs:double" use="required"/> <xs:attribute name="phi0" type="xs:double" use="required"/> --- 146,150 ---- <xs:attribute name="eta0" type="xs:double" use="required"/> <xs:attribute name="deta" type="xs:double" use="required"/> ! <xs:attribute name="neta" type="xs:int" use="required"/> <xs:attribute name="meta" type="xs:double" use="required"/> <xs:attribute name="phi0" type="xs:double" use="required"/> |
|
From: Julius H. <hr...@us...> - 2007-01-22 17:50:24
|
Update of /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv10833/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps Modified Files: ABarrelCalorimeter.java AGeometry.java Added Files: AEndcapCalorimeter.java Log Message: Calo geometry improved --- NEW FILE: AEndcapCalorimeter.java --- package net.hep.atlas.graphics.JiveGeometry.GeometricModel.Reps; import net.hep.atlas.graphics.JiveGeometry.GeometricModel.JiveGeometryBuilder; import net.hep.atlas.graphics.JiveGeometry.GeometricModel.JiveRep; // Generic Model import net.hep.atlas.graphics.JiveGeometry.JAXB.AEndcapCalorimeterType; // GraXML import net.hep.graphics.GraXML.GraXMLJAXBRep; import net.hep.graphics.GraXML.MasterBuilder; import net.hep.graphics.GraXML.Disconnecter.DetachableConnection; import net.hep.graphics.GraXML.Disconnecter.ConnectionsDB; // Java3D import javax.media.j3d.Group; import javax.media.j3d.BranchGroup; import javax.vecmath.Point3d; import javax.media.j3d.Appearance; // JAXB import javax.xml.bind.Element; // FreeHEP import org.freehep.j3d.PolyGoneSegment; // Java import static java.lang.Math.PI; import static java.lang.Math.sinh; import static java.lang.Math.toRadians; // Log4J import org.apache.log4j.Logger; /** GraXML representation {@link GraXMLJAXBRep} of <code>AEndcapCalorimeter</code> JiveGeometry element * connected via JAXB {@link net.hep.atlas.graphics.JiveGeometry.JAXB.AEndcapCalorimeter} generic JAXB * interface. * <p><font color="#880088"> * <pre> * $Log: AEndcapCalorimeter.java,v $ * Revision 1.1 2007/01/22 17:50:18 hrivnac * Calo geometry improved * * </pre> * </font></p> * @version $Id: AEndcapCalorimeter.java,v 1.1 2007/01/22 17:50:18 hrivnac Exp $ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ public final class AEndcapCalorimeter extends JiveRep { public final void traverse(JiveGeometryBuilder builder, AEndcapCalorimeterType aEndcapCalorimeter, Group tg, String parent) { // Set values set(builder, tg, parent); // Get element properties String color = aEndcapCalorimeter.getC(); String name = aEndcapCalorimeter.getN(); int sampling = aEndcapCalorimeter.getSampling(); int region = aEndcapCalorimeter.getRegion(); double rMin = aEndcapCalorimeter.getRMin() / 1000.0; double rMax = aEndcapCalorimeter.getRMax() / 1000.0; double zMin = aEndcapCalorimeter.getZMin() / 1000.0; double zMax = aEndcapCalorimeter.getZMax() / 1000.0; double phi0 = toRadians(aEndcapCalorimeter.getPhi0()); int nPhi = aEndcapCalorimeter.getNphi(); double dPhi = 2.0 * PI / nPhi; double eta0 = aEndcapCalorimeter.getMeta(); int nEta = aEndcapCalorimeter.getNeta(); double dEta = aEndcapCalorimeter.getDeta(); double etaMax = eta0 + nEta * dEta; double etaMin = eta0; double r1; double r2; if (name.equals("HEC")) { r1 = rMax; r2 = rMin; } else { if (name.indexOf("Inner") >= 0 || name.indexOf("Presampler") >= 0) { r1 = zMin / sinh(etaMin); } else { r1 = rMax; } r2 = zMin / sinh(etaMax); } name += "[" + sampling + "/" + region + "]"; String info = name; Appearance appearance = builder().appearance(name, color); setAppearance(appearance); double[] rmins; double[] rmaxs; double[] zmins = new double[]{zMin, zMax}; double[] zmaxs = new double[]{zMin, zMax}; if (name.indexOf("HEC") >= 0) { rmins = new double[]{rMin, rMin}; rmaxs = new double[]{rMax, rMax}; } else { rmins = new double[]{zMin / sinh(etaMin), zMin / sinh(etaMax)}; rmaxs = new double[]{zMax / sinh(etaMin), zMax / sinh(etaMax)}; } PolyGoneSegment polygone = new PolyGoneSegment(rmins, rmaxs, zmins, zmaxs, phi0, phi0 + 2*PI, nPhi, appearance); use(polygone, name, info); } private static int k = 0; /** Logging . */ private static Logger log = Logger.getLogger(AEndcapCalorimeter.class); } Index: AGeometry.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps/AGeometry.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** AGeometry.java 20 Jan 2007 00:19:10 -0000 1.2 --- AGeometry.java 22 Jan 2007 17:50:18 -0000 1.3 *************** *** 8,11 **** --- 8,12 ---- import net.hep.atlas.graphics.JiveGeometry.JAXB.AGeneralPathType; import net.hep.atlas.graphics.JiveGeometry.JAXB.ABarrelCalorimeterType; + import net.hep.atlas.graphics.JiveGeometry.JAXB.AEndcapCalorimeterType; // GraXML *************** *** 32,35 **** --- 33,39 ---- * <pre> * $Log$ + * Revision 1.3 2007/01/22 17:50:18 hrivnac + * Calo geometry improved + * * Revision 1.2 2007/01/20 00:19:10 hrivnac * ABarrelCalorimeter added *************** *** 82,85 **** --- 86,90 ---- AGeneralPathType aGeneralPath; ABarrelCalorimeterType aBarrelCalorimeter; + AEndcapCalorimeterType aEndcapCalorimeter; for (Object o : aGeometry.getAGeometryConstantOrAGeneralPathOrADisc()) { // - AGeneralPath *************** *** 93,96 **** --- 98,106 ---- (new ABarrelCalorimeter()).traverse(builder, aBarrelCalorimeter, branch, name); } + // - AEndcapCalorimeter + else if (o instanceof AEndcapCalorimeterType) { + aEndcapCalorimeter = (AEndcapCalorimeterType)o; + (new AEndcapCalorimeter()).traverse(builder, aEndcapCalorimeter, branch, name); + } // TBD } Index: ABarrelCalorimeter.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps/ABarrelCalorimeter.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ABarrelCalorimeter.java 20 Jan 2007 00:19:10 -0000 1.1 --- ABarrelCalorimeter.java 22 Jan 2007 17:50:18 -0000 1.2 *************** *** 28,31 **** --- 28,32 ---- import static java.lang.Math.PI; import static java.lang.Math.sinh; + import static java.lang.Math.toRadians; // Log4J *************** *** 38,41 **** --- 39,45 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/22 17:50:18 hrivnac + * Calo geometry improved + * * Revision 1.1 2007/01/20 00:19:10 hrivnac * ABarrelCalorimeter added *************** *** 61,65 **** double zMin = aBarrelCalorimeter.getZMin() / 1000.0; double zMax = aBarrelCalorimeter.getZMax() / 1000.0; ! double phi0 = aBarrelCalorimeter.getPhi0(); int nPhi = aBarrelCalorimeter.getNphi(); double dPhi = 2.0 * PI / nPhi; --- 65,69 ---- double zMin = aBarrelCalorimeter.getZMin() / 1000.0; double zMax = aBarrelCalorimeter.getZMax() / 1000.0; ! double phi0 = toRadians(aBarrelCalorimeter.getPhi0()); int nPhi = aBarrelCalorimeter.getNphi(); double dPhi = 2.0 * PI / nPhi; *************** *** 68,71 **** --- 72,85 ---- double dEta = aBarrelCalorimeter.getDeta(); + double etaMax = eta0 + nEta * dEta; + double etaMin; + if (eta0 <= 0.0) { + zMin = - zMax; + etaMin = - etaMax; + } + else { + etaMin = eta0; + } + name += "[" + sampling + "/" + region + "]"; String info = name; *************** *** 75,82 **** setAppearance(appearance); ! double[] rmins = new double[]{rMin, rMin, rMin, rMin}; ! double[] rmaxs = new double[]{rMax, rMax, rMax, rMax}; ! double[] zmins = new double[]{- rMin * sinh(eta0 + nEta * dEta), - rMin * sinh(eta0), rMin * sinh(eta0), rMin * sinh(eta0 + nEta * dEta)}; ! double[] zmaxs = new double[]{- rMax * sinh(eta0 + nEta * dEta), - rMax * sinh(eta0), rMax * sinh(eta0), rMax * sinh(eta0 + nEta * dEta)}; PolyGoneSegment polygone = new PolyGoneSegment(rmins, rmaxs, zmins, zmaxs, phi0, phi0 + 2*PI, nPhi, appearance); use(polygone, name, info); --- 89,104 ---- setAppearance(appearance); ! double[] rmins = new double[]{rMin, rMin}; ! double[] rmaxs = new double[]{rMax, rMax}; ! double[] zmins; ! double[] zmaxs; ! if (name.indexOf("TILE") >= 0) { ! zmins = new double[]{zMin, zMax}; ! zmaxs = new double[]{zMin, zMax}; ! } ! else { ! zmins = new double[]{rMin * sinh(etaMin), rMin * sinh(etaMax)}; ! zmaxs = new double[]{rMax * sinh(etaMin), rMax * sinh(etaMax)}; ! } PolyGoneSegment polygone = new PolyGoneSegment(rmins, rmaxs, zmins, zmaxs, phi0, phi0 + 2*PI, nPhi, appearance); use(polygone, name, info); *************** *** 86,90 **** /** Logging . */ ! private static Logger log = Logger.getLogger(AGeneralPath.class); } --- 108,112 ---- /** Logging . */ ! private static Logger log = Logger.getLogger(ABarrelCalorimeter.class); } |
|
From: Julius H. <hr...@us...> - 2007-01-20 00:19:18
|
Update of /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv9875/net/hep/atlas/graphics/JiveGeometry/GeometricModel Modified Files: JiveGeometryBuilder.java Log Message: ABarrelCalorimeter added Index: JiveGeometryBuilder.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/JiveGeometryBuilder.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** JiveGeometryBuilder.java 16 Jan 2007 14:44:34 -0000 1.3 --- JiveGeometryBuilder.java 20 Jan 2007 00:19:09 -0000 1.4 *************** *** 3,6 **** --- 3,7 ---- // GraXML import net.hep.graphics.GraXML.MasterBuilder; + import net.hep.graphics.GraXML.BuildOptions; // Java3D *************** *** 21,24 **** --- 22,28 ---- * <pre> * $Log$ + * Revision 1.4 2007/01/20 00:19:09 hrivnac + * ABarrelCalorimeter added + * * Revision 1.3 2007/01/16 14:44:34 hrivnac * better xsd, AGeneralPath visible *************** *** 37,47 **** /** Perform configuration. */ ! public void configure() {} /** Get list of (embedded) demostration files. * @return The list of (embedded) demostration files. */ public String[] demos() { ! String[] demos = {"net/hep/atlas/graphics/JiveGeometry/Test/data/AGeometry.xml", ! "net/hep/atlas/graphics/JiveGeometry/Test/data/AGeometryTB.xml"}; return demos; } --- 41,52 ---- /** Perform configuration. */ ! public void configure() { ! BuildOptions.setColorPerMaterial(true); ! } /** Get list of (embedded) demostration files. * @return The list of (embedded) demostration files. */ public String[] demos() { ! String[] demos = {"net/hep/atlas/graphics/JiveGeometry/Test/data/AGeometry.xml"}; return demos; } |
|
From: Julius H. <hr...@us...> - 2007-01-20 00:19:18
|
Update of /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv9875/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps Modified Files: AGeometry.java Added Files: ABarrelCalorimeter.java Log Message: ABarrelCalorimeter added Index: AGeometry.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps/AGeometry.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AGeometry.java 16 Jan 2007 14:44:35 -0000 1.1 --- AGeometry.java 20 Jan 2007 00:19:10 -0000 1.2 *************** *** 7,10 **** --- 7,11 ---- import net.hep.atlas.graphics.JiveGeometry.JAXB.AGeometryType; import net.hep.atlas.graphics.JiveGeometry.JAXB.AGeneralPathType; + import net.hep.atlas.graphics.JiveGeometry.JAXB.ABarrelCalorimeterType; // GraXML *************** *** 12,16 **** import net.hep.graphics.GraXML.MasterBuilder; import net.hep.graphics.GraXML.Disconnecter.DetachableConnection; ! import net.hep.graphics.GraXML.Disconnecter.ConnectionsDB; // Java3D --- 13,18 ---- import net.hep.graphics.GraXML.MasterBuilder; import net.hep.graphics.GraXML.Disconnecter.DetachableConnection; ! import net.hep.graphics.GraXML.Disconnecter.ConnectionsDB; ! import net.hep.graphics.GraXML.Java3DExtensions.Interactivity.Interacter; // Java3D *************** *** 30,33 **** --- 32,38 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/20 00:19:10 hrivnac + * ABarrelCalorimeter added + * * Revision 1.1 2007/01/16 14:44:35 hrivnac * better xsd, AGeneralPath visible *************** *** 59,90 **** return; } // Get element properties AGeometryType aGeometry = (AGeometryType)element; // Traverse all children and add their representations into branch BranchGroup branch = new BranchGroup();; - // - AGeneralPath AGeneralPathType aGeneralPath; for (Object o : aGeometry.getAGeometryConstantOrAGeneralPathOrADisc()) { if (o instanceof AGeneralPathType) { aGeneralPath = (AGeneralPathType)o; ! (new AGeneralPath()).traverse(builder, aGeneralPath, branch, _name); } } // Register BranchGroup into Connections database ! builder.conDB().addConnection(new DetachableConnection(_name, parent, tg, branch, ! null)); } - private static String _name = "AGeometry"; - /** Logging . */ private static Logger log = Logger.getLogger(AGeometry.class); } --- 64,115 ---- return; } + + // Set options + Interacter.setOutlined(false); // Get element properties AGeometryType aGeometry = (AGeometryType)element; + String name = _name; + if (_ord > 0) { + name += "." + _ord; + } + _ord++; + String info = name; + // Traverse all children and add their representations into branch BranchGroup branch = new BranchGroup();; AGeneralPathType aGeneralPath; + ABarrelCalorimeterType aBarrelCalorimeter; for (Object o : aGeometry.getAGeometryConstantOrAGeneralPathOrADisc()) { + // - AGeneralPath if (o instanceof AGeneralPathType) { aGeneralPath = (AGeneralPathType)o; ! (new AGeneralPath()).traverse(builder, aGeneralPath, branch, name); ! } ! // - ABarrelCalorimeter ! else if (o instanceof ABarrelCalorimeterType) { ! aBarrelCalorimeter = (ABarrelCalorimeterType)o; ! (new ABarrelCalorimeter()).traverse(builder, aBarrelCalorimeter, branch, name); } + // TBD } // Register BranchGroup into Connections database ! builder.conDB().addConnection(new DetachableConnection(name, parent, tg, branch, ! null, ! info)); } /** Logging . */ private static Logger log = Logger.getLogger(AGeometry.class); + private static String _name = "AGeometry"; + + private static short _ord = 0; + } --- NEW FILE: ABarrelCalorimeter.java --- package net.hep.atlas.graphics.JiveGeometry.GeometricModel.Reps; import net.hep.atlas.graphics.JiveGeometry.GeometricModel.JiveGeometryBuilder; import net.hep.atlas.graphics.JiveGeometry.GeometricModel.JiveRep; // Generic Model import net.hep.atlas.graphics.JiveGeometry.JAXB.ABarrelCalorimeterType; // GraXML import net.hep.graphics.GraXML.GraXMLJAXBRep; import net.hep.graphics.GraXML.MasterBuilder; import net.hep.graphics.GraXML.Disconnecter.DetachableConnection; import net.hep.graphics.GraXML.Disconnecter.ConnectionsDB; // Java3D import javax.media.j3d.Group; import javax.media.j3d.BranchGroup; import javax.vecmath.Point3d; import javax.media.j3d.Appearance; // JAXB import javax.xml.bind.Element; // FreeHEP import org.freehep.j3d.PolyGoneSegment; // Java import static java.lang.Math.PI; import static java.lang.Math.sinh; // Log4J import org.apache.log4j.Logger; /** GraXML representation {@link GraXMLJAXBRep} of <code>ABarrelCalorimeter</code> JiveGeometry element * connected via JAXB {@link net.hep.atlas.graphics.JiveGeometry.JAXB.ABarrelCalorimeter} generic JAXB * interface. * <p><font color="#880088"> * <pre> * $Log: ABarrelCalorimeter.java,v $ * Revision 1.1 2007/01/20 00:19:10 hrivnac * ABarrelCalorimeter added * * </pre> * </font></p> * @version $Id: ABarrelCalorimeter.java,v 1.1 2007/01/20 00:19:10 hrivnac Exp $ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ public final class ABarrelCalorimeter extends JiveRep { public final void traverse(JiveGeometryBuilder builder, ABarrelCalorimeterType aBarrelCalorimeter, Group tg, String parent) { // Set values set(builder, tg, parent); // Get element properties String color = aBarrelCalorimeter.getC(); String name = aBarrelCalorimeter.getN(); int sampling = aBarrelCalorimeter.getSampling(); int region = aBarrelCalorimeter.getRegion(); double rMin = aBarrelCalorimeter.getRMin() / 1000.0; double rMax = aBarrelCalorimeter.getRMax() / 1000.0; double zMin = aBarrelCalorimeter.getZMin() / 1000.0; double zMax = aBarrelCalorimeter.getZMax() / 1000.0; double phi0 = aBarrelCalorimeter.getPhi0(); int nPhi = aBarrelCalorimeter.getNphi(); double dPhi = 2.0 * PI / nPhi; double eta0 = aBarrelCalorimeter.getMeta(); int nEta = aBarrelCalorimeter.getNeta(); double dEta = aBarrelCalorimeter.getDeta(); name += "[" + sampling + "/" + region + "]"; String info = name; Appearance appearance = builder().appearance(name, color); setAppearance(appearance); double[] rmins = new double[]{rMin, rMin, rMin, rMin}; double[] rmaxs = new double[]{rMax, rMax, rMax, rMax}; double[] zmins = new double[]{- rMin * sinh(eta0 + nEta * dEta), - rMin * sinh(eta0), rMin * sinh(eta0), rMin * sinh(eta0 + nEta * dEta)}; double[] zmaxs = new double[]{- rMax * sinh(eta0 + nEta * dEta), - rMax * sinh(eta0), rMax * sinh(eta0), rMax * sinh(eta0 + nEta * dEta)}; PolyGoneSegment polygone = new PolyGoneSegment(rmins, rmaxs, zmins, zmaxs, phi0, phi0 + 2*PI, nPhi, appearance); use(polygone, name, info); } private static int k = 0; /** Logging . */ private static Logger log = Logger.getLogger(AGeneralPath.class); } |
|
From: Julius H. <hr...@us...> - 2007-01-20 00:19:18
|
Update of /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/Schema In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv9875/net/hep/atlas/graphics/JiveGeometry/Schema Modified Files: AGeometry.xsd Log Message: ABarrelCalorimeter added Index: AGeometry.xsd =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/Schema/AGeometry.xsd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AGeometry.xsd 16 Jan 2007 14:44:35 -0000 1.1 --- AGeometry.xsd 20 Jan 2007 00:19:10 -0000 1.2 *************** *** 1,5 **** ! <?xml version="1.0"?> ! <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"> <xs:element name="AGeometry"> --- 1,14 ---- ! <!-- JiveGeometry Schema. --> ! <!-- This schema has been semi-automaticaly extracted from Atlantis ! example XML files. --> ! <!-- ! $Log$ ! Revision 1.2 2007/01/20 00:19:10 hrivnac ! ABarrelCalorimeter added ! --> ! ! <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" ! xmlns:xml="http://www.w3.org/XML/1998/namespace"> <xs:element name="AGeometry"> *************** *** 107,122 **** <xs:attribute name="c" type="xs:string" use="required"/> <xs:attribute name="n" type="xs:string" use="required"/> ! <xs:attribute name="sampling" type="xs:string" use="required"/> ! <xs:attribute name="region" type="xs:string" use="required"/> ! <xs:attribute name="rMin" type="xs:string" use="required"/> ! <xs:attribute name="rMax" type="xs:string" use="required"/> ! <xs:attribute name="zMin" type="xs:string" use="required"/> ! <xs:attribute name="zMax" type="xs:string" use="required"/> ! <xs:attribute name="eta0" type="xs:string" use="required"/> ! <xs:attribute name="deta" type="xs:string" use="required"/> ! <xs:attribute name="neta" type="xs:string" use="required"/> ! <xs:attribute name="meta" type="xs:string" use="required"/> ! <xs:attribute name="phi0" type="xs:string" use="required"/> ! <xs:attribute name="nphi" type="xs:string" use="required"/> </xs:complexType> </xs:element> --- 116,131 ---- <xs:attribute name="c" type="xs:string" use="required"/> <xs:attribute name="n" type="xs:string" use="required"/> ! <xs:attribute name="sampling" type="xs:int" use="required"/> ! <xs:attribute name="region" type="xs:int" use="required"/> ! <xs:attribute name="rMin" type="xs:double" use="required"/> ! <xs:attribute name="rMax" type="xs:double" use="required"/> ! <xs:attribute name="zMin" type="xs:double" use="required"/> ! <xs:attribute name="zMax" type="xs:double" use="required"/> ! <xs:attribute name="eta0" type="xs:double" use="required"/> ! <xs:attribute name="deta" type="xs:double" use="required"/> ! <xs:attribute name="neta" type="xs:int" use="required"/> ! <xs:attribute name="meta" type="xs:int" use="required"/> ! <xs:attribute name="phi0" type="xs:double" use="required"/> ! <xs:attribute name="nphi" type="xs:int" use="required"/> </xs:complexType> </xs:element> *************** *** 216,221 **** <xs:attribute name="rMin" type="xs:double" use="required"/> <xs:attribute name="rMax" type="xs:double" use="required"/> ! <xs:attribute name="phiIn" type="xs:double" use="required"/> ! <xs:attribute name="phiOut" type="xs:double" use="required"/> <xs:attribute name="zMin" type="xs:double" use="required"/> <xs:attribute name="zMax" type="xs:double" use="required"/> --- 225,229 ---- <xs:attribute name="rMin" type="xs:double" use="required"/> <xs:attribute name="rMax" type="xs:double" use="required"/> ! <xs:attribute name="phi0" type="xs:double" use="required"/> <xs:attribute name="zMin" type="xs:double" use="required"/> <xs:attribute name="zMax" type="xs:double" use="required"/> |
|
From: Julius H. <hr...@us...> - 2007-01-20 00:17:44
|
Update of /cvsroot/graxml/Graphics/HEP3D/src/org/freehep/j3d In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv9148/org/freehep/j3d Modified Files: PolyGone.java PolyGoneSegment.java Solid.java Test.java Log Message: PolyGoneSegment generalised Index: PolyGoneSegment.java =================================================================== RCS file: /cvsroot/graxml/Graphics/HEP3D/src/org/freehep/j3d/PolyGoneSegment.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PolyGoneSegment.java 16 Jan 2007 14:56:25 -0000 1.2 --- PolyGoneSegment.java 20 Jan 2007 00:17:35 -0000 1.3 *************** *** 17,20 **** --- 17,23 ---- * <pre> * $Log$ + * Revision 1.3 2007/01/20 00:17:35 hrivnac + * PolyGoneSegment generalised + * * Revision 1.2 2007/01/16 14:56:25 hrivnac * PolyGone added *************** *** 76,79 **** --- 79,84 ---- * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ + // TBD generalise PolyConeSegment to zmins, zmaxs + // TBD test zmins, zmaxs public class PolyGoneSegment extends Solid { *************** *** 83,90 **** protected PolyGoneSegment() {} /** Create general polygone segment. ! * @param rmins The array of tangent distances of inner surface, rmins.length >= zs.length). ! * @param rmaxs The array of tangent distances of outer surface, rmaxs.length >= zs.length, rmaxs.length == rmins.length, rmaxs[i] > rmins[i]. ! * @param zs The array of possitions of z-planes, zs.length > 0, zs[i] < zs[i+1]. * @param phimin The starting azimutal angle [rad], 0-2*pi. * @param phimax The ending azimutal angle [rad], 0-2*pi, phimax > phimin. --- 88,124 ---- protected PolyGoneSegment() {} + /** Create general polygone segment. All arrays should have the same positive dimension. + * @param rmins The array of tangent distances of inner surface. + * @param rmaxs The array of tangent distances of outer surface, rmaxs[i] > rmins[i]. + * @param zmins The array of possitions of z-planes of inner surface. + * @param zmaxs The array of possitions of z-planes of outer surface. + * @param phimin The starting azimutal angle [rad], 0-2*pi. + * @param phimax The ending azimutal angle [rad], 0-2*pi, phimax > phimin. + * @param sides The number of sides between phimin and phimax, sides > 0. + * @param appearance The object' Appearance. + * @throws IllegalArgumentException if the parameters are invalid. + * @throws IllegalArgumentException if the parameters are invalid. */ + public PolyGoneSegment(double[] rmins, + double[] rmaxs, + double[] zmins, + double[] zmaxs, + double phimin, + double phimax, + int sides, + Appearance appearance) throws IllegalArgumentException { + construct(rmins, + rmaxs, + zmins, + zmaxs, + phimin, + phimax, + sides, + appearance); + } + /** Create general polygone segment. ! * @param rmins The array of tangent distances of inner surface. ! * @param rmaxs The array of tangent distances of outer surface, rmaxs[i] > rmins[i]. ! * @param zs The array of possitions of z-planes. * @param phimin The starting azimutal angle [rad], 0-2*pi. * @param phimax The ending azimutal angle [rad], 0-2*pi, phimax > phimin. *************** *** 102,105 **** --- 136,140 ---- rmaxs, zs, + zs, phimin, phimax, *************** *** 110,117 **** // --------------------------------------------------------------------------- ! /** Perform the construction. ! * @param rmins The array of tangent distances of inner surface, rmins.length >= zs.length. ! * @param rmaxs The array of tangent distances of outer surface, rmaxs.length >= zs.length, rmaxs.length == rmins.length, rmaxs[i] > rmins[i]. ! * @param zs The array of possitions of z-planes, zs.length > 0, zs[i] < zs[i+1]. * @param phimin The starting azimutal angle [rad], 0-2*pi. * @param phimax The ending azimutal angle [rad], 0-2*pi, phimax > phimin. --- 145,153 ---- // --------------------------------------------------------------------------- ! /** Perform the construction. All arrays should have the same positive dimension. ! * @param rmins The array of tangent distances of inner surface. ! * @param rmaxs The array of tangent distances of outer surface, rmaxs[i] > rmins[i]. ! * @param zmins The array of possitions of z-planes of inner surface. ! * @param zmaxs The array of possitions of z-planes of outer surface. * @param phimin The starting azimutal angle [rad], 0-2*pi. * @param phimax The ending azimutal angle [rad], 0-2*pi, phimax > phimin. *************** *** 121,125 **** protected void construct(double[] rmins, double[] rmaxs, ! double[] zs, double phimin, double phimax, --- 157,162 ---- protected void construct(double[] rmins, double[] rmaxs, ! double[] zmins, ! double[] zmaxs, double phimin, double phimax, *************** *** 139,150 **** " 0 <= phimin < phimax <= 2*pi"); } ! if (! (rmins.length >= zs.length && ! rmaxs.length >= zs.length && ! rmaxs.length == rmins.length && ! zs.length > 0)) { ! System.err.println("PolyGoneSegment: (rmins.length, rmaxs.length, zs.length) = (" + ! rmins.length + ", " + rmaxs.length + ", " + zs.length + ")" + ! " are illegal, they should satisfy following conditions:" + ! " 0 < zs.length <= rmins.length == rmaxs.length."); } for (int i = 0; i < rmaxs.length; i++) { --- 176,186 ---- " 0 <= phimin < phimax <= 2*pi"); } ! if (! (rmins.length == zmins.length && ! rmaxs.length == zmins.length && ! zmaxs.length == zmins.length && ! zmins.length > 0)) { ! System.err.println("PolyGoneSegment: (rmins.length, rmaxs.length, zmins.length, zmaxs.length) = (" + ! rmins.length + ", " + rmaxs.length + ", " + zmins.length + ", " + zmaxs.length + ")" + ! " are illegal, they should be all the same and > 0."); } for (int i = 0; i < rmaxs.length; i++) { *************** *** 160,179 **** " is illegal, it should be > 0."); } - for (int i = 0; i < zs.length - 1; i++) { - if (zs[i] > zs[i+1]) { - System.out.println("PolyGoneSegment: (zs[i], zs[i+1]) = (" + - zs[i] + "[" + i + "], " + zs[i+1] + "[" + (i+1) + "])" + - " are illegal, they should satisfy following conditions:" + - " zs[i] < zs[i+1]."); - } - } // Prepare Points ! Point3d[][] inner = new Point3d[zs.length][sides + 1]; ! Point3d[][] outer = new Point3d[zs.length][sides + 1]; ! Point3d[] outermin = new Point3d[zs.length]; ! Point3d[] innermin = new Point3d[zs.length]; ! Point3d[] outermax = new Point3d[zs.length]; ! Point3d[] innermax = new Point3d[zs.length]; // Fill Points --- 196,207 ---- " is illegal, it should be > 0."); } // Prepare Points ! Point3d[][] inner = new Point3d[zmins.length][sides + 1]; ! Point3d[][] outer = new Point3d[zmaxs.length][sides + 1]; ! Point3d[] innermin = new Point3d[zmins.length]; ! Point3d[] outermin = new Point3d[zmaxs.length]; ! Point3d[] innermax = new Point3d[zmins.length]; ! Point3d[] outermax = new Point3d[zmaxs.length]; // Fill Points *************** *** 182,217 **** for (int j = 0; j < sides + 1; j++) { phi = j * (phimax - phimin) / sides + phimin; ! for (int i = 0; i < zs.length; i++) { outer[i][j] = new Point3d(rmaxs[i] * cos(phi), rmaxs[i] * sin(phi), ! zs[i]); inner[i][j] = new Point3d(rmins[i] * cos(phi), rmins[i] * sin(phi), ! zs[i]); } } // - over z ! for (int i = 0; i < zs.length; i++) { outermin[i] = new Point3d(rmaxs[i] * cos(phimin), rmaxs[i] * sin(phimin), ! zs[i]); innermin[i] = new Point3d(rmins[i] * cos(phimin), rmins[i] * sin(phimin), ! zs[i]); outermax[i] = new Point3d(rmaxs[i] * cos(phimax), rmaxs[i] * sin(phimax), ! zs[i]); innermax[i] = new Point3d(rmins[i] * cos(phimax), rmins[i] * sin(phimax), ! zs[i]); } // Prepare Quad array ! Point3d[] coordinates0 = new Point3d[zs.length * sides * 20]; // Loop over z and phi, construct int k = 0; // Circular ! for (int i = 0; i < zs.length; i++) { for (int j = 0; j < sides; j++) { // Front --- 210,245 ---- for (int j = 0; j < sides + 1; j++) { phi = j * (phimax - phimin) / sides + phimin; ! for (int i = 0; i < zmins.length; i++) { outer[i][j] = new Point3d(rmaxs[i] * cos(phi), rmaxs[i] * sin(phi), ! zmaxs[i]); inner[i][j] = new Point3d(rmins[i] * cos(phi), rmins[i] * sin(phi), ! zmins[i]); } } // - over z ! for (int i = 0; i < zmins.length; i++) { outermin[i] = new Point3d(rmaxs[i] * cos(phimin), rmaxs[i] * sin(phimin), ! zmaxs[i]); innermin[i] = new Point3d(rmins[i] * cos(phimin), rmins[i] * sin(phimin), ! zmins[i]); outermax[i] = new Point3d(rmaxs[i] * cos(phimax), rmaxs[i] * sin(phimax), ! zmaxs[i]); innermax[i] = new Point3d(rmins[i] * cos(phimax), rmins[i] * sin(phimax), ! zmins[i]); } // Prepare Quad array ! Point3d[] coordinates0 = new Point3d[zmins.length * sides * 20]; // Loop over z and phi, construct int k = 0; // Circular ! for (int i = 0; i < zmins.length; i++) { for (int j = 0; j < sides; j++) { // Front *************** *** 224,228 **** } // Back ! if (i == zs.length - 1) { coordinates0[k + 3] = inner[i][j ]; coordinates0[k + 2] = inner[i][j + 1]; --- 252,256 ---- } // Back ! if (i == zmins.length - 1) { coordinates0[k + 3] = inner[i][j ]; coordinates0[k + 2] = inner[i][j + 1]; *************** *** 249,253 **** // Limits if (phimin != 0 || phimax != 2*PI) { ! for (int i = 1; i < zs.length; i++) { // Phimin coordinates0[k ] = outermin[i ]; --- 277,281 ---- // Limits if (phimin != 0 || phimax != 2*PI) { ! for (int i = 1; i < zmins.length; i++) { // Phimin coordinates0[k ] = outermin[i ]; Index: PolyGone.java =================================================================== RCS file: /cvsroot/graxml/Graphics/HEP3D/src/org/freehep/j3d/PolyGone.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** PolyGone.java 16 Jan 2007 14:56:25 -0000 1.1 --- PolyGone.java 20 Jan 2007 00:17:35 -0000 1.2 *************** *** 17,20 **** --- 17,23 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/20 00:17:35 hrivnac + * PolyGoneSegment generalised + * * Revision 1.1 2007/01/16 14:56:25 hrivnac * PolyGone added *************** *** 37,46 **** /** Create polygone. ! * @param points The array of {@link Point3d}s, points.length > 2. ! * @param appearance The object' Appearance * @throws IllegalArgumentException if the parameters are invalid. */ public PolyGone(Point3d[] points, Appearance appearance) throws IllegalArgumentException { ! construct(points, appearance); } --- 40,54 ---- /** Create polygone. ! * @param points The array of {@link Point3d}s, points.length > 2. ! * It can be null. ! * @param contourCounts The numbers of points for each polygone, ! * first polygone forms external border, others are holes. ! * It can be null, then only one polygone is created. ! * @param appearance The object' Appearance * @throws IllegalArgumentException if the parameters are invalid. */ public PolyGone(Point3d[] points, + int[] contourCounts, Appearance appearance) throws IllegalArgumentException { ! construct(points, contourCounts, appearance); } *************** *** 49,73 **** /** Perform the construction. * @param points The array of {@link Point3d}s, points.length > 2. * @param appearance The object' Appearance ! * @throws IllegalArgumentException if the parameters are invalid. */ protected void construct(Point3d[] points, Appearance appearance) throws IllegalArgumentException { // Check preconditins ! if (! (points.length > 2)) { throw new IllegalArgumentException("There are not enough points (" + points.length + ")," + " it should be > 2."); } ! int[] counts = new int[1]; ! counts[0] = points.length; ! ! // Fill Polygone array ! addCoordinatesPolygone(points); // Add Appearance setAppearance(appearance); ! } } --- 57,105 ---- /** Perform the construction. * @param points The array of {@link Point3d}s, points.length > 2. + * It can be null. + * @param stripCounts The numbers of points for each polygone, + * first polygone forms external border, others are holes. + * It can be null, then only one polygone is created. * @param appearance The object' Appearance ! * @throws IllegalArgumentException if the parameters are invalid. */ ! // TBD: check for consistency protected void construct(Point3d[] points, + int[] stripCounts, Appearance appearance) throws IllegalArgumentException { // Check preconditins ! if (points != null && ! (points.length > 2)) { throw new IllegalArgumentException("There are not enough points (" + points.length + ")," + " it should be > 2."); } ! // Add polygone if there is one ! if (points != null) { ! // Fill Polygone array ! addCoordinatesPolygone(points, stripCounts); ! } // Add Appearance setAppearance(appearance); ! } ! ! /** Add another polygone. ! * @param points The array of {@link Point3d}s, points.length > 2. ! * @param stripCounts The numbers of points for each polygone, ! * first polygone forms external border, others are holes. ! * It can be null, then only one polygone is created. ! * @throws IllegalArgumentException if the parameters are invalid. */ ! public void addPolygone(Point3d[] points, ! int[] stripCounts) { ! addCoordinatesPolygone(points, stripCounts); ! } ! ! /** Add another polygone. ! * @param points The array of {@link Point3d}s, points.length > 2. ! * @throws IllegalArgumentException if the parameters are invalid. */ ! public void addPolygone(Point3d[] points) { ! addCoordinates(points); ! } } Index: Test.java =================================================================== RCS file: /cvsroot/graxml/Graphics/HEP3D/src/org/freehep/j3d/Test.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Test.java 16 Jan 2007 14:56:25 -0000 1.2 --- Test.java 20 Jan 2007 00:17:35 -0000 1.3 *************** *** 34,37 **** --- 34,40 ---- * <pre> * $Log$ + * Revision 1.3 2007/01/20 00:17:35 hrivnac + * PolyGoneSegment generalised + * * Revision 1.2 2007/01/16 14:56:25 hrivnac * PolyGone added *************** *** 239,246 **** else if (name.equals("PolyGone")) { Point3d[] points = {new Point3d(0.0, 0.0, 0.0), ! new Point3d(0.5, 0.6, 0.1), ! new Point3d(0.0, 0.4, 0.4), ! new Point3d(0.0, 0.3, 0.2)}; ! return(new PolyGone(points, // points transparentAppearance())); } --- 242,255 ---- else if (name.equals("PolyGone")) { Point3d[] points = {new Point3d(0.0, 0.0, 0.0), ! new Point3d(0.5, 0.0, 0.0), ! new Point3d(0.5, 0.5, 0.0), ! new Point3d(0.0, 0.5, 0.0), ! new Point3d(0.1, 0.1, 0.1), ! new Point3d(0.2, 0.1, 0.1), ! new Point3d(0.2, 0.2, 0.1), ! new Point3d(0.1, 0.2, 0.1)}; ! int[] stripCounts = {4, 4}; ! return(new PolyGone(points, // points ! stripCounts, // stripCounts transparentAppearance())); } Index: Solid.java =================================================================== RCS file: /cvsroot/graxml/Graphics/HEP3D/src/org/freehep/j3d/Solid.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Solid.java 16 Jan 2007 14:56:25 -0000 1.3 --- Solid.java 20 Jan 2007 00:17:35 -0000 1.4 *************** *** 12,15 **** --- 12,18 ---- * <pre> * $Log$ + * Revision 1.4 2007/01/20 00:17:35 hrivnac + * PolyGoneSegment generalised + * * Revision 1.3 2007/01/16 14:56:25 hrivnac * PolyGone added *************** *** 61,70 **** /** Adds geometry from <code>{@link GeometryInfo}.POLYGON_ARRAY ! * coordinates. Just one countour is created (there are no holes). ! * @param coordinates The polygon array describing geometry. */ ! protected void addCoordinatesPolygone(Point3d[] coordinates) { GeometryInfo geometryInfo = new GeometryInfo(GeometryInfo.POLYGON_ARRAY); geometryInfo.setCoordinates(coordinates); ! int[] stripCounts = {coordinates.length}; geometryInfo.setStripCounts(stripCounts); _normalGenerator.generateNormals(geometryInfo); --- 64,85 ---- /** Adds geometry from <code>{@link GeometryInfo}.POLYGON_ARRAY ! * coordinates. ! * @param coordinates The polygon array describing geometry. ! * @param stripCounts The array containing lengths of the polygons, ! * The first polygone describes the external border, ! * others are holes. ! * It can be null, then no holes are created. */ ! // TBD: check for consistency ! protected void addCoordinatesPolygone(Point3d[] coordinates, ! int[] stripCounts) { GeometryInfo geometryInfo = new GeometryInfo(GeometryInfo.POLYGON_ARRAY); geometryInfo.setCoordinates(coordinates); ! if (stripCounts == null) { ! stripCounts = new int[]{coordinates.length}; ! } ! else { ! int[] contourCounts = new int[]{stripCounts.length}; ! geometryInfo.setContourCounts(contourCounts); ! } geometryInfo.setStripCounts(stripCounts); _normalGenerator.generateNormals(geometryInfo); |
|
From: Julius H. <hr...@us...> - 2007-01-20 00:17:37
|
Update of /cvsroot/graxml/Graphics/HEP3D/src In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv9148 Modified Files: index.html Log Message: PolyGoneSegment generalised Index: index.html =================================================================== RCS file: /cvsroot/graxml/Graphics/HEP3D/src/index.html,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** index.html 16 Jan 2007 14:56:25 -0000 1.7 --- index.html 20 Jan 2007 00:17:35 -0000 1.8 *************** *** 149,152 **** --- 149,153 ---- <ul> <li>PolyGone added.</li> + <li>PolyGoneSegment generalised.</li> </ul> </li> |
|
From: Julius H. <hr...@us...> - 2007-01-18 16:05:21
|
Update of /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/GUI In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv1951/net/hep/graphics/GraXML/GUI Modified Files: RootActionListener.java RootWindow.java Log Message: clean button added Index: RootWindow.java =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/GUI/RootWindow.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** RootWindow.java 18 Jan 2007 15:29:22 -0000 1.4 --- RootWindow.java 18 Jan 2007 16:04:59 -0000 1.5 *************** *** 78,81 **** --- 78,84 ---- * <pre> * $Log$ + * Revision 1.5 2007/01/18 16:04:59 hrivnac + * clean button added + * * Revision 1.4 2007/01/18 15:29:22 hrivnac * multiple loading possible *************** *** 321,324 **** --- 324,334 ---- "Reload model", _actionListener)); + north.add(new SimpleButton("Clean", + Icons.clean, + AbstractButton.CENTER, + Fonts.NONE, + Dimensions.BIG, + "Clean view", + _actionListener)); north.addSeparator(separatorDimension); north.add(new ProjectionPanel(_actionListener)); Index: RootActionListener.java =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/GUI/RootActionListener.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** RootActionListener.java 14 Jan 2007 17:04:58 -0000 1.2 --- RootActionListener.java 18 Jan 2007 16:04:59 -0000 1.3 *************** *** 40,43 **** --- 40,46 ---- * <pre> * $Log$ + * Revision 1.3 2007/01/18 16:04:59 hrivnac + * clean button added + * * Revision 1.2 2007/01/14 17:04:58 hrivnac * embedded demos included *************** *** 160,163 **** --- 163,171 ---- } + // Clean view + else if (value.equals("Clean")) { + _window.clean(); + } + // Save jpg else if (value.equals("Save jpg")) { |
|
From: Julius H. <hr...@us...> - 2007-01-18 16:05:20
|
Update of /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/GUI/Components In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv1951/net/hep/graphics/GraXML/GUI/Components Modified Files: Icons.java Log Message: clean button added Index: Icons.java =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/GUI/Components/Icons.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Icons.java 30 Mar 2005 12:44:30 -0000 1.1 --- Icons.java 18 Jan 2007 16:04:59 -0000 1.2 *************** *** 8,11 **** --- 8,14 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/18 16:04:59 hrivnac + * clean button added + * * Revision 1.1 2005/03/30 12:44:30 hrivnac * GraXML introduced *************** *** 47,50 **** --- 50,55 ---- public static final ImageIcon reload = new ImageIcon(myLoader.getResource("toolbarButtonGraphics/general/Refresh24.gif")); + public static final ImageIcon clean = new ImageIcon(myLoader.getResource("toolbarButtonGraphics/general/Remove24.gif")); + public static final ImageIcon none = new ImageIcon(myLoader.getResource("net/hep/graphics/GraXML/GUI/images/none.gif")); |
|
From: Julius H. <hr...@us...> - 2007-01-18 16:05:10
|
Update of /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/doc-files In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv1951/net/hep/graphics/GraXML/doc-files Modified Files: Guide.html Log Message: clean button added Index: Guide.html =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/doc-files/Guide.html,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** Guide.html 18 Jan 2007 15:29:22 -0000 1.17 --- Guide.html 18 Jan 2007 16:05:00 -0000 1.18 *************** *** 926,929 **** --- 926,930 ---- <li>JiveGeometry builder added.</li> <li>Several files can be loaded into the same screen.</li> + <li>Clean button added.</li> </ul> <li>Bug fixes:</li> |
|
From: Julius H. <hr...@us...> - 2007-01-18 16:05:09
|
Update of /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/Java3DExtensions In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv1951/net/hep/graphics/GraXML/Java3DExtensions Modified Files: J3DFrame.java Log Message: clean button added Index: J3DFrame.java =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/Java3DExtensions/J3DFrame.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** J3DFrame.java 18 Jan 2007 15:29:22 -0000 1.4 --- J3DFrame.java 18 Jan 2007 16:04:59 -0000 1.5 *************** *** 41,44 **** --- 41,47 ---- * <pre> * $Log$ + * Revision 1.5 2007/01/18 16:04:59 hrivnac + * clean button added + * * Revision 1.4 2007/01/18 15:29:22 hrivnac * multiple loading possible *************** *** 121,126 **** } - private boolean _attached = false; - /** Attach {@link BranchGroup} for converting into VRML or X3D file. * @param group The {@link BranchGroup} to be attached. */ --- 124,127 ---- *************** *** 149,159 **** _group.detach(); _group = null; - _root = null; - setRoot(); - setLights(); _optDB.setup(); _conDB.setup(); } // Snapshot ------------------------------------------------------------------ --- 150,159 ---- _group.detach(); _group = null; _optDB.setup(); _conDB.setup(); } + private boolean _attached = false; + // Snapshot ------------------------------------------------------------------ |
|
From: Julius H. <hr...@us...> - 2007-01-18 15:33:14
|
Update of /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/Disconnecter In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv21835/net/hep/graphics/GraXML/Disconnecter Modified Files: ConnectionsDB.java DetachableConnection.java ViewerTreeFactory.java Log Message: multiple loading possible Index: ViewerTreeFactory.java =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/Disconnecter/ViewerTreeFactory.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ViewerTreeFactory.java 18 Jan 2007 15:29:22 -0000 1.1 --- ViewerTreeFactory.java 18 Jan 2007 15:33:12 -0000 1.2 *************** *** 13,16 **** --- 13,19 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/18 15:33:12 hrivnac + * multiple loading possible + * * Revision 1.1 2007/01/18 15:29:22 hrivnac * multiple loading possible *************** *** 59,62 **** --- 62,66 ---- * processed. */ private static final void assembleTree(DetachableConnection connection) { + // Loop over aall children, recursive for (DetachableConnection child : connection.children()) { // Don't add already present trees Index: ConnectionsDB.java =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/Disconnecter/ConnectionsDB.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ConnectionsDB.java 18 Jan 2007 15:29:22 -0000 1.3 --- ConnectionsDB.java 18 Jan 2007 15:33:12 -0000 1.4 *************** *** 18,21 **** --- 18,24 ---- * <pre> * $Log$ + * Revision 1.4 2007/01/18 15:33:12 hrivnac + * multiple loading possible + * * Revision 1.3 2007/01/18 15:29:22 hrivnac * multiple loading possible *************** *** 55,67 **** } ! /** Builds full tree from included connections. TBD * Connection without parent is assigned as the root * connection. */ public final void buildTree() { if (_root == null) { _root = new DetachableConnection("GraXML", null, new BranchGroup(), new BranchGroup(), null); addConnection(_root); } for (DetachableConnection connection : _connections.values()) { if (! "GraXML".equals(connection.name())) { // Set parent (from its stored name) --- 58,73 ---- } ! /** Builds full tree from included connections. * Connection without parent is assigned as the root * connection. */ public final void buildTree() { + // Create new root DetachableConnection if it doesn't exist if (_root == null) { _root = new DetachableConnection("GraXML", null, new BranchGroup(), new BranchGroup(), null); addConnection(_root); } + // Process all DetachableConnections for (DetachableConnection connection : _connections.values()) { + // Skip top-level if (! "GraXML".equals(connection.name())) { // Set parent (from its stored name) Index: DetachableConnection.java =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/Disconnecter/DetachableConnection.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DetachableConnection.java 18 Jan 2007 15:29:22 -0000 1.2 --- DetachableConnection.java 18 Jan 2007 15:33:12 -0000 1.3 *************** *** 35,38 **** --- 35,41 ---- * <pre> * $Log$ + * Revision 1.3 2007/01/18 15:33:12 hrivnac + * multiple loading possible + * * Revision 1.2 2007/01/18 15:29:22 hrivnac * multiple loading possible *************** *** 194,198 **** } ! // TBD public final void defineParent(String parentName) { _parentName = parentName; --- 197,203 ---- } ! /** Set the parent name. ! * It should already exist in the {@link ConnectionsDB}. ! * @param parentName The name of the parent. */ public final void defineParent(String parentName) { _parentName = parentName; |
|
From: Julius H. <hr...@us...> - 2007-01-18 15:29:33
|
Update of /cvsroot/graxml/Graphics/GraXML/src In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv20232 Modified Files: GraXML.jnlp Log Message: multiple loading possible Index: GraXML.jnlp =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/GraXML.jnlp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** GraXML.jnlp 31 May 2006 14:26:13 -0000 1.3 --- GraXML.jnlp 18 Jan 2007 15:29:21 -0000 1.4 *************** *** 27,30 **** --- 27,31 ---- <jar href="GraXML.jar" main="true"/> <jar href="JiveEvent.jar"/> + <jar href="JiveGeometry.jar"/> <jar href="jlfgr.jar"/> <jar href="log4j-1.2.8.jar"/> |
|
From: Julius H. <hr...@us...> - 2007-01-18 15:29:33
|
Update of /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/doc-files In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv20232/net/hep/graphics/GraXML/doc-files Modified Files: Guide.html Log Message: multiple loading possible Index: Guide.html =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/doc-files/Guide.html,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** Guide.html 14 Jan 2007 21:47:06 -0000 1.16 --- Guide.html 18 Jan 2007 15:29:22 -0000 1.17 *************** *** 925,928 **** --- 925,929 ---- <li>Demonstration examples are callable directly from GUI.</li> <li>JiveGeometry builder added.</li> + <li>Several files can be loaded into the same screen.</li> </ul> <li>Bug fixes:</li> |
|
From: Julius H. <hr...@us...> - 2007-01-18 15:29:31
|
Update of /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/Disconnecter In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv20232/net/hep/graphics/GraXML/Disconnecter Modified Files: ConnectionsDB.java DetachableConnection.java ViewerTreeCellRenderer.java ViewerTreeMouseListener.java Added Files: ViewerTreeFactory.java Removed Files: ViewerTree.java Log Message: multiple loading possible --- NEW FILE: ViewerTreeFactory.java --- package net.hep.graphics.GraXML.Disconnecter; import net.hep.graphics.GraXML.GUI.RootWindow; // Swing import javax.swing.JTree; import javax.swing.tree.TreeSelectionModel; import javax.swing.ToolTipManager; /** <code>ViewerTreeFactory</code> creates {@link JTree} of {@link DetachableConnection}s. * It is build after all connections are accumulated. * <p><font color="#880088"> * <pre> * $Log: ViewerTreeFactory.java,v $ * Revision 1.1 2007/01/18 15:29:22 hrivnac * multiple loading possible * * Revision 1.1 2005/03/30 12:44:29 hrivnac * GraXML introduced * * Revision 1.5 2004/05/22 15:44:41 hrivnac * class id reformated * * Revision 1.4 2004/03/31 13:55:58 hrivnac * ConnectionsDB not static * * Revision 1.3 2004/03/30 16:30:39 hrivnac * javadoc typos fixed * * Revision 1.2 2004/03/29 15:36:21 hrivnac * Disconnected refactored * * Revision 1.2 2003/01/07 15:22:59 hrivnac * Documentation. * * </pre> * </font></p> * @version $Id: ViewerTreeFactory.java,v 1.1 2007/01/18 15:29:22 hrivnac Exp $ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ public final class ViewerTreeFactory { /** Create from root {@link DetachableConnection}. * @param window The connected {@link RootWindow}. */ public static JTree createTree(RootWindow window) { assembleTree(window.j3d().conDB().getRoot()); JTree tree = new JTree(window.j3d().conDB().getRoot().treeNode()); ToolTipManager.sharedInstance().registerComponent(tree); tree.setShowsRootHandles(true); tree.setLargeModel(true); tree.getSelectionModel().setSelectionMode(TreeSelectionModel.DISCONTIGUOUS_TREE_SELECTION); tree.putClientProperty("JTree.lineStyle", "Angled"); tree.setCellRenderer(new ViewerTreeCellRenderer(window.j3d().conDB())); tree.addMouseListener(new ViewerTreeMouseListener(window, tree)); return tree; } /** Build the tree recursively. * @param connection The {@link DetachableConnection} to be * processed. */ private static final void assembleTree(DetachableConnection connection) { for (DetachableConnection child : connection.children()) { // Don't add already present trees if (!(connection.name().equals("GraXML") && child.treeNode().getChildCount() > 0)) { connection.treeNode().add(child.treeNode()); assembleTree(child); } } } } Index: ConnectionsDB.java =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/Disconnecter/ConnectionsDB.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ConnectionsDB.java 11 Jan 2007 13:56:47 -0000 1.2 --- ConnectionsDB.java 18 Jan 2007 15:29:22 -0000 1.3 *************** *** 18,21 **** --- 18,24 ---- * <pre> * $Log$ + * Revision 1.3 2007/01/18 15:29:22 hrivnac + * multiple loading possible + * * Revision 1.2 2007/01/11 13:56:47 hrivnac * version 3.1.10 *************** *** 52,72 **** } ! /** Builds full tree from included connections. * Connection without parent is assigned as the root * connection. */ public final void buildTree() { for (DetachableConnection connection : _connections.values()) { ! // Set parent (from its stored name) ! connection.setParent(this); ! // Set root connection if there's no parent ! if (connection.parent() == null) { ! if (_root != null) { ! log.warn("Root connection has been already assigned to " + _root + ", re-assigning to " + connection); } - _root = connection; - } - // Add to proper parent otherwise - else { - connection.parent().addChild(connection); } } --- 55,80 ---- } ! /** Builds full tree from included connections. TBD * Connection without parent is assigned as the root * connection. */ public final void buildTree() { + if (_root == null) { + _root = new DetachableConnection("GraXML", null, new BranchGroup(), new BranchGroup(), null); + addConnection(_root); + } for (DetachableConnection connection : _connections.values()) { ! if (! "GraXML".equals(connection.name())) { ! // Set parent (from its stored name) ! connection.setParent(this); ! // Set root connection if there's no parent ! if (connection.parent() == null) { ! connection.defineParent("GraXML"); ! connection.setParent(this); ! _root.addChild(connection); ! } ! // Add to proper parent otherwise ! else { ! connection.parent().addChild(connection); } } } *************** *** 90,93 **** --- 98,104 ---- * @return The {@link DetachableConnection} with that name. */ public final DetachableConnection getConnection(String name) { + if (name == null) { + return null; + } return _connections.get(name); } --- ViewerTree.java DELETED --- Index: ViewerTreeCellRenderer.java =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/Disconnecter/ViewerTreeCellRenderer.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ViewerTreeCellRenderer.java 17 Jan 2006 17:39:34 -0000 1.2 --- ViewerTreeCellRenderer.java 18 Jan 2007 15:29:22 -0000 1.3 *************** *** 14,17 **** --- 14,20 ---- * <pre> * $Log$ + * Revision 1.3 2007/01/18 15:29:22 hrivnac + * multiple loading possible + * * Revision 1.2 2006/01/17 17:39:34 hrivnac * tuning WebStart *************** *** 65,69 **** row, hasFocus); ! DetachableConnection connection = _conDB.getConnection(getText()); setForeground(connection.color()); setFont(connection.font()); --- 68,72 ---- row, hasFocus); ! DetachableConnection connection = _conDB.getConnection(getText()); setForeground(connection.color()); setFont(connection.font()); Index: DetachableConnection.java =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/Disconnecter/DetachableConnection.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** DetachableConnection.java 30 Mar 2005 12:44:29 -0000 1.1 --- DetachableConnection.java 18 Jan 2007 15:29:22 -0000 1.2 *************** *** 35,38 **** --- 35,41 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/18 15:29:22 hrivnac + * multiple loading possible + * * Revision 1.1 2005/03/30 12:44:29 hrivnac * GraXML introduced *************** *** 191,194 **** --- 194,202 ---- } + // TBD + public final void defineParent(String parentName) { + _parentName = parentName; + } + /** Give the parent detachanble connection. * @return The parent detachanble connection. */ Index: ViewerTreeMouseListener.java =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/Disconnecter/ViewerTreeMouseListener.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ViewerTreeMouseListener.java 30 Mar 2005 12:44:29 -0000 1.1 --- ViewerTreeMouseListener.java 18 Jan 2007 15:29:22 -0000 1.2 *************** *** 23,26 **** --- 23,27 ---- import javax.swing.event.TreeSelectionListener; import javax.swing.tree.TreePath; + import javax.swing.JTree; import javax.swing.tree.DefaultMutableTreeNode; *************** *** 33,36 **** --- 34,40 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/18 15:29:22 hrivnac + * multiple loading possible + * * Revision 1.1 2005/03/30 12:44:29 hrivnac * GraXML introduced *************** *** 69,73 **** * @param tree The {@link ViewerTree} connected with the {@link ConnectionsDB}. */ public ViewerTreeMouseListener(RootWindow window, ! ViewerTree tree) { _window = window; _tree = tree; --- 73,77 ---- * @param tree The {@link ViewerTree} connected with the {@link ConnectionsDB}. */ public ViewerTreeMouseListener(RootWindow window, ! JTree tree) { _window = window; _tree = tree; *************** *** 327,331 **** private RootWindow _window; ! private ViewerTree _tree; private int _level; --- 331,335 ---- private RootWindow _window; ! private JTree _tree; private int _level; |
|
From: Julius H. <hr...@us...> - 2007-01-18 15:29:31
|
Update of /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/Java3DExtensions In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv20232/net/hep/graphics/GraXML/Java3DExtensions Modified Files: J3DFrame.java Log Message: multiple loading possible Index: J3DFrame.java =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/Java3DExtensions/J3DFrame.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** J3DFrame.java 7 Jun 2006 16:00:21 -0000 1.3 --- J3DFrame.java 18 Jan 2007 15:29:22 -0000 1.4 *************** *** 41,44 **** --- 41,47 ---- * <pre> * $Log$ + * Revision 1.4 2007/01/18 15:29:22 hrivnac + * multiple loading possible + * * Revision 1.3 2006/06/07 16:00:21 hrivnac * HEP3D Stripification is reported *************** *** 112,118 **** _conDB.compile(); _mouseT.addChild(_group); ! _universe.addBranchGraph(_root); } /** Attach {@link BranchGroup} for converting into VRML or X3D file. * @param group The {@link BranchGroup} to be attached. */ --- 115,126 ---- _conDB.compile(); _mouseT.addChild(_group); ! if (!_attached) { ! _universe.addBranchGraph(_root); ! _attached = true; ! } } + private boolean _attached = false; + /** Attach {@link BranchGroup} for converting into VRML or X3D file. * @param group The {@link BranchGroup} to be attached. */ *************** *** 176,185 **** // Background if (Interacter.interactivity()) { ! _background = new Background(); ! _background.setColor(0.1f, 0.1f, 0.3f); ! _background.setApplicationBounds(_bounds); ! _background.setCapability(Background.ALLOW_COLOR_READ); ! _background.setCapability(Background.ALLOW_COLOR_WRITE); ! _root.addChild(_background); } // Mouse T --- 184,195 ---- // Background if (Interacter.interactivity()) { ! if (_background == null) { ! _background = new Background(); ! _background.setColor(0.1f, 0.1f, 0.3f); ! _background.setApplicationBounds(_bounds); ! _background.setCapability(Background.ALLOW_COLOR_READ); ! _background.setCapability(Background.ALLOW_COLOR_WRITE); ! _root.addChild(_background); ! } } // Mouse T |
