Merge branch 'main' into pr/rm_mrich

Author: veprbl

compact/definitions.xml

@@ -646,8 +646,8 @@ Service gaps in FW direction (before endcapP ECAL) and BW direction (before endc
     <constant name="HcalEndcapPInsert_yposition" value="EcalEndcapPInsert_yposition"/>
 
     <constant name="HcalEndcapN_CaloSides"      value="60"/>
-    <constant name="HcalEndcapN_zmin"     value="BackwardServiceGap_zmax + 64.0 * cm"/> <!-- 64 cm gap between service gap, includes 28.5 cm oculus -->
-    <constant name="HcalEndcapN_length"   value="45.0*cm"/>
+    <constant name="HcalEndcapN_zmin"     value="BackwardServiceGap_zmax + 44.0 * cm"/> <!-- 44 cm gap between service gap, includes 28.5 cm oculus -->
+    <constant name="HcalEndcapN_length"   value="65.0*cm"/>
     <constant name="HcalEndcapN_zmax"     value="HcalEndcapN_zmin + HcalEndcapN_length"/>
     <comment> HcalEndcapN needs to clear the straight beampipe with 1 * crossing angle + its radius of 22.25 mm </comment>
     <constant name="HcalEndcapN_rmin"     value="max((HcalEndcapN_zmin + HcalEndcapN_length) * tan(abs(CrossingAngle)) + 22.25 * mm, 14.0 * cm)"/>

compact/hcal/backward.xml

@@ -12,6 +12,7 @@
 
   <define>
     <constant name="HcalEndcapN_allSensitive" value="0"/>
+    <constant name="HcalEndcapN_extension_for_sampF"              value="0.0*cm"/>
   </define>
 
   <include ref="backward_template.xml"/>

compact/hcal/backward_sampF.xml

@@ -12,6 +12,7 @@
 
   <define>
     <constant name="HcalEndcapN_allSensitive" value="1"/>
+    <constant name="HcalEndcapN_extension_for_sampF"              value="4.0*HcalEndcapN_length"/>
   </define>
 
   <include ref="backward_template.xml"/>

compact/hcal/backward_template.xml

@@ -7,7 +7,7 @@
       #### Material Thickness
     </documentation>
     <constant name="HcalEndcapNSteelThickness"          value="4.0 * cm"/>
-    <constant name="HcalEndcapNPolystyreneThickness" value="0.4 * cm"/>
+    <constant name="HcalEndcapNPolystyreneThickness" value="2.4 * cm"/>
         <constant name="HcalEndcapNLayerGap"                    value="0.1 * cm"/> <!-- 2*thicker than LFHCAL -->
 
         <constant name="HcalEndcapN_polyhedron_rmax"    value="251.444*cm"/>
@@ -21,7 +21,7 @@
 
     <constant name="HcalEndcapNSingleLayerThickness"
              value="HcalEndcapNSteelThickness + HcalEndcapNPolystyreneThickness + HcalEndcapNLayerGap"/>
-    <constant name="HcalEndcapNLayer_NRepeat"   value="floor(HcalEndcapN_length / HcalEndcapNSingleLayerThickness)"/>
+    <constant name="HcalEndcapNLayer_NRepeat"   value="floor((HcalEndcapN_length + HcalEndcapN_extension_for_sampF) / HcalEndcapNSingleLayerThickness)"/>
     <constant name="HcalEndcapN_thickness"              value="HcalEndcapNLayer_NRepeat * HcalEndcapNSingleLayerThickness"/>
   </define>
 

configurations/backward_hcal_only_sampF.yml

@@ -3,4 +3,3 @@ features:
     marco:
   hcal:
     backward_sampF:
-    backward_endcap_flux: