Draft: Resolve "Astropix Sampling Fraction Test"

Closes #56 (closed)

compact/ecal_barrel_hybrid_old.xml

@@ -20,7 +20,7 @@
     <constant name="EcalBarrel_EpoxyThickness"       value="100*um"/>
     <constant name="EcalBarrel_CarbonThickness"      value="0.5*mm"/>
     <constant name="EcalBarrel_CarbonSpacerWidth"    value="4*mm"/>
-    <constant name="EcalBarrel_LayerSpacing"         value="6.0*mm"/>
+    <constant name="EcalBarrel_LayerSpacing"         value="10.0*mm"/>
     <constant name="EcalBarrel_FiberRadius"          value="0.5*mm"/>
     <constant name="EcalBarrel_FiberXSpacing"        value="1.34*mm"/>
     <constant name="EcalBarrel_FiberZSpacing"        value="1.22*mm"/>
@@ -28,7 +28,7 @@
       For Pb/SiFi (GlueX):  X0 ~ 1.45 cm
       For W/SiFi (sPHENIX): X0 ~ 0.7 cm (but different fiber orientation)
     </comment>
-    <constant name="EcalBarrel_RadiatorThickness"    value="EcalBarrel_FiberZSpacing*12"/>
+    <constant name="EcalBarrel_RadiatorThickness"    value="EcalBarrel_FiberZSpacing*15"/>
     <constant name="EcalBarrel_ModRepeat"            value="CaloSides"/> 
     <constant name="EcalBarrel_ModLength"            value="0.5*m"/>
     <constant name="EcalBarrel_ModWidth"             value="0.5*m"/>
@@ -50,6 +50,9 @@
   </define>
 
   <limits>
+    <limitset name="cal_img_limits">
+      <limit name="step_length_max" particles="*" value="0.1" unit="mm"/>
+    </limitset>
   </limits>
 
   <regions>
@@ -69,8 +72,8 @@
     <detector
       id="ECalBarrel_ID"
       name="EcalBarrel"
-      type="athena_EcalBarrelHybrid"
-      readout="EcalBarrelHits"
+      type="athena_EcalBarrelHybrid_old"
+      readout="EcalBarrelHitsHybrid"
       calorimeterType="EM_BARREL"
       vis="EcalBarrelEnvelope_vis"
       offset="EcalBarrel_offset">
@@ -89,19 +92,20 @@
         ---------------------------
       </comment>
       <layer repeat="EcalBarrelImagingLayers-1" vis="AnlBlue">  
-        <slice material="Silicon" thickness="EcalBarrel_SiliconThickness" sensitive="yes" limits="cal_limits" vis="AnlGray"/>
+        <slice material="Silicon" thickness="EcalBarrel_SiliconThickness" sensitive="yes" limits="cal_img_limits" vis="AnlGray"/>
         <slice material="Silicon" thickness="EcalBarrel_ElectronicsThickness" vis="AnlGold"/>
         <slice material="Copper" thickness="EcalBarrel_CopperThickness" vis="AnlGray"/>
         <slice material="Kapton" thickness="EcalBarrel_KaptonThickness" vis="AnlGold"/>
         <slice material="Epoxy" thickness="EcalBarrel_EpoxyThickness" vis="AnlGray"/>
         <slice material="CarbonFiber" thickness="EcalBarrel_CarbonThickness" vis="AnlGold"/>
-        <slice material="Lead" thickness="EcalBarrel_RadiatorThickness" vis="EcalBarrelFibersVis">
+        <slice material="Lead" thickness="EcalBarrel_RadiatorThickness" vis="EcalBarrelFiberLayerVis">
           <fiber material="PlasticScint" 
             sensitive="yes"
             vis="EcalBarrelFiberVis"
             radius="EcalBarrel_FiberRadius" 
             spacing_x="EcalBarrel_FiberXSpacing" 
-            spacing_z="EcalBarrel_FiberZSpacing"/>
+            spacing_z="EcalBarrel_FiberZSpacing">
+          </fiber>
         </slice>
         <slice material="CarbonFiber" thickness="EcalBarrel_CarbonThickness" vis="AnlGold"/> 
         <slice material="Air" thickness="EcalBarrel_LayerSpacing" vis="AnlGold"/>
@@ -112,7 +116,7 @@
         ---------------------------
       </comment>
       <layer repeat="1" vis="AnlBlue">
-        <slice material="Silicon" thickness="EcalBarrel_SiliconThickness" sensitive="yes" limits="cal_limits" vis="AnlGray"/>
+        <slice material="Silicon" thickness="EcalBarrel_SiliconThickness" sensitive="yes" limits="cal_img_limits" vis="AnlGray"/>
         <slice material="Silicon" thickness="EcalBarrel_ElectronicsThickness" vis="AnlGold"/>
         <slice material="Copper" thickness="EcalBarrel_CopperThickness" vis="AnlGray"/>
         <slice material="Kapton" thickness="EcalBarrel_KaptonThickness" vis="AnlGold"/>
@@ -134,7 +138,7 @@
   </detectors>
 
   <readouts>
-    <readout name="EcalBarrelHits">
+    <readout name="EcalBarrelHitsHybrid">
       <segmentation type="MultiSegmentation" key="fiber">
         <segmentation name="LongiSeg" key_value="0x0" type="CartesianGridXY" grid_size_x="0.5*mm" grid_size_y="0.5*mm"/>
         <segmentation name="RadialSeg" key_min="0x1" key_max="0xffffffff" type="NoSegmentation"/>