fix: treat first layer as any other layers

eic · Aug 7, 2023 · 3d451f0 · 3d451f0
1 parent 9809eed
commit 3d451f0
Showing 1 changed file with 13 additions and 11 deletions.
diff --git a/compact/ecal/barrel_interlayers.xml b/compact/ecal/barrel_interlayers.xml
@@ -164,7 +164,7 @@
                           material="Silicon"
                           width="EcalBarrel_AstroPix_width"
                           length="EcalBarrel_AstroPix_length"
-                          thickness="EcalBarrel_ImagingFirstLayerThickness"
+                          thickness="EcalBarrel_AstroPix_thickness"
                           vis="EcalBarrelLayerVis">
           <slice material="Silicon" thickness="EcalBarrel_SiliconThickness"     vis="EcalBarrelSliceVis" sensitive="yes" limits="cal_limits"/>
           <slice material="Silicon" thickness="EcalBarrel_ElectronicsThickness" vis="EcalBarrelSliceVis"/>
@@ -175,18 +175,19 @@
       </module>
 
       <layer repeat="1" vis="EcalBarrelLayerVis"
-             thickness="EcalBarrel_ImagingFirstLayerThickness"
+             thickness="EcalBarrel_ImagingLayerThickness"
              space_before="0.*cm">
         <barrel_envelope
-          inner_r="EcalBarrel_rmin - EcalBarrel_ImagingFirstLayerThickness"
-          outer_r="EcalBarrel_rmin + EcalBarrel_ImagingFirstLayerThickness"
+          inner_r="EcalBarrel_rmin - EcalBarrel_Stave_thickness"
+          outer_r="EcalBarrel_rmin + EcalBarrel_Stave_thickness"
           z_length="EcalBarrel_Calorimeter_length"/>
+        <frame material="CarbonFiber" fill="Air" thickness="EcalBarrel_CarbonThickness" height="EcalBarrel_ImagingLayerThickness / 2.0" vis="EcalBarrelSliceVis"/>
         <stave repeat="5"
                width="EcalBarrel_Stave_width"
                length="EcalBarrel_Stave_length"
-               thickness="EcalBarrel_ImagingFirstLayerThickness"
+               thickness="EcalBarrel_Stave_thickness"
                angle="EcalBarrel_StaveTilt_angle"
-               module="AstroPix_Module_FirstLayer">
+               module="AstroPix_Module">
           <xy_layout
             dx="EcalBarrel_AstroPix_width + EcalBarrel_AstroPix_margin"
             dy="EcalBarrel_AstroPix_length + EcalBarrel_AstroPix_margin"
@@ -200,14 +201,15 @@
         <frame material="CarbonFiber" fill="Air" thickness="EcalBarrel_CarbonThickness" height="EcalBarrel_ImagingLayerThickness" vis="EcalBarrelSliceVis"/>
       </layer>
 
-      <layer repeat="1" vis="EcalBarrelLayerVis"
+      <layer repeat="2" vis="EcalBarrelLayerVis"
              thickness="EcalBarrel_ImagingLayerThickness"
+             space_between="EcalBarrel_ScFiLayerThickness + EcalBarrel_SpaceBetween"
              space_before="EcalBarrel_ScFiLayerThickness + EcalBarrel_SpaceBetween">
         <frame material="CarbonFiber" fill="Air" thickness="EcalBarrel_CarbonThickness" height="EcalBarrel_ImagingLayerThickness / 2.0" vis="EcalBarrelSliceVis"/>
         <stave repeat="6"
                width="EcalBarrel_Stave_width"
                length="EcalBarrel_Stave_length"
-               thickness="EcalBarrel_ImagingFirstLayerThickness"
+               thickness="EcalBarrel_AstroPix_thickness"
                angle="-EcalBarrel_StaveTilt_angle"
                module="AstroPix_Module">
           <xy_layout
@@ -223,15 +225,15 @@
         <frame material="CarbonFiber" fill="Air" thickness="EcalBarrel_CarbonThickness" height="EcalBarrel_ImagingLayerThickness" vis="EcalBarrelSliceVis"/>
       </layer>
 
-      <layer repeat="EcalBarrelImagingLayers_num-4" vis="EcalBarrelLayerVis"
+      <layer repeat="EcalBarrelImagingLayers_num-5" vis="EcalBarrelLayerVis"
              thickness="EcalBarrel_ImagingLayerThickness"
              space_between="EcalBarrel_ScFiLayerThickness + EcalBarrel_SpaceBetween"
              space_before="EcalBarrel_ScFiLayerThickness + EcalBarrel_SpaceBetween">
         <frame material="CarbonFiber" fill="Air" thickness="EcalBarrel_CarbonThickness" height="EcalBarrel_ImagingLayerThickness / 2.0" vis="EcalBarrelSliceVis"/>
         <stave repeat="7"
                width="EcalBarrel_Stave_width"
                length="EcalBarrel_Stave_length"
-               thickness="EcalBarrel_ImagingFirstLayerThickness"
+               thickness="EcalBarrel_AstroPix_thickness"
                angle="EcalBarrel_StaveTilt_angle"
                module="AstroPix_Module">
           <xy_layout
@@ -261,7 +263,7 @@
       <sectors vis="EcalBarrelStaveVis"/>
       <layer repeat="EcalBarrelImagingLayers_num-1" vis="EcalBarrelLayerVis"
        space_between="EcalBarrel_ImagingLayerThickness + EcalBarrel_SpaceBetween"
-       space_before="EcalBarrel_ImagingFirstLayerThickness + EcalBarrel_SpaceBetween/2.">
+       space_before="EcalBarrel_ImagingLayerThickness + EcalBarrel_SpaceBetween/2.">
         <slice material="SciFiPb_PbGlue" thickness="EcalBarrel_RadiatorThickness" vis="EcalBarrelFiberLayerVis">
           <fiber material="SciFiPb_Scintillator"
             sensitive="yes"