From 8341c07a87c5605204016b1e3a3abc6b172bd1be Mon Sep 17 00:00:00 2001
From: Maria Zurek <zurek@anl.gov>
Date: Thu, 22 Jul 2021 03:29:11 +0000
Subject: [PATCH] Resolve "Optimize chunks of the ScFi layers to speed up the
 simulation"

---
 compact/ecal_barrel_interlayers.xml | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/compact/ecal_barrel_interlayers.xml b/compact/ecal_barrel_interlayers.xml
index 110c18e9..a0d3b727 100644
--- a/compact/ecal_barrel_interlayers.xml
+++ b/compact/ecal_barrel_interlayers.xml
@@ -22,13 +22,13 @@
     <constant name="EcalBarrel_FiberRadius"          value="0.5*mm"/>
     <constant name="EcalBarrel_FiberXSpacing"        value="1.34*mm"/>
     <constant name="EcalBarrel_FiberZSpacing"        value="1.22*mm"/>
-    <constant name="EcalBarrel_SpaceBetween"         value="1*mm"/>
-    <constant name="EcalBarrel_FiberChunkLayers_num" value = "10"/>
+    <constant name="EcalBarrel_SpaceBetween"         value="0.1*mm"/>
+    <constant name="EcalBarrel_FiberChunkLayers_num" value = "15"/>
     <comment>
       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*13"/>
     <constant name="EcalBarrel_ModRepeat"            value="CaloSides"/>
     <constant name="EcalBarrel_ModLength"            value="0.5*m"/>
     <constant name="EcalBarrel_ModWidth"             value="0.5*m"/>
@@ -39,6 +39,9 @@
       + EcalBarrel_CopperThickness
       + EcalBarrel_KaptonThickness
       + EcalBarrel_EpoxyThickness
+      + EcalBarrel_CarbonThickness"/>
+    <constant name="EcalBarrel_ScFiLayerThickness"
+      value="EcalBarrel_RadiatorThickness
       + EcalBarrel_CarbonThickness
       + EcalBarrel_LayerSpacing"/>
 
@@ -51,7 +54,7 @@
         value="max(0, EcalBarrel_AvailThickness-
                (EcalBarrelImagingLayers_num*EcalBarrel_ImagingLayerThickness))"/>
     <constant name="EcalBarrel_FiberLayerThickness"
-        value="min(EcalBarrel_FiberLayerThickness_max, EcalBarrel_FiberZSpacing*12*15)"/>
+        value="min(EcalBarrel_FiberLayerThickness_max, EcalBarrel_FiberZSpacing*13*15)"/>
   </define>
 
   <limits>
@@ -84,7 +87,7 @@
         z="EcalBarrel_length"/>
       <staves vis="EcalBarrelStave_vis"/>
       <layer repeat="EcalBarrelImagingLayers_num" vis="AnlBlue"
-        space_between="EcalBarrel_RadiatorThickness + EcalBarrel_SpaceBetween"
+        space_between="EcalBarrel_ScFiLayerThickness + EcalBarrel_SpaceBetween"
         space_before="0.*cm">
         <slice material="Silicon" thickness="EcalBarrel_SiliconThickness" sensitive="yes" limits="cal_limits" vis="AnlGray"/>
         <slice material="Silicon" thickness="EcalBarrel_ElectronicsThickness" vis="AnlGold"/>
@@ -92,7 +95,6 @@
         <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="Air" thickness="EcalBarrel_LayerSpacing " vis="AnlGold"/>
       </layer>
     </detector>
 
@@ -129,6 +131,8 @@
             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>
       <layer repeat="EcalBarrel_FiberChunkLayers_num" vis="AnlBlue"
           space_before="EcalBarrel_ImagingLayerThickness + EcalBarrel_SpaceBetween">
-- 
GitLab