Resolve "Realistic SiFi geometry"

.gitlab-ci.yml

@@ -195,7 +195,7 @@ benchmarks:detector:
   trigger:
     project: EIC/benchmarks/detector_benchmarks
     strategy: depend
-  needs: ["overlap_check_tgeo","overlap_check_geant4","report"]
+  needs: ["overlap_check_tgeo","report"]
 
     #benchmarks:reconstruction:
     #  stage: deploy

compact/ecal_barrel_hybrid.xml

@@ -22,13 +22,13 @@
     <constant name="EcalBarrel_CarbonSpacerWidth"    value="4*mm"/>
     <constant name="EcalBarrel_LayerSpacing"         value="6.0*mm"/>
     <constant name="EcalBarrel_FiberRadius"          value="0.5*mm"/>
-    <constant name="EcalBarrel_FiberXSpacing"        value="5.0*mm"/>
-    <constant name="EcalBarrel_FiberZSpacing"        value="5.0*mm"/>
+    <constant name="EcalBarrel_FiberXSpacing"        value="1.34*mm"/>
+    <constant name="EcalBarrel_FiberZSpacing"        value="1.22*mm"/>
     <comment> 
       For Pb/SiFi (GlueX):  X0 ~ 1.45 cm
-      For W/SiFi (sPHENIX): X0 ~ 0.7 cm (but different fibers orientation)
+      For W/SiFi (sPHENIX): X0 ~ 0.7 cm (but different fiber orientation)
     </comment>
-    <constant name="EcalBarrel_RadiatorThickness"    value="1.5*cm"/>
+    <constant name="EcalBarrel_RadiatorThickness"    value="EcalBarrel_FiberZSpacing*12"/>
     <constant name="EcalBarrel_ModRepeat"            value="CaloSides"/> 
     <constant name="EcalBarrel_ModLength"            value="0.5*m"/>
     <constant name="EcalBarrel_ModWidth"             value="0.5*m"/>
@@ -45,8 +45,8 @@
 
     <constant name="EcalBarrelImagingLayers_max"  value="6"/>
     <constant name="EcalBarrelImagingLayers"  value="min(EcalBarrelImagingLayers_max, floor(EcalBarrel_AvailThickness/EcalBarrel_ImagingLayerThickness))"/>
-    <constant name="EcalBarrel_FiberLayerThickness_max" value="max(0, EcalBarrel_AvailThickness-(EcalBarrelImagingLayers*EcalBarrel_ImagingLayerThickness))"/>
-    <constant name="EcalBarrel_FiberLayerThickness" value="EcalBarrel_FiberZSpacing*12*14"/>
+    <constant name="EcalBarrel_FiberLayerThickness_max" value="max(0, EcalBarrel_AvailThickness-(EcalBarrelImagingLayers*EcalBarrel_ImagingLayerThickness-EcalBarrel_RadiatorThickness))"/>
+    <constant name="EcalBarrel_FiberLayerThickness" value="EcalBarrel_FiberZSpacing*12*15"/>
   </define>
 
   <limits>
@@ -88,7 +88,7 @@
         Imaging layers with silicon
         ---------------------------
       </comment>
-      <layer repeat="EcalBarrelImagingLayers" vis="AnlBlue">  
+      <layer repeat="EcalBarrelImagingLayers-1" vis="AnlBlue">  
         <slice material="Silicon" thickness="EcalBarrel_SiliconThickness" sensitive="yes" limits="cal_limits" vis="AnlGray"/>
         <slice material="Silicon" thickness="EcalBarrel_ElectronicsThickness" vis="AnlGold"/>
         <slice material="Copper" thickness="EcalBarrel_CopperThickness" vis="AnlGray"/>
@@ -103,23 +103,30 @@
             spacing_x="EcalBarrel_FiberXSpacing" 
             spacing_z="EcalBarrel_FiberZSpacing"/>
         </slice>
+        <slice material="CarbonFiber" thickness="EcalBarrel_CarbonThickness" vis="AnlGold"/> 
         <slice material="Air" thickness="EcalBarrel_LayerSpacing" vis="AnlGold"/>
       </layer>
       <comment>
         ---------------------------
-        Pure Scint Fiber layer
+        Last imiging layer with thick scint fiber layer
         ---------------------------
       </comment>
       <layer repeat="1" vis="AnlBlue">
+        <slice material="Silicon" thickness="EcalBarrel_SiliconThickness" sensitive="yes" limits="cal_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="min(EcalBarrel_FiberLayerThickness_max, EcalBarrel_FiberLayerThickness)" 
           vis="EcalBarrelFiberLayerVis">
-          <!-- <fiber material="PlasticScint" 
+          <fiber material="PlasticScint" 
             sensitive="yes"
             vis="EcalBarrelFiberVis"
             radius="EcalBarrel_FiberRadius" 
             spacing_x="EcalBarrel_FiberXSpacing" 
             spacing_z="EcalBarrel_FiberZSpacing">
-          </fiber> -->
+          </fiber>
         </slice>
       </layer>
      
@@ -136,7 +143,7 @@
           <hits_collection name="EcalBarrelHits" key="fiber" key_value="0x0"/>
           <hits_collection name="EcalBarrelScFiHits" key="fiber" key_min="0x1" key_max="0xffffffff"/>
       </hits_collections>
-      <id>system:8,module:6,layer:6,slice:4,grid:6,fiber:8,x:38:-12,y:-14</id>
+      <id>system:8,module:5,layer:4,slice:4,grid:9,fiber:9,x:39:-11,y:-14</id>
     </readout>
   </readouts>