Print

Print
Commit in LCDetectors/detectors/sid01_polyhedra on MAIN
compact.xml+11-111.6 -> 1.7
sid01_polyhedra.lcdd+57-111.8 -> 1.9
+68-22
2 modified files
JM: Improved visualization settings for sid01_polyhedra compact and LCDD.
LCDetectors/detectors/sid01_polyhedra
compact.xml 1.6 -> 1.7
diff -u -r1.6 -r1.7
--- compact.xml	12 Oct 2006 23:47:59 -0000	1.6
+++ compact.xml	18 Oct 2006 21:36:51 -0000	1.7
@@ -8,7 +8,7 @@

 	author="Jeremy McCormick"
 	url="http://confluence.slac.stanford.edu/display/ilc/sid01"
 	status="development"

-	version="$Id: compact.xml,v 1.6 2006/10/12 23:47:59 jeremy Exp $">

+	version="$Id: compact.xml,v 1.7 2006/10/18 21:36:51 jeremy Exp $">

     <comment>Preliminary version of Sid01 with polyhedra calorimeters.  NOTE:  Needs thorough overlap check.</comment>
   </info>
 

@@ -53,14 +53,14 @@

   </materials>
 
   <display>

-    <vis name="EMVis" r="0.42" g="0.137" b="0.55" alpha="1.0" showDaughters="true" drawingStyle="wireframe" />
-    <vis name="HADVis" r="0.44" g="0.86" b="0.86" alpha="1.0" showDaughters="true" drawingStyle="wireframe" />
-    <vis name="MuonVis" r="0.666666666667" g="0.666666666667" b="1.0" alpha="1.0" showDaughters="true" drawingStyle="wireframe" />
-    <vis name="CoilVis" r="0.713725490196" g="0.686274509804" b="0.662745098039" alpha="1.0" showDaughters="true" drawingStyle="wireframe"/>
-    <vis name="VertexVis" r="1.0" g="1.0" b="0.0" alpha="1.0" showDaughters="true" drawingStyle="wireframe"/>
-    <vis name="TrackerVis" r="0.803921568627" g="0.678431372549" b="0.0" alpha="1.0" showDaughters="true" drawingStyle="wireframe"/>
-    <vis name="FwdDeadVis" r="0.709803921569" g="0.313725490196" b="0.611764705882" alpha="1.0" showDaughters="true" drawingStyle="wireframe"/>
-    <vis name="FwdVis" r="0.890196078431" g="0.658823529412" b="0.411764705882" alpha="1.0" showDaughters="true" drawingStyle="wireframe"/>

+    <vis name="EMVis" r="0.42" g="0.137" b="0.55" alpha="1.0" showDaughters="false" drawingStyle="solid" visible="true"/>
+    <vis name="HADVis" r="0.44" g="0.86" b="0.86" alpha="1.0" showDaughters="false" drawingStyle="solid" visible="true"/>
+    <vis name="MuonVis" r="0.666666666667" g="0.666666666667" b="1.0" alpha="1.0" showDaughters="false" drawingStyle="solid" visible="true"/>
+    <vis name="CoilVis" r="0.713725490196" g="0.686274509804" b="0.662745098039" alpha="1.0" showDaughters="false" drawingStyle="solid" visible="true"/>
+    <vis name="VertexVis" r="1.0" g="1.0" b="0.0" alpha="1.0" showDaughters="false" drawingStyle="solid" visible="true"/>
+    <vis name="TrackerVis" r="0.803921568627" g="0.678431372549" b="0.0" alpha="1.0" showDaughters="false" drawingStyle="solid" visible="true" />
+    <vis name="FwdDeadVis" r="0.709803921569" g="0.313725490196" b="0.611764705882" alpha="1.0" showDaughters="false" drawingStyle="solid" visible="true"/>
+    <vis name="FwdVis" r="0.890196078431" g="0.658823529412" b="0.411764705882" alpha="1.0" showDaughters="false" drawingStyle="solid" visible="true"/>

   </display>
 
   <detectors>

@@ -170,7 +170,7 @@

       </layer>
     </detector>
 

-    <detector id="16" name="VtxBarrel" type="SiTrackerBarrel" readout="VtxBarrelHits">

+    <detector id="16" name="VtxBarrel" type="SiTrackerBarrel" readout="VtxBarrelHits" vis="VertexVis">

       <module name="VtxBarrelModuleInner">
 	<module_envelope width="9.8" length="63.0 * 2" thickness="0.6"/>
 	<module_component width="7.6" length="125.0" thickness="0.26" material="CarbonFiber" sensitive="false">

@@ -222,7 +222,7 @@

       </layer>
     </detector>
 

-    <detector id="15" name="TrackerBarrel" type="SiTrackerBarrel" readout="TrackerBarrelHits">

+    <detector id="15" name="TrackerBarrel" type="SiTrackerBarrel" readout="TrackerBarrelHits" vis="TrackerVis">

       <module name="SiTrackerModule">
 	<module_envelope width="97.79" length="97.79" thickness="5.5"/>
 	<module_component width="97.79" length="97.79" thickness="0.228" material="CarbonFiber" sensitive="false">
LCDetectors/detectors/sid01_polyhedra
sid01_polyhedra.lcdd 1.8 -> 1.9
diff -u -r1.8 -r1.9
--- sid01_polyhedra.lcdd	17 Oct 2006 23:53:04 -0000	1.8
+++ sid01_polyhedra.lcdd	18 Oct 2006 21:36:52 -0000	1.9
@@ -2,7 +2,7 @@

 <lcdd xmlns:lcdd="http://www.lcsim.org/schemas/lcdd/1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcdd/1.0/lcdd.xsd">
   <header>
     <detector name="sid01_polyhedra" />

-    <generator name="GeomConverter" version="1.0" file="./detectors/sid01_polyhedra/compact.xml" checksum="3549585891" />

+    <generator name="GeomConverter" version="1.0" file="./detectors/sid01_polyhedra/compact.xml" checksum="2632032092" />

     <author name="NONE" />
     <comment>Preliminary version of Sid01 with polyhedra calorimeters. NOTE: Needs thorough overlap check.</comment>
   </header>

@@ -154,28 +154,28 @@

     <vis name="InvisibleNoDaughters" line_style="unbroken" drawing_style="wireframe" show_daughters="false" visible="false">
       <color R="1.0" G="1.0" B="1.0" alpha="1.0" />
     </vis>

-    <vis name="HADVis" line_style="unbroken" drawing_style="wireframe" show_daughters="true" visible="true">

+    <vis name="HADVis" line_style="unbroken" drawing_style="solid" show_daughters="false" visible="true">

       <color R="0.44" G="0.86" B="0.86" alpha="1.0" />
     </vis>

-    <vis name="FwdDeadVis" line_style="unbroken" drawing_style="wireframe" show_daughters="true" visible="true">

+    <vis name="FwdDeadVis" line_style="unbroken" drawing_style="solid" show_daughters="false" visible="true">

       <color R="0.709803921569" G="0.313725490196" B="0.611764705882" alpha="1.0" />
     </vis>

-    <vis name="VertexVis" line_style="unbroken" drawing_style="wireframe" show_daughters="true" visible="true">

+    <vis name="VertexVis" line_style="unbroken" drawing_style="solid" show_daughters="false" visible="true">

       <color R="1.0" G="1.0" B="0.0" alpha="1.0" />
     </vis>

-    <vis name="FwdVis" line_style="unbroken" drawing_style="wireframe" show_daughters="true" visible="true">

+    <vis name="FwdVis" line_style="unbroken" drawing_style="solid" show_daughters="false" visible="true">

       <color R="0.890196078431" G="0.658823529412" B="0.411764705882" alpha="1.0" />
     </vis>

-    <vis name="MuonVis" line_style="unbroken" drawing_style="wireframe" show_daughters="true" visible="true">

+    <vis name="MuonVis" line_style="unbroken" drawing_style="solid" show_daughters="false" visible="true">

       <color R="0.666666666667" G="0.666666666667" B="1.0" alpha="1.0" />
     </vis>

-    <vis name="EMVis" line_style="unbroken" drawing_style="wireframe" show_daughters="true" visible="true">

+    <vis name="EMVis" line_style="unbroken" drawing_style="solid" show_daughters="false" visible="true">

       <color R="0.42" G="0.137" B="0.55" alpha="1.0" />
     </vis>

-    <vis name="TrackerVis" line_style="unbroken" drawing_style="wireframe" show_daughters="true" visible="true">

+    <vis name="TrackerVis" line_style="unbroken" drawing_style="solid" show_daughters="false" visible="true">

       <color R="0.803921568627" G="0.678431372549" B="0.0" alpha="1.0" />
     </vis>

-    <vis name="CoilVis" line_style="unbroken" drawing_style="wireframe" show_daughters="true" visible="true">

+    <vis name="CoilVis" line_style="unbroken" drawing_style="solid" show_daughters="false" visible="true">

       <color R="0.713725490196" G="0.686274509804" B="0.662745098039" alpha="1.0" />
     </vis>
     <vis name="WorldVis" line_style="unbroken" drawing_style="wireframe" show_daughters="true" visible="false">

@@ -16659,9 +16659,9 @@

       <position name="HADEndcap_stave_layer33_slice3_position" x="0.0" y="-10.7" z="0.0" unit="mm" />
       <position name="HADEndcap_stave_layer33_slice4_position" x="0.0" y="-11.85" z="0.0" unit="mm" />
       <position name="HADEndcap_stave_layer33_slice5_position" x="0.0" y="-13.200000000000001" z="0.0" unit="mm" />

-      <position name="HADEndcap_stave0_module0_position" x="-217.08447407973927" y="810.170286799956" z="0.0" unit="mm" />

+      <position name="HADEndcap_stave0_module0_position" x="-217.08447407973927" y="810.1702867999561" z="0.0" unit="mm" />

       <rotation name="HADEndcap_stave0_module0_rotation" x="1.5707963267948966" y="0.2617993877991494" z="0.0" unit="radian" />

-      <position name="HADEndcap_stave0_module1_position" x="217.08447407973927" y="810.170286799956" z="0.0" unit="mm" />

+      <position name="HADEndcap_stave0_module1_position" x="217.08447407973927" y="810.1702867999561" z="0.0" unit="mm" />

       <rotation name="HADEndcap_stave0_module1_rotation" x="1.5707963267948966" y="-0.2617993877991494" z="0.0" unit="radian" />
       <position name="HADEndcap_stave0_module2_position" x="593.0858127202167" y="593.0858127202167" z="0.0" unit="mm" />
       <rotation name="HADEndcap_stave0_module2_rotation" x="1.5707963267948966" y="-0.7853981633974483" z="0.0" unit="radian" />

@@ -21143,6 +21143,7 @@

           <physvolid field_name="layer" value="0" />
           <physvolid field_name="slice" value="4" />
         </physvol>

+        <visref ref="EMVis" />

       </volume>
       <volume name="EMBarrel_layer1_slice0">
         <materialref ref="TungstenDens25" />

@@ -21208,6 +21209,7 @@

           <physvolid field_name="layer" value="1" />
           <physvolid field_name="slice" value="4" />
         </physvol>

+        <visref ref="EMVis" />

       </volume>
       <volume name="EMBarrel_layer2_slice0">
         <materialref ref="TungstenDens25" />

@@ -21273,6 +21275,7 @@

           <physvolid field_name="layer" value="2" />
           <physvolid field_name="slice" value="4" />
         </physvol>

+        <visref ref="EMVis" />

       </volume>
       <volume name="EMBarrel_layer3_slice0">
         <materialref ref="TungstenDens25" />

@@ -21338,6 +21341,7 @@

           <physvolid field_name="layer" value="3" />
           <physvolid field_name="slice" value="4" />
         </physvol>

+        <visref ref="EMVis" />

       </volume>
       <volume name="EMBarrel_layer4_slice0">
         <materialref ref="TungstenDens25" />

@@ -21403,6 +21407,7 @@

           <physvolid field_name="layer" value="4" />
           <physvolid field_name="slice" value="4" />
         </physvol>

+        <visref ref="EMVis" />

       </volume>
       <volume name="EMBarrel_layer5_slice0">
         <materialref ref="TungstenDens25" />

@@ -21468,6 +21473,7 @@

           <physvolid field_name="layer" value="5" />
           <physvolid field_name="slice" value="4" />
         </physvol>

+        <visref ref="EMVis" />

       </volume>
       <volume name="EMBarrel_layer6_slice0">
         <materialref ref="TungstenDens25" />

@@ -21533,6 +21539,7 @@

           <physvolid field_name="layer" value="6" />
           <physvolid field_name="slice" value="4" />
         </physvol>

+        <visref ref="EMVis" />

       </volume>
       <volume name="EMBarrel_layer7_slice0">
         <materialref ref="TungstenDens25" />

@@ -21598,6 +21605,7 @@

           <physvolid field_name="layer" value="7" />
           <physvolid field_name="slice" value="4" />
         </physvol>

+        <visref ref="EMVis" />

       </volume>
       <volume name="EMBarrel_layer8_slice0">
         <materialref ref="TungstenDens25" />

@@ -21663,6 +21671,7 @@

           <physvolid field_name="layer" value="8" />
           <physvolid field_name="slice" value="4" />
         </physvol>

+        <visref ref="EMVis" />

       </volume>
       <volume name="EMBarrel_layer9_slice0">
         <materialref ref="TungstenDens25" />

@@ -21728,6 +21737,7 @@

           <physvolid field_name="layer" value="9" />
           <physvolid field_name="slice" value="4" />
         </physvol>

+        <visref ref="EMVis" />

       </volume>
       <volume name="EMBarrel_layer10_slice0">
         <materialref ref="TungstenDens25" />

@@ -21793,6 +21803,7 @@

           <physvolid field_name="layer" value="10" />
           <physvolid field_name="slice" value="4" />
         </physvol>

+        <visref ref="EMVis" />

       </volume>
       <volume name="EMBarrel_layer11_slice0">
         <materialref ref="TungstenDens25" />

@@ -21858,6 +21869,7 @@

           <physvolid field_name="layer" value="11" />
           <physvolid field_name="slice" value="4" />
         </physvol>

+        <visref ref="EMVis" />

       </volume>
       <volume name="EMBarrel_layer12_slice0">
         <materialref ref="TungstenDens25" />

@@ -21923,6 +21935,7 @@

           <physvolid field_name="layer" value="12" />
           <physvolid field_name="slice" value="4" />
         </physvol>

+        <visref ref="EMVis" />

       </volume>
       <volume name="EMBarrel_layer13_slice0">
         <materialref ref="TungstenDens25" />

@@ -21988,6 +22001,7 @@

           <physvolid field_name="layer" value="13" />
           <physvolid field_name="slice" value="4" />
         </physvol>

+        <visref ref="EMVis" />

       </volume>
       <volume name="EMBarrel_layer14_slice0">
         <materialref ref="TungstenDens25" />

@@ -22053,6 +22067,7 @@

           <physvolid field_name="layer" value="14" />
           <physvolid field_name="slice" value="4" />
         </physvol>

+        <visref ref="EMVis" />

       </volume>
       <volume name="EMBarrel_layer15_slice0">
         <materialref ref="TungstenDens25" />

@@ -22118,6 +22133,7 @@

           <physvolid field_name="layer" value="15" />
           <physvolid field_name="slice" value="4" />
         </physvol>

+        <visref ref="EMVis" />

       </volume>
       <volume name="EMBarrel_layer16_slice0">
         <materialref ref="TungstenDens25" />

@@ -22183,6 +22199,7 @@

           <physvolid field_name="layer" value="16" />
           <physvolid field_name="slice" value="4" />
         </physvol>

+        <visref ref="EMVis" />

       </volume>
       <volume name="EMBarrel_layer17_slice0">
         <materialref ref="TungstenDens25" />

@@ -22248,6 +22265,7 @@

           <physvolid field_name="layer" value="17" />
           <physvolid field_name="slice" value="4" />
         </physvol>

+        <visref ref="EMVis" />

       </volume>
       <volume name="EMBarrel_layer18_slice0">
         <materialref ref="TungstenDens25" />

@@ -22313,6 +22331,7 @@

           <physvolid field_name="layer" value="18" />
           <physvolid field_name="slice" value="4" />
         </physvol>

+        <visref ref="EMVis" />

       </volume>
       <volume name="EMBarrel_layer19_slice0">
         <materialref ref="TungstenDens25" />

@@ -22378,6 +22397,7 @@

           <physvolid field_name="layer" value="19" />
           <physvolid field_name="slice" value="4" />
         </physvol>

+        <visref ref="EMVis" />

       </volume>
       <volume name="EMBarrel_layer20_slice0">
         <materialref ref="TungstenDens25" />

@@ -22443,6 +22463,7 @@

           <physvolid field_name="layer" value="20" />
           <physvolid field_name="slice" value="4" />
         </physvol>

+        <visref ref="EMVis" />

       </volume>
       <volume name="EMBarrel_layer21_slice0">
         <materialref ref="TungstenDens25" />

@@ -22508,6 +22529,7 @@

           <physvolid field_name="layer" value="21" />
           <physvolid field_name="slice" value="4" />
         </physvol>

+        <visref ref="EMVis" />

       </volume>
       <volume name="EMBarrel_layer22_slice0">
         <materialref ref="TungstenDens25" />

@@ -22573,6 +22595,7 @@

           <physvolid field_name="layer" value="22" />
           <physvolid field_name="slice" value="4" />
         </physvol>

+        <visref ref="EMVis" />

       </volume>
       <volume name="EMBarrel_layer23_slice0">
         <materialref ref="TungstenDens25" />

@@ -22638,6 +22661,7 @@

           <physvolid field_name="layer" value="23" />
           <physvolid field_name="slice" value="4" />
         </physvol>

+        <visref ref="EMVis" />

       </volume>
       <volume name="EMBarrel_layer24_slice0">
         <materialref ref="TungstenDens25" />

@@ -22703,6 +22727,7 @@

           <physvolid field_name="layer" value="24" />
           <physvolid field_name="slice" value="4" />
         </physvol>

+        <visref ref="EMVis" />

       </volume>
       <volume name="EMBarrel_layer25_slice0">
         <materialref ref="TungstenDens25" />

@@ -22768,6 +22793,7 @@

           <physvolid field_name="layer" value="25" />
           <physvolid field_name="slice" value="4" />
         </physvol>

+        <visref ref="EMVis" />

       </volume>
       <volume name="EMBarrel_layer26_slice0">
         <materialref ref="TungstenDens25" />

@@ -22833,6 +22859,7 @@

           <physvolid field_name="layer" value="26" />
           <physvolid field_name="slice" value="4" />
         </physvol>

+        <visref ref="EMVis" />

       </volume>
       <volume name="EMBarrel_layer27_slice0">
         <materialref ref="TungstenDens25" />

@@ -22898,6 +22925,7 @@

           <physvolid field_name="layer" value="27" />
           <physvolid field_name="slice" value="4" />
         </physvol>

+        <visref ref="EMVis" />

       </volume>
       <volume name="EMBarrel_layer28_slice0">
         <materialref ref="TungstenDens25" />

@@ -22963,6 +22991,7 @@

           <physvolid field_name="layer" value="28" />
           <physvolid field_name="slice" value="4" />
         </physvol>

+        <visref ref="EMVis" />

       </volume>
       <volume name="EMBarrel_layer29_slice0">
         <materialref ref="TungstenDens25" />

@@ -23028,6 +23057,7 @@

           <physvolid field_name="layer" value="29" />
           <physvolid field_name="slice" value="4" />
         </physvol>

+        <visref ref="EMVis" />

       </volume>
       <volume name="EMBarrel_module">
         <materialref ref="Air" />

@@ -23313,6 +23343,7 @@

           <physvolid field_name="system" value="2" />
           <physvolid field_name="barrel" value="0" />
         </physvol>

+        <visref ref="EMVis" />

       </volume>
       <volume name="BeamPipeVacuum_envelope_volume">
         <materialref ref="Vacuum" />

@@ -31308,15 +31339,18 @@

       <volume name="VtxBarrel_VtxBarrelModuleInner_component0">
         <materialref ref="CarbonFiber" />
         <solidref ref="VtxBarrel_VtxBarrelModuleInner_component0_box" />

+        <visref ref="VertexVis" />

       </volume>
       <volume name="VtxBarrel_VtxBarrelModuleInner_component1">
         <materialref ref="Epoxy" />
         <solidref ref="VtxBarrel_VtxBarrelModuleInner_component1_box" />

+        <visref ref="VertexVis" />

       </volume>
       <volume name="VtxBarrel_VtxBarrelModuleInner_component2">
         <materialref ref="Silicon" />
         <solidref ref="VtxBarrel_VtxBarrelModuleInner_component2_box" />
         <sdref ref="VtxBarrel" />

+        <visref ref="VertexVis" />

       </volume>
       <volume name="VtxBarrel_VtxBarrelModuleInner">
         <materialref ref="Air" />

@@ -31337,19 +31371,23 @@

           <rotationref ref="identity_rot" />
           <physvolid field_name="sensor" value="0" />
         </physvol>

+        <visref ref="VertexVis" />

       </volume>
       <volume name="VtxBarrel_VtxBarrelModuleOuter_component0">
         <materialref ref="CarbonFiber" />
         <solidref ref="VtxBarrel_VtxBarrelModuleOuter_component0_box" />

+        <visref ref="VertexVis" />

       </volume>
       <volume name="VtxBarrel_VtxBarrelModuleOuter_component1">
         <materialref ref="Epoxy" />
         <solidref ref="VtxBarrel_VtxBarrelModuleOuter_component1_box" />

+        <visref ref="VertexVis" />

       </volume>
       <volume name="VtxBarrel_VtxBarrelModuleOuter_component2">
         <materialref ref="Silicon" />
         <solidref ref="VtxBarrel_VtxBarrelModuleOuter_component2_box" />
         <sdref ref="VtxBarrel" />

+        <visref ref="VertexVis" />

       </volume>
       <volume name="VtxBarrel_VtxBarrelModuleOuter">
         <materialref ref="Air" />

@@ -31370,6 +31408,7 @@

           <rotationref ref="identity_rot" />
           <physvolid field_name="sensor" value="0" />
         </physvol>

+        <visref ref="VertexVis" />

       </volume>
       <volume name="VtxBarrel_layer0">
         <materialref ref="Air" />

@@ -40374,27 +40413,33 @@

       <volume name="TrackerBarrel_SiTrackerModule_component0">
         <materialref ref="CarbonFiber" />
         <solidref ref="TrackerBarrel_SiTrackerModule_component0_box" />

+        <visref ref="TrackerVis" />

       </volume>
       <volume name="TrackerBarrel_SiTrackerModule_component1">
         <materialref ref="Rohacell31" />
         <solidref ref="TrackerBarrel_SiTrackerModule_component1_box" />

+        <visref ref="TrackerVis" />

       </volume>
       <volume name="TrackerBarrel_SiTrackerModule_component2">
         <materialref ref="CarbonFiber" />
         <solidref ref="TrackerBarrel_SiTrackerModule_component2_box" />

+        <visref ref="TrackerVis" />

       </volume>
       <volume name="TrackerBarrel_SiTrackerModule_component3">
         <materialref ref="Silicon" />
         <solidref ref="TrackerBarrel_SiTrackerModule_component3_box" />
         <sdref ref="TrackerBarrel" />

+        <visref ref="TrackerVis" />

       </volume>
       <volume name="TrackerBarrel_SiTrackerModule_component4">
         <materialref ref="Silicon" />
         <solidref ref="TrackerBarrel_SiTrackerModule_component4_box" />

+        <visref ref="TrackerVis" />

       </volume>
       <volume name="TrackerBarrel_SiTrackerModule_component5">
         <materialref ref="Kapton" />
         <solidref ref="TrackerBarrel_SiTrackerModule_component5_box" />

+        <visref ref="TrackerVis" />

       </volume>
       <volume name="TrackerBarrel_SiTrackerModule">
         <materialref ref="Air" />

@@ -40430,6 +40475,7 @@

           <positionref ref="TrackerBarrel_SiTrackerModule_component5_position" />
           <rotationref ref="identity_rot" />
         </physvol>

+        <visref ref="TrackerVis" />

       </volume>
       <volume name="TrackerBarrel_layer0">
         <materialref ref="Air" />
CVSspam 0.2.8