Resolve "Create new layout images for slides"

Closes #48 (closed)

ip6/B0_preshower.xml

@@ -17,9 +17,9 @@
     <comment>
       This angle is the angle subtended in phi for each trap segment.
     </comment>
-    <constant name="B0PreshowerModOpeningAngle"         value="30.0*degree"/>
-    <constant name="B0PreshowerLayer_nModules"          value="12"/>
-    <constant name="B0PreshowerLayerSmallMod_nModules"  value="2"/>
+    <constant name="B0PreshowerLayer_nModules"          value="36"/>
+    <constant name="B0PreshowerLayerSmallMod_nModules"  value="B0PreshowerLayer_nModules/6"/>
+    <constant name="B0PreshowerModOpeningAngle"         value="360.0*degree/B0PreshowerLayer_nModules"/>
     <constant name="B0PreshowerLayerBigMod_nModules"    value="B0PreshowerLayer_nModules - B0PreshowerLayerSmallMod_nModules"/>
     <constant name="B0PreshowerLayerBigMod_phi0"        value="(B0PreshowerLayerSmallMod_nModules/2.0 + 0.5)*B0PreshowerModOpeningAngle + Pi"/>
     <constant name="B0PreshowerLayerSmallMod_phi0"        value="(B0PreshowerLayerSmallMod_nModules/2.0 - 0.5)*B0PreshowerModOpeningAngle + Pi"/>
@@ -43,64 +43,32 @@
       name="B0Preshower"
       type="ip6_B0Preshower"
       readout="B0PreshowerHits"
-      vis="AnlRed"
+      vis="FFPreVis"
       reflect="false">
       <position x="B0PreshowerCenter_xpos" y="0" z="B0PreshowerCenter_zpos"/>
       <rotation x="0*rad" y="B0Preshower_rotation" z="0*rad"/>
-      <module name="Module1" vis="AnlProcess_Blue">
+      <module name="Module1" vis="FFPreModuleVis">
+        <comment>The module is constructed back-to-front</comment>
         <trd x1="B0PreshowerMod1_x1/2.0" x2="B0PreshowerMod1_x2/2.0" z="B0PreshowerMod1_y/2"/>
-        <module_component material="PbWO4"        thickness="1.0*cm" vis="AnlYellow"/>
-        <module_component material="SiliconOxide" thickness="0.3*mm" sensitive="true"/>
+        <module_component material="SiliconOxide" thickness="0.3*mm" vis="FFPreReadoutVis" sensitive="true"/>
+        <module_component material="Lead"         thickness="1.0*cm" vis="FFPreRadiatorVis"/>
       </module>
-      <module name="SmallModule1" vis="AnlProcess_Blue">
+      <module name="SmallModule1" vis="FFPreModuleVis">
         <trd x1="B0PreshowerMod1_x1/2.0" x2="B0PreshowerMod1Small_x2/2.0" z="B0PreshowerMod1Small_y/2"/>
-        <module_component material="PbWO4"        thickness="1.0*cm" vis="AnlYellow"/>
-        <module_component material="SiliconOxide" thickness="0.3*mm" sensitive="true"/>
+        <module_component material="SiliconOxide" thickness="0.3*mm" vis="FFPreReadoutVis" sensitive="true"/>
+        <module_component material="Lead"         thickness="1.0*cm" vis="FFPreRadiatorVis"/>
       </module>
       <layer id="1">
-        <envelope  vis="AnlRed" rmin="B0PreshowerMod1Inner_r" rmax="B0PreshowerMod1Outer_r" length="1.0*cm" 
+        <envelope  vis="FFPreLayerVis" rmin="B0PreshowerMod1Inner_r" rmax="B0PreshowerMod1Outer_r" length="1.0*cm" 
           zstart="-B0Preshower_length/2.0" />
-        <ring vis="AnlRed" phi0="B0PreshowerLayerBigMod_phi0" dphi="B0PreshowerModOpeningAngle" 
+        <ring phi0="B0PreshowerLayerBigMod_phi0" dphi="B0PreshowerModOpeningAngle" 
           r="B0PreshowerMod1Inner_r+B0PreshowerMod1_y/2.0" zstart="0.0*mm" 
-          nmodules="10" dz="0 * mm" module="Module1" />
-        <ring vis="AnlRed" phi0="-B0PreshowerLayerSmallMod_phi0" dphi="B0PreshowerModOpeningAngle"
+          nmodules="B0PreshowerLayerBigMod_nModules" dz="0 * mm" module="Module1" />
+        <ring phi0="-B0PreshowerLayerSmallMod_phi0" dphi="B0PreshowerModOpeningAngle"
           r="B0PreshowerMod1Inner_r+B0PreshowerMod1Small_y/2.0" zstart="0.0*mm" 
           nmodules="B0PreshowerLayerSmallMod_nModules" dz="0 * mm" module="SmallModule1" />
       </layer>
     </detector>
-  <!--
-    <detector 
-      id="B0Preshower_Station_1_ID"
-      name="B0Preshower_Station_1"
-      readout="B0PreshowerHits" 
-      type="ip6_B0Preshower"
-      insideTrackingVolume="true"
-      reflect="false"
-      vis="AnlRed">
-      <position x="B0Preshower_Station_1_xpos" y="0" z="B0Preshower_Station_1_zpos"/>
-      <rotation x="0*rad" y="B0Tracker_rotation" z="0*rad"/>
-      <layer id="1" vis="AnlBlue"
-        inner_z="1.0*cm"
-        inner_r="3.5*cm" 
-        outer_r="15.0*cm"
-        phi1="0.2*Pi*rad"
-        phi2="-0.2*Pi*rad">
-      <slice material="PbWO4"        thickness="1.0*cm" vis="AnlYellow"/>
-      <slice material="SiliconOxide" thickness="0.3*mm" vis="AnlYellow" sensitive="true" />
-      </layer>
-		
-      <layer id="2"
-        vis="AnlBlue"
-        inner_z="1.0*cm"
-        inner_r="3.5*cm"
-        outer_r="12.0*cm"
-        phi1="-0.2*Pi*rad"
-        phi2="0.2*Pi*rad">
-      <slice material="PbWO4"        thickness="1.0*cm" vis="AnlYellow"/>
-      <slice material="SiliconOxide" thickness="0.3*mm" vis="AnlYellow" sensitive="true" />
-      </layer>      
-    </detector>
-    -->
   </detectors>
 
   <readouts>