Femcal update

.github/workflows/linux-eic-shell.yml

@@ -110,7 +110,6 @@ jobs:
         source install/bin/thisepic.sh
         sed -i 's%\(<fiber\|<lens\)%<comment>\1%g; s%\(/fiber>\|/lens>\)%\1</comment>%g' \
           ${DETECTOR_PATH}/compact/ecal/bic_default.xml \
-          ${DETECTOR_PATH}/compact/ecal/forward_scfi.xml \
           ${DETECTOR_PATH}/compact/far_forward/ZDC_Ecal_WSciFi.xml
     - uses: actions/upload-artifact@v5
       with:

compact/definitions.xml

@@ -544,7 +544,7 @@ Examples:
 Service gaps in FW direction (before endcapP ECAL) and BW direction (before endcapN HCAL)
     </documentation>
     <constant name="ForwardInnerEndcapRegionExtraSpace_length" value="4.6*cm"/>
-    <constant name="ForwardServiceGap_length"     value="12.36*cm"/>
+    <constant name="ForwardServiceGap_length"     value="15.4*cm"/>
     <constant name="ForwardServiceGap_zmin"       value="ForwardPIDRegion_zmin + ForwardInnerEndcapRegion_length + ForwardInnerEndcapRegionExtraSpace_length"/>
     <constant name="ForwardServiceGap_zmax"       value="ForwardServiceGap_zmin + ForwardServiceGap_length"/>
 
@@ -561,25 +561,39 @@ Service gaps in FW direction (before endcapP ECAL) and BW direction (before endc
   <documentation level="3">
 ## Calorimeter Parameters
   </documentation>
-    <constant name="EcalBarrelSectorsN"             value="48"/>
-    <constant name="EcalEndcapP_zmin"               value="ForwardServiceGap_zmax" />
-    <constant name="EcalEndcapP_length"             value="30*cm" />
-    <constant name="EcalEndcapP_zmax"               value="EcalEndcapP_zmin + EcalEndcapP_length"/>
-    <constant name="EcalEndcapP_rmin"               value="200.0*mm" />
-    <comment> extra 50cm rmax that "protrudes" into the HCAL</comment>
-    <constant name="EcalEndcapP_rmax"               value="195.0*cm"/>
-    <constant name="EcalEndcapP_numLayers"          value="1"/>
-
-    <constant name="EcalEndcapPInsert_zmin"           value="EcalEndcapP_zmin"/>
-    <constant name="EcalEndcapPInsert_length"         value="EcalEndcapP_length"/>
-    <constant name="EcalEndcapPInsert_zmax"           value="EcalEndcapPInsert_zmin + EcalEndcapPInsert_length"/>
-    <constant name="EcalEndcapPInsert_width"          value="60.0*cm"/>
-    <constant name="EcalEndcapPInsert_height"         value="60.0*cm"/>
-    <constant name="EcalEndcapPInsert_xposition"      value="-10.0*cm"/>
-    <constant name="EcalEndcapPInsert_yposition"      value="0.0*cm"/>
-    <constant name="EcalEndcapPInsert_hole_radius"    value="14.61*cm"/>
-    <constant name="EcalEndcapPInsert_hole_xposition" value="-7.20*cm"/>
-    <constant name="EcalEndcapPInsert_hole_yposition" value="0.0*cm"/>
+    <constant name="EcalBarrelSectorsN"               value="48"/>
+
+    <constant name="EcalEndcapP_numLayers"              value="1"/>
+    <constant name="EcalEndcapP_zmin"                   value="ForwardServiceGap_zmax"/>
+    <constant name="EcalEndcapP_CoverThickness"         value="0.343*mm"/>
+    <constant name="EcalEndcapP_AirThickness"           value="61.457*mm"/>
+    <constant name="EcalEndcapP_PCBThickness"           value="4.5*mm"/>
+    <constant name="EcalEndcapP_LightGuideThickness"    value="21.0*mm"/>
+    <constant name="EcalEndcapP_ScintillatorThickness"  value="170.0*mm"/>
+    <constant name="EcalEndcapP_MountingPlateThickness" value="12.7*mm"/>
+    <constant name="EcalEndcapP_length"                 value="EcalEndcapP_CoverThickness+EcalEndcapP_AirThickness+EcalEndcapP_PCBThickness+EcalEndcapP_LightGuideThickness+EcalEndcapP_ScintillatorThickness+EcalEndcapP_MountingPlateThickness"/>
+    <constant name="EcalEndcapP_zmax"                   value="EcalEndcapP_zmin + EcalEndcapP_length"/>
+    <constant name="EcalEndcapP_xOffsetNorth"           value="0.685/2.0*cm"/>
+    <constant name="EcalEndcapP_xOffsetSouth"           value="0.685/2.0*cm"/>
+    <constant name="EcalEndcapP_yOffsetNorth"           value="0.0*cm"/>
+    <constant name="EcalEndcapP_yOffsetSouth"           value="0.0*cm"/>
+    <constant name="EcalEndcapP_nsGap"                  value="EcalEndcapP_xOffsetNorth+EcalEndcapP_xOffsetSouth"/>
+    <constant name="EcalEndcapP_rmin"                   value="0.0*inch"/>
+    <constant name="EcalEndcapP_rmax"                   value="81.0*inch"/>
+    <constant name="EcalEndcapP_rmaxWithGap"            value="EcalEndcapP_rmax + EcalEndcapP_nsGap/2.0"/>
+    <constant name="EcalEndcapP_blockSize"              value="10.0*cm"/>
+    <constant name="EcalEndcapP_blockLength"            value="17.0*cm"/>
+    <constant name="EcalEndcapP_spaceBetweenBlock"      value="0.1*cm"/>
+    <constant name="EcalEndcapP_xOffsetBeamPipeNorth"   value="3.0/4.0*EcalEndcapP_blockSize"/>
+    <constant name="EcalEndcapP_xOffsetBeamPipeSouth"   value="2.0*EcalEndcapP_blockSize + 2.0*EcalEndcapP_spaceBetweenBlock"/>
+    <constant name="EcalEndcapP_insert_dy"              value="3.0*EcalEndcapP_blockSize + 3.0*EcalEndcapP_spaceBetweenBlock"/>
+    <constant name="EcalEndcapP_insert_dz"              value="EcalEndcapP_length"/>
+    <constant name="EcalEndcapP_insert_thickness"       value="0.25*inch"/>
+    <constant name="EcalEndcapP_insert_center_x"        value="(EcalEndcapP_xOffsetBeamPipeNorth-EcalEndcapP_xOffsetBeamPipeSouth)/2.0"/>
+    <constant name="EcalEndcapP_nfiber_x"               value="26"/>
+    <constant name="EcalEndcapP_nfiber_y"               value="30"/>
+    <constant name="EcalEndcapP_rfiber"                 value="0.0235*cm"/>
+    <constant name="EcalEndcapP_rscfi"                  value="0.02209*cm"/>
 
     <!-- <constant name="EcalEndcapN_zmin"               value="BackwardPIDRegion_zmin + BackwardInnerEndcapRegion_length"/> -->
     <constant name="EcalEndcapN_zmin"               value="175*cm"/>   <!-- Currently fix value hardcoded -->
@@ -642,8 +656,11 @@ Service gaps in FW direction (before endcapP ECAL) and BW direction (before endc
     <constant name="HcalEndcapPInsert_zmax"     value="HcalEndcapPInsert_zmin + HcalEndcapPInsert_length"/>
     <constant name="HcalEndcapPInsert_width"    value="59.26*cm"/>
     <constant name="HcalEndcapPInsert_height"    value="59.29*cm"/>
-    <constant name="HcalEndcapPInsert_xposition" value="EcalEndcapPInsert_xposition"/>
-    <constant name="HcalEndcapPInsert_yposition" value="EcalEndcapPInsert_yposition"/>
+    <constant name="HcalEndcapPInsert_xposition" value="-10.0*cm"/>
+    <constant name="HcalEndcapPInsert_yposition" value="0.0*cm"/>
+    <constant name="HcalEndcapPInsert_hole_radius"    value="14.61*cm"/>
+    <constant name="HcalEndcapPInsert_hole_xposition" value="-7.20*cm"/>
+    <constant name="HcalEndcapPInsert_hole_yposition" value="0.0*cm"/>
 
     <constant name="HcalEndcapN_CaloSides"      value="60"/>
     <constant name="HcalEndcapN_zmin"     value="BackwardServiceGap_zmax + 44.0 * cm"/> <!-- 44 cm gap between service gap, includes 28.5 cm oculus -->

compact/ecal/forward_ScFi.xml

@@ -0,0 +1,63 @@
+<!-- SPDX-License-Identifier: LGPL-3.0-or-later -->
+<!-- Copyright (C) 2025 Akio Ogawa, Whitney Armstrong, Chao Peng, Sylvester Joosten, Zhongling Ji, Ryan Milton -->
+
+<lccdd>
+
+  <info name="forwardEcalScFi.xml"
+        title="forward ECal 2025 design"
+        author="@akioogawa"
+        url="https://github.com/akioogawa"
+        status="development"
+        version="1.0">
+  <comment/></info>
+
+  <define>
+    <documentation>
+      - Forward Ecal Homogeneous(1) or ScFi(2)  Model
+    </documentation>
+    <constant name="EcalEndcapP_Homogeneous_ScFi"         value="2"/>
+  </define>
+
+  <limits>
+  </limits>
+
+  <regions>
+  </regions>
+
+  <display>
+  </display>
+
+  <detectors>
+
+    <documentation>
+      ### Forward (Positive Z) Endcap ScFi Electromagnetic Calorimeter
+      Implementation of 2025 design
+      Insert shape is cut out from middle of detector
+    </documentation>
+    <detector id="EcalEndcapP_ID"
+      name="EcalEndcapP"
+      type="epic_ForwardEcal"
+      readout="EcalEndcapPHits">
+      <position x="0" y="0" z="EcalEndcapP_zmin"/>
+      <dimensions rmin="EcalEndcapP_rmin" rmax="EcalEndcapP_rmax" z="EcalEndcapP_length"/>
+      <slice name="Cover" material="Aluminum" thickness="EcalEndcapP_CoverThickness" vis="AnlGray"/>
+      <slice name="Air" material="Air" thickness="EcalEndcapP_AirThickness" vis="AnlLight_Gray"/>
+      <slice name="PCB" material="Fr4" thickness="EcalEndcapP_PCBThickness" vis="AnlGreen"/>
+      <slice name="LG" material="Plexiglass" thickness="EcalEndcapP_LightGuideThickness" vis="AnlBlue"/>
+      <slice name="WScFi" material="AvgTungstenScFi" thickness="EcalEndcapP_ScintillatorThickness" vis="AnlOrange" sensitive="true"/>
+      <slice name="MountingPlate" material="StainlessSteelSAE304" thickness="EcalEndcapP_MountingPlateThickness" vis="AnlGray"/>
+    </detector>
+  </detectors>
+
+  <!--  Definition of the readout segmentation/definition  -->
+  <readouts>
+    <readout name="EcalEndcapPHits">
+      <segmentation type="NoSegmentation"/>
+      <id>system:8,northsouth:1,blockrow:6,blockcol:5,x:2,y:2,fiber_x:5,fiber_y:5</id>
+    </readout>
+  </readouts>
+
+  <plugins>
+  </plugins>
+
+</lccdd>

compact/ecal/forward_averaged_homogeneous.xml

@@ -0,0 +1,64 @@
+
+<!-- SPDX-License-Identifier: LGPL-3.0-or-later -->
+<!-- Copyright (C) 2025 Akio Ogawa, Whitney Armstrong, Chao Peng, Sylvester Joosten, Zhongling Ji, Ryan Milton -->
+
+<lccdd>
+
+  <info name="forwardEcal.xml"
+        title="forward ECal 2025 design"
+        author="@akioogawa"
+        url="https://github.com/akioogawa"
+        status="development"
+        version="1.0">
+  <comment/></info>
+
+  <define>
+    <documentation>
+      - Forward Ecal Homogeneous(1) or ScFi(2) Model
+    </documentation>
+    <constant name="EcalEndcapP_Homogeneous_ScFi"         value="1"/>
+  </define>
+
+  <limits>
+  </limits>
+
+  <regions>
+  </regions>
+
+  <display>
+  </display>
+
+  <detectors>
+
+    <documentation>
+      ### Forward (Positive Z) Endcap ScFi Electromagnetic Calorimeter
+      Implementation of 2025 design
+      Insert shape is cut out from middle of detector
+    </documentation>
+    <detector id="EcalEndcapP_ID"
+      name="EcalEndcapP"
+      type="epic_ForwardEcal"
+      readout="EcalEndcapPHits">
+      <position x="0" y="0" z="EcalEndcapP_zmin"/>
+      <dimensions rmin="EcalEndcapP_rmin" rmax="EcalEndcapP_rmax" z="EcalEndcapP_length"/>
+      <slice name="Cover" material="Aluminum" thickness="EcalEndcapP_CoverThickness" vis="AnlGray"/>
+      <slice name="Air" material="Air" thickness="EcalEndcapP_AirThickness" vis="AnlLight_Gray"/>
+      <slice name="PCB" material="Fr4" thickness="EcalEndcapP_PCBThickness" vis="AnlGreen"/>
+      <slice name="LG" material="Plexiglass" thickness="EcalEndcapP_LightGuideThickness" vis="AnlBlue"/>
+      <slice name="WScFi" material="AvgTungstenScFi" thickness="EcalEndcapP_ScintillatorThickness" vis="AnlOrange" sensitive="true"/>
+      <slice name="MountingPlate" material="StainlessSteelSAE304" thickness="EcalEndcapP_MountingPlateThickness" vis="AnlGray"/>
+    </detector>
+  </detectors>
+
+  <!--  Definition of the readout segmentation/definition  -->
+  <readouts>
+    <readout name="EcalEndcapPHits">
+      <segmentation type="CartesianGridXY" grid_size_x="25*mm" grid_size_y="25*mm" offset_x="-37.5*mm" offset_y="-37.5*mm"/>
+      <id>system:8,northsouth:1,blockrow:6,blockcol:5,x:2,y:2</id>
+    </readout>
+  </readouts>
+
+  <plugins>
+  </plugins>
+
+</lccdd>