eic · akioogawa · Mar 5, 2025 · Mar 6, 2025 · Mar 10, 2025 · Mar 12, 2025
diff --git a/compact/definitions.xml b/compact/definitions.xml
@@ -545,7 +545,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="9.6*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"/>
 
@@ -564,11 +564,11 @@ Service gaps in FW direction (before endcapP ECAL) and BW direction (before endc
   </documentation>
     <constant name="EcalBarrelSectorsN"             value="48"/>
     <constant name="EcalEndcapP_zmin"               value="ForwardServiceGap_zmax" />
-    <constant name="EcalEndcapP_length"             value="30*cm" />
+    <constant name="EcalEndcapP_length"             value="27*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_rmax"               value="206.1464*cm"/>
     <constant name="EcalEndcapP_numLayers"          value="1"/>
 
     <constant name="EcalEndcapPInsert_zmin"           value="EcalEndcapP_zmin"/>

diff --git a/compact/ecal/forwardEcal.xml b/compact/ecal/forwardEcal.xml
@@ -0,0 +1,86 @@
+
+<!-- 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="ForwardEcal_Homogeneous_Scfi"         value="1"/>
+
+    <documentation>
+      - Forward Ecal Slice Thickness
+    </documentation>
+    <constant name="ForwardEcalCoverThickness"            value="0.343*mm"/>
+    <constant name="ForwardEcalAirThickness"              value="61.457*mm"/>
+    <constant name="ForwardEcalPCBThickness"              value="4.5*mm"/>
+    <constant name="ForwardEcalLightGuideThickness"       value="21.0*mm"/>
+    <constant name="ForwardEcalScintillatorThickness"     value="170.0*mm"/>
+    <constant name="ForwardEcalMountingPlateThickness"    value="12.7*mm"/>
+
+    <documentation>
+      - Forward Ecal computed total Thickness
+    </documentation>
+    <constant name="ForwardEcalThickness"
+      value = "ForwardEcalCoverThickness +
+               ForwardEcalAirThickness +
+               ForwardEcalPCBThickness +
+               ForwardEcalLightGuideThickness +
+               ForwardEcalScintillatorThickness +
+               ForwardEcalMountingPlateThickness"
+    />
+  </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="ForwardEcalThickness"/>
+      <slice name="Cover" material="Aluminum" thickness="ForwardEcalCoverThickness" vis="AnlGray"/>
+      <slice name="Air" material="Air" thickness="ForwardEcalAirThickness" vis="AnlLight_Gray"/>
+      <slice name="PCB" material="Fr4" thickness="ForwardEcalPCBThickness" vis="AnlGreen"/>
+      <slice name="LG" material="Plexiglass" thickness="ForwardEcalLightGuideThickness" vis="AnlBlue"/>
+      <slice name="WScFi" material="AvgTungstenScFi" thickness="ForwardEcalScintillatorThickness" vis="AnlOrange" sensitive="true"/>
+      <slice name="MountingPlate" material="StainlessSteel" thickness="ForwardEcalMountingPlateThickness" 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>
diff --git a/compact/ecal/forwardEcalScFi.xml b/compact/ecal/forwardEcalScFi.xml
@@ -0,0 +1,86 @@
+<!-- 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="ForwardEcal_Homogeneous_Scfi"         value="2"/>
+
+    <documentation>
+      - Forward Ecal Slice Thickness
+    </documentation>
+    <constant name="ForwardEcalCoverThickness"            value="0.343*mm"/>
+    <constant name="ForwardEcalAirThickness"              value="61.457*mm"/>
+    <constant name="ForwardEcalPCBThickness"              value="4.5*mm"/>
+    <constant name="ForwardEcalLightGuideThickness"       value="21.0*mm"/>
+    <constant name="ForwardEcalScintillatorThickness"     value="170.0*mm"/>
+    <constant name="ForwardEcalMountingPlateThickness"    value="12.7*mm"/>
+
+    <documentation>
+      - Forward Ecal computed total Thickness
+    </documentation>
+    <constant name="ForwardEcalThickness"
+      value = "ForwardEcalCoverThickness +
+               ForwardEcalAirThickness +
+               ForwardEcalPCBThickness +
+               ForwardEcalLightGuideThickness +
+               ForwardEcalScintillatorThickness +
+               ForwardEcalMountingPlateThickness"
+    />
+  </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="ForwardEcalThickness"/>
+      <slice name="Cover" material="Aluminum" thickness="ForwardEcalCoverThickness" vis="AnlGray"/>
+      <slice name="Air" material="Air" thickness="ForwardEcalAirThickness" vis="AnlLight_Gray"/>
+      <slice name="PCB" material="Fr4" thickness="ForwardEcalPCBThickness" vis="AnlGreen"/>
+      <slice name="LG" material="Plexiglass" thickness="ForwardEcalLightGuideThickness" vis="AnlBlue"/>
+      <slice name="WScFi" material="AvgTungstenScFi" thickness="ForwardEcalScintillatorThickness" vis="AnlOrange" sensitive="true"/>
+      <slice name="MountingPlate" material="StainlessSteel" thickness="ForwardEcalMountingPlateThickness" vis="AnlGray"/>
+    </detector>
+  </detectors>
+
+  <!--  Definition of the readout segmentation/definition  -->
+  <readouts>
+    <readout name="EcalEndcapPHits">
+      <!-- <segmentation type="NoSegmentation"/> -->  <!-- Adding this slow down startup to >30min -->
+      <segmentation type="CartesianGridXY" grid_size_x="10*cm" grid_size_y="10*cm" offset_x="-0.0*cm" offset_y="-0.0*cm"/>
+      <id>system:8,northsouth:1,blockrow:6,blockcol:5,towerx:2,towery:2,fiberx:5,fibery:5,x:1,y:1</id>
+    </readout>
+  </readouts>
+
+  <plugins>
+  </plugins>
+
+</lccdd>
diff --git a/compact/materials.xml b/compact/materials.xml
@@ -283,7 +283,7 @@
     <fraction n="0.006" ref="Fe"/>
   </material>
   <material name="AvgTungstenScFi">
-    <D value="10.15" unit="g / cm3"/>
+    <D value="9.5" unit="g / cm3"/>  <!-- More realistic number from Oleg -->
     <fraction n="0.948" ref="W"/>
     <fraction n="0.052*19./40" ref="C"/>
     <fraction n="0.052*21./40" ref="H"/>

diff --git a/configurations/becal.yml b/configurations/becal.yml
@@ -0,0 +1,3 @@
+features:
+  ecal:
+    bic_default:
diff --git a/configurations/calorimeters.yml b/configurations/calorimeters.yml
@@ -2,8 +2,7 @@ features:
   beampipe:
   solenoid:
   ecal:
-    forward_homogeneous:
-    forward_insert_homogeneous:
+    forwardEcal:
     bic_default:
     backward_PbWO4:
   hcal:

diff --git a/configurations/craterlake.yml b/configurations/craterlake.yml
@@ -19,8 +19,7 @@ features:
     pfrich:
     drich:
   ecal:
-    forward_homogeneous:
-    forward_insert_homogeneous:
+    forwardEcal:
     bic_default:
     backward_PbWO4:
   solenoid:

diff --git a/configurations/craterlake_10x100.yml b/configurations/craterlake_10x100.yml
@@ -19,8 +19,7 @@ features:
     pfrich:
     drich:
   ecal:
-    forward_homogeneous:
-    forward_insert_homogeneous:
+    forwardEcal:
     bic_default:
     backward_PbWO4:
   solenoid:

diff --git a/configurations/craterlake_10x100_Au197.yml b/configurations/craterlake_10x100_Au197.yml
@@ -19,8 +19,7 @@ features:
     pfrich:
     drich:
   ecal:
-    forward_homogeneous:
-    forward_insert_homogeneous:
+    forwardEcal:
     bic_default:
     backward_PbWO4:
   solenoid:

diff --git a/configurations/craterlake_10x115_Cu63.yml b/configurations/craterlake_10x115_Cu63.yml
@@ -19,8 +19,7 @@ features:
     pfrich:
     drich:
   ecal:
-    forward_homogeneous:
-    forward_insert_homogeneous:
+    forwardEcal:
     bic_default:
     backward_PbWO4:
   solenoid:

diff --git a/configurations/craterlake_10x115_Ru96.yml b/configurations/craterlake_10x115_Ru96.yml
@@ -19,8 +19,7 @@ features:
     pfrich:
     drich:
   ecal:
-    forward_homogeneous:
-    forward_insert_homogeneous:
+    forwardEcal:
     bic_default:
     backward_PbWO4:
   solenoid:

diff --git a/configurations/craterlake_10x130.yml b/configurations/craterlake_10x130.yml
@@ -19,8 +19,7 @@ features:
     pfrich:
     drich:
   ecal:
-    forward_homogeneous:
-    forward_insert_homogeneous:
+    forwardEcal:
     bic_default:
     backward_PbWO4:
   solenoid:

diff --git a/configurations/craterlake_10x130_H2.yml b/configurations/craterlake_10x130_H2.yml
@@ -19,8 +19,7 @@ features:
     pfrich:
     drich:
   ecal:
-    forward_homogeneous:
-    forward_insert_homogeneous:
+    forwardEcal:
     bic_default:
     backward_PbWO4:
   solenoid:

diff --git a/configurations/craterlake_10x166_He3.yml b/configurations/craterlake_10x166_He3.yml
@@ -19,8 +19,7 @@ features:
     pfrich:
     drich:
   ecal:
-    forward_homogeneous:
-    forward_insert_homogeneous:
+    forwardEcal:
     bic_default:
     backward_PbWO4:
   solenoid:

diff --git a/configurations/craterlake_10x250.yml b/configurations/craterlake_10x250.yml
@@ -19,8 +19,7 @@ features:
     pfrich:
     drich:
   ecal:
-    forward_homogeneous:
-    forward_insert_homogeneous:
+    forwardEcal:
     bic_default:
     backward_PbWO4:
   solenoid:

diff --git a/configurations/craterlake_10x275.yml b/configurations/craterlake_10x275.yml
@@ -19,8 +19,7 @@ features:
     pfrich:
     drich:
   ecal:
-    forward_homogeneous:
-    forward_insert_homogeneous:
+    forwardEcal:
     bic_default:
     backward_PbWO4:
   solenoid:

diff --git a/configurations/craterlake_18x110_Au.yml b/configurations/craterlake_18x110_Au.yml
@@ -19,8 +19,7 @@ features:
     pfrich:
     drich:
   ecal:
-    forward_homogeneous:
-    forward_insert_homogeneous:
+    forwardEcal:
     bic_default:
     backward_PbWO4:
   solenoid:

diff --git a/configurations/craterlake_18x110_He3.yml b/configurations/craterlake_18x110_He3.yml
@@ -19,8 +19,7 @@ features:
     pfrich:
     drich:
   ecal:
-    forward_homogeneous:
-    forward_insert_homogeneous:
+    forwardEcal:
     bic_default:
     backward_PbWO4:
   solenoid:

diff --git a/configurations/craterlake_18x275.yml b/configurations/craterlake_18x275.yml
@@ -19,8 +19,7 @@ features:
     pfrich:
     drich:
   ecal:
-    forward_homogeneous:
-    forward_insert_homogeneous:
+    forwardEcal:
     bic_default:
     backward_PbWO4:
   solenoid:

diff --git a/configurations/craterlake_5x100.yml b/configurations/craterlake_5x100.yml
@@ -19,8 +19,7 @@ features:
     pfrich:
     drich:
   ecal:
-    forward_homogeneous:
-    forward_insert_homogeneous:
+    forwardEcal:
     bic_default:
     backward_PbWO4:
   solenoid:

diff --git a/configurations/craterlake_5x41.yml b/configurations/craterlake_5x41.yml
@@ -19,8 +19,7 @@ features:
     pfrich:
     drich:
   ecal:
-    forward_homogeneous:
-    forward_insert_homogeneous:
+    forwardEcal:
     bic_default:
     backward_PbWO4:
   solenoid:

diff --git a/configurations/craterlake_bic_6layers.yml b/configurations/craterlake_bic_6layers.yml
@@ -19,8 +19,7 @@ features:
     pfrich:
     drich:
   ecal:
-    forward_homogeneous:
-    forward_insert_homogeneous:
+    forwardEcal:
     bic_6layers:
     backward_PbWO4:
   solenoid:

diff --git a/configurations/craterlake_bic_layer1_only.yml b/configurations/craterlake_bic_layer1_only.yml
@@ -19,8 +19,7 @@ features:
     pfrich:
     drich:
   ecal:
-    forward_homogeneous:
-    forward_insert_homogeneous:
+    forwardEcal:
     bic_layer1_only:
     backward_PbWO4:
   solenoid:

diff --git a/configurations/craterlake_no_bhcal.yml b/configurations/craterlake_no_bhcal.yml
@@ -19,8 +19,7 @@ features:
     pfrich:
     drich:
   ecal:
-    forward_homogeneous:
-    forward_insert_homogeneous:
+    forwardEcal:
     bic_default:
     backward_PbWO4:
   solenoid: