Print

Print


Commit in hps-detectors/detectors/HPS-Test-JLAB-v3pt0 on MAIN
compact.xml+16-201.3 -> 1.4
HPS-Test-JLAB-v3pt0.lcdd+29-181.4 -> 1.5
+45-38
2 modified files
add visualization of ecal from latest GeomConv

hps-detectors/detectors/HPS-Test-JLAB-v3pt0
compact.xml 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- compact.xml	2 Sep 2011 00:17:19 -0000	1.3
+++ compact.xml	8 Sep 2011 07:21:41 -0000	1.4
@@ -38,6 +38,7 @@
         <constant name="modLength" value="10.0*cm"/>
         <constant name="modWidth" value="4.0*cm"/>
 
+        <!-- Params for the ecal crystal volume. -->
         <constant name="ecal_front" value="13.3/2*mm" />
         <constant name="ecal_back" value="16/2*mm" />
         <constant name="ecal_z" value="160/2*mm" />
@@ -54,7 +55,10 @@
         </material>
 
     </materials>
-    
+   
+    <display>
+        <vis name="EcalVis" r="0.8" g="0.5" b="0.1" />
+    </display> 
     
     <detectors>
 
@@ -62,7 +66,8 @@
                   name="Ecal"
                   type="HPSEcal3"
                   insideTrackingVolume="false"
-                  readout="EcalHits">
+                  readout="EcalHits"
+                  vis="EcalVis">
             <material name="LeadTungstate" />
             <dimensions x1="ecal_front" y1="ecal_front" x2="ecal_back" y2="ecal_back" z="ecal_z" />
             <layout beamgap="20.0*mm" nx="46" ny="5" dface="137.0*cm">
@@ -73,64 +78,55 @@
         <detector id="10" name="Target" type="SiTrackerSpectrometer"  readout="TargetHits" combineHits="true">
             <module name="TungstenTarget">
                 <trd x1="5*cm" x2="5*cm" z="5*cm" />
-                <module_component   thickness="0.3504*cm*0.00125" material = "Tungsten" sensitive="false"/>
+                <module_component thickness="0.3504*cm*0.00125" material="Tungsten" sensitive="false"/>
             </module> 
             <layer id="1">
                 <quadrant xStart="0" nx="1" xStep="modLength" yStart="0" ny="1" yStep="modWidth" phi0="0.0" z="0.0" dz="0.0*cm"  module="TungstenTarget"/>
             </layer>
-
         </detector>
 
         <detector id="1" name="Tracker" type="SiTrackerSpectrometer" readout="TrackerHits" combineHits="true" reflect="true"  flipSA="true">
             <module name="Module1">
                 <trd x1="modWidth/2" x2="modWidth/2" z="modLength/2" />
-                <module_component   thickness="0.032*cm" material = "Silicon" sensitive="true"/><!-- X0=0.32% -->
-                <module_component   thickness="0.02*cm" material = "Carbon" sensitive="false"/> <!-- X0=0.1% -->
+                <module_component thickness="0.032*cm" material = "Silicon" sensitive="true"/><!-- X0=0.32% -->
+                <module_component thickness="0.02*cm" material = "Carbon" sensitive="false"/> <!-- X0=0.1% -->
             </module> 
-            
             <layer id="1">
                 <quadrant xStart="0" nx="1" xStep="modLength" yStart="(ygap1+modWidth)/2" ny="1" yStep="modWidth" phi0="0.0" z="zCent1" dz="0.0*cm"  module="Module1"/>
             </layer>
             <layer id="2">
                 <quadrant xStart="0" nx="1" xStep="modLength" yStart="(ygap1+modWidth)/2" ny="1" yStep="modWidth" phi0="SA" z="zCent1+zPlaneDist" dz="0.0*cm"  module="Module1"/>
             </layer>
-
             <layer id="3">
                 <quadrant xStart="0" nx="1" xStep="modLength" yStart="(ygap2+modWidth)/2" ny="1" yStep="modWidth" phi0="0.0" z="zCent2" dz="0.0*cm"  module="Module1"/>
             </layer>
             <layer id="4">
-                <quadrant xStart="0" nx="1" xStep="modLength" yStart="(ygap2+modWidth)/2" ny="1" yStep="modWidth" phi0="SA" z="zCent2+zPlaneDist" dz="0.0*cm"  module="Module1"/>
+                <quadrant xStart="0" nx="1" xStep="modLength" yStart="(ygap2+modWidth)/2" ny="1" yStep="modWidth" phi0="SA" z="zCent2+zPlaneDist" dz="0.0*cm" module="Module1"/>
             </layer>
-            
             <layer id="5">
-                <quadrant xStart="0" nx="1" xStep="modLength" yStart="(ygap3+modWidth)/2" ny="1" yStep="modWidth" phi0="0.0" z="zCent3" dz="0.0*cm"  module="Module1"/>
+                <quadrant xStart="0" nx="1" xStep="modLength" yStart="(ygap3+modWidth)/2" ny="1" yStep="modWidth" phi0="0.0" z="zCent3" dz="0.0*cm" module="Module1"/>
             </layer>
             <layer id="6">
-                <quadrant xStart="0" nx="1" xStep="modLength" yStart="(ygap3+modWidth)/2" ny="1" yStep="modWidth" phi0="SA" z="zCent3+zPlaneDist" dz="0.0*cm"  module="Module1"/>
+                <quadrant xStart="0" nx="1" xStep="modLength" yStart="(ygap3+modWidth)/2" ny="1" yStep="modWidth" phi0="SA" z="zCent3+zPlaneDist" dz="0.0*cm" module="Module1"/>
             </layer>
-
             <layer id="7">
-                <quadrant xStart="0" nx="1" xStep="modLength" yStart="(ygap4+modWidth)/2" ny="1" yStep="modWidth" phi0="0.0" z="zCent4" dz="0.0*cm"  module="Module1"/>
+                <quadrant xStart="0" nx="1" xStep="modLength" yStart="(ygap4+modWidth)/2" ny="1" yStep="modWidth" phi0="0.0" z="zCent4" dz="0.0*cm" module="Module1"/>
             </layer>
             <layer id="8">
-                <quadrant xStart="0" nx="1" xStep="modLength" yStart="(ygap4+modWidth)/2" ny="1" yStep="modWidth" phi0="SA2" z="zCent4+zPlaneDist" dz="0.0*cm"  module="Module1"/>
+                <quadrant xStart="0" nx="1" xStep="modLength" yStart="(ygap4+modWidth)/2" ny="1" yStep="modWidth" phi0="SA2" z="zCent4+zPlaneDist" dz="0.0*cm" module="Module1"/>
             </layer>
-
             <layer id="9">
                 <quadrant xStart="0" nx="1" xStep="modLength" yStart="(ygap5+modWidth)/2" ny="1" yStep="modWidth" phi0="0.0" z="zCent5" dz="0.0*cm"  module="Module1"/>
             </layer>
             <layer id="10">
-                <quadrant xStart="0" nx="1" xStep="modLength" yStart="(ygap5+modWidth)/2" ny="1" yStep="modWidth" phi0="SA2" z="zCent5+zPlaneDist" dz="0.0*cm"  module="Module1"/>
+                <quadrant xStart="0" nx="1" xStep="modLength" yStart="(ygap5+modWidth)/2" ny="1" yStep="modWidth" phi0="SA2" z="zCent5+zPlaneDist" dz="0.0*cm" module="Module1"/>
             </layer>
-
         </detector>     
-        
     </detectors>
     
     <readouts>
         <readout name="EcalHits">
             <segmentation type="GridXYZ" gridSizeX="0.0" gridSizeY="0.0" gridSizeZ="0.0" />
-            <!-- FIXME: Layer is a dummy number as this detector doesn't have layers. -->
             <id>system:6,layer:2,ix:-8,iy:-6</id>
         </readout>      
         <readout name="TargetHits">

hps-detectors/detectors/HPS-Test-JLAB-v3pt0
HPS-Test-JLAB-v3pt0.lcdd 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- HPS-Test-JLAB-v3pt0.lcdd	2 Sep 2011 01:02:01 -0000	1.4
+++ HPS-Test-JLAB-v3pt0.lcdd	8 Sep 2011 07:21:41 -0000	1.5
@@ -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="HPS-Test-JLAB-v3pt0" />
-    <generator name="GeomConverter" version="1.0" file="./compact.xml" checksum="2711998649" />
+    <generator name="GeomConverter" version="1.0" file="./compact.xml" checksum="1040072821" />
     <author name="NONE" />
     <comment>HPS Test Proposal detector</comment>
   </header>
@@ -51,6 +51,15 @@
     <region name="TrackingRegion" store_secondaries="true" cut="10.0" lunit="mm" threshold="1.0" eunit="MeV" />
   </regions>
   <display>
+    <vis name="EcalVis" line_style="unbroken" drawing_style="wireframe" show_daughters="true" visible="true">
+      <color R="0.8" G="0.5" B="0.1" alpha="1.0" />
+    </vis>
+    <vis name="InvisibleNoDaughters" line_style="unbroken" drawing_style="wireframe" show_daughters="false" visible="false">
+      <color R="0.0" G="0.0" B="0.0" alpha="0.0" />
+    </vis>
+    <vis name="InvisibleWithDaughters" line_style="unbroken" drawing_style="wireframe" show_daughters="true" visible="false">
+      <color R="0.0" G="0.0" B="0.0" alpha="0.0" />
+    </vis>
     <vis name="WorldVis" line_style="unbroken" drawing_style="wireframe" show_daughters="true" visible="false">
       <color R="1.0" G="1.0" B="1.0" alpha="1.0" />
     </vis>
@@ -1916,18 +1925,6 @@
         <D type="density" unit="g/cm3" value="2" />
         <composite n="1" ref="C" />
       </material>
-      <element name="N" formula="N" Z="7">
-        <atom type="A" unit="g/mol" value="14.0068" />
-      </element>
-      <element name="Ar" formula="Ar" Z="18">
-        <atom type="A" unit="g/mol" value="39.9477" />
-      </element>
-      <material name="Air">
-        <D type="density" unit="g/cm3" value="0.0012" />
-        <fraction n="0.754" ref="N" />
-        <fraction n="0.234" ref="O" />
-        <fraction n="0.012" ref="Ar" />
-      </material>
       <element Z="7" formula="N" name="N0xa65b138">
         <atom value="14.0067" />
       </element>
@@ -1937,10 +1934,28 @@
       <element Z="18" formula="Ar" name="Ar0xa56fb18">
         <atom value="39.948" />
       </element>
+      <material formula=" " name="Air2">
+        <D value="0.0012" />
+        <fraction n="0.754" ref="N0xa65b138" />
+        <fraction n="0.234" ref="O0xa65b060" />
+        <fraction n="0.012" ref="Ar0xa56fb18" />
+      </material>
       <material Z="13" formula=" " name="Aluminum">
         <D value="2.7" />
         <atom value="26.9815" />
       </material>
+      <element name="N" formula="N" Z="7">
+        <atom type="A" unit="g/mol" value="14.0068" />
+      </element>
+      <element name="Ar" formula="Ar" Z="18">
+        <atom type="A" unit="g/mol" value="39.9477" />
+      </element>
+      <material name="Air">
+        <D type="density" unit="g/cm3" value="0.0012" />
+        <fraction n="0.754" ref="N" />
+        <fraction n="0.234" ref="O" />
+        <fraction n="0.012" ref="Ar" />
+      </material>
     </materials>
     <solids>
       <box name="world_box" x="world_x" y="world_y" z="world_z" />
@@ -1951,7 +1966,6 @@
       <trd name="Module1Volume_component0_trd" x1="40.0" x2="40.0" y1="0.32" y2="0.32" z="100.0" />
       <trd name="Module1Volume_component1_trd" x1="40.0" x2="40.0" y1="0.2" y2="0.2" z="100.0" />
       <trd name="crystal_trap" x1="13.3" x2="16.0" y1="13.3" y2="16.0" z="160.0" />
-      <box name="ecal_env_box" x="809.6" y="216.0" z="176.0" />
       <box lunit="mm" name="WorldBox" x="1570.55" y="1250.62" z="884.4" />
       <tessellated name="split_0" lunit="mm">
         <triangular vertex1="v4" vertex2="v1" vertex3="v10" />
@@ -3693,10 +3707,7 @@
         <materialref ref="LeadTungstate" />
         <solidref ref="crystal_trap" />
         <sdref ref="Ecal" />
-      </volume>
-      <volume name="ecal_env_volume">
-        <materialref ref="Air" />
-        <solidref ref="ecal_env_box" />
+        <visref ref="EcalVis" />
       </volume>
       <volume name="split_0_vol">
         <materialref ref="Aluminum" />
CVSspam 0.2.8