Resolve "Change number of imaging layers in Barrel ECAL"

compact/ecal_barrel_interlayers.xml

@@ -21,7 +21,7 @@
     <constant name="EcalBarrel_FiberXSpacing"        value="1.34*mm"/>
     <constant name="EcalBarrel_FiberZSpacing"        value="1.22*mm"/>
     <constant name="EcalBarrel_SpaceBetween"         value="0.1*mm"/>
-    <constant name="EcalBarrel_FiberChunkLayers_num" value = "15"/>
+    <constant name="EcalBarrel_FiberChunkLayers_num" value = "12"/>
     <comment>
       For Pb/SiFi (GlueX):  X0 ~ 1.45 cm
       For W/SiFi (sPHENIX): X0 ~ 0.7 cm (but different fiber orientation)
@@ -31,6 +31,7 @@
     <constant name="EcalBarrel_ModLength"            value="0.5*m"/>
     <constant name="EcalBarrel_ModWidth"             value="0.5*m"/>
     <constant name="EcalBarrel_AvailThickness"       value="EcalBarrelEnvelope_thickness-EcalBarrel_Support_thickness"/>
+
     <constant name="EcalBarrel_ImagingLayerThickness"
       value="EcalBarrel_SiliconThickness
       + EcalBarrel_ElectronicsThickness
@@ -43,16 +44,21 @@
       + EcalBarrel_CarbonThickness
       + EcalBarrel_LayerSpacing"/>
 
-    <constant name="EcalBarrelImagingLayers_nMax"  value="6"/>
+    <constant name="EcalBarrelImagingLayers_nMax"  value="9"/>
     <constant name="EcalBarrelImagingLayers_num"
         value="min(EcalBarrelImagingLayers_nMax,
-               floor(EcalBarrel_AvailThickness/
-                     (EcalBarrel_ImagingLayerThickness+EcalBarrel_RadiatorThickness+EcalBarrel_SpaceBetween)))"/>
-    <constant name="EcalBarrel_FiberLayerThickness_max"
-        value="max(0, EcalBarrel_AvailThickness-
-               (EcalBarrelImagingLayers_num*EcalBarrel_ImagingLayerThickness))"/>
-    <constant name="EcalBarrel_FiberLayerThickness"
-        value="min(EcalBarrel_FiberLayerThickness_max, EcalBarrel_FiberZSpacing*13*15)"/>
+               floor((EcalBarrel_AvailThickness-EcalBarrel_ImagingLayerThickness)/
+                     (EcalBarrel_ImagingLayerThickness + EcalBarrel_ScFiLayerThickness + EcalBarrel_SpaceBetween)))"/>
+
+    <constant name="EcalBarrel_ImagingPartThickness"
+        value="(EcalBarrelImagingLayers_num-1)*(EcalBarrel_ImagingLayerThickness + EcalBarrel_ScFiLayerThickness + EcalBarrel_SpaceBetween)
+              + EcalBarrel_ImagingLayerThickness + EcalBarrel_SpaceBetween"/>
+    <constant name="EcalBarrel_ScFiPartThickness_max"
+        value="max(0, EcalBarrel_AvailThickness-EcalBarrel_ImagingPartThickness)"/>
+    <constant name="EcalBarrel_ScFiPartThickness"
+        value="min(EcalBarrel_ScFiPartThickness_max, EcalBarrel_FiberZSpacing*13*12)"/>
+    <constant name="EcalBarrel_SensitiveLayers_rmax"
+        value="EcalBarrel_rmin + EcalBarrel_ImagingPartThickness + EcalBarrel_ScFiPartThickness"/>
   </define>
 
   <limits>
@@ -134,7 +140,7 @@
       <layer repeat="EcalBarrel_FiberChunkLayers_num" vis="EcalBarrelLayerVis"
           space_before="EcalBarrel_ImagingLayerThickness + EcalBarrel_SpaceBetween">
         <slice material="Lead"
-          thickness="EcalBarrel_FiberLayerThickness/EcalBarrel_FiberChunkLayers_num"
+          thickness="EcalBarrel_ScFiPartThickness/EcalBarrel_FiberChunkLayers_num"
           vis="EcalBarrelFiberLayerVis">
           <fiber material="PlasticScint"
             sensitive="yes"