Merge branch 'main' into lfhcal_geoupdate

eic · Oct 21, 2024 · d60509c · d60509c
2 parents 2b6845e + ed1917d
commit d60509c
Show file tree

Hide file tree

Showing 24 changed files with 1,040 additions and 335 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,12 +1,12 @@
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v5.0.0
     hooks:
     -   id: check-yaml
     -   id: end-of-file-fixer
     -   id: trailing-whitespace
 -   repo: https://github.com/pre-commit/mirrors-clang-format
-    rev: v18.1.8
+    rev: v19.1.1
     hooks:
     -   id: clang-format
 -   repo: https://github.com/Lucas-C/pre-commit-hooks

diff --git a/compact/display.xml b/compact/display.xml
@@ -50,14 +50,14 @@
 
 
     <vis name="FFTrackerVis"        ref="AnlRed" />
-    <vis name="FFTrackerSupportVis" ref="AnlBlue"             visible="true"  showDaughters="false" />
-    <vis name="FFTrackerShieldingVis" ref="AnlGray"           visible="true"  showDaughters="false" />
-    <vis name="FFTrackerServiceVis" ref="AnlGold"             visible="true"  showDaughters="false" />
+    <vis name="FFTrackerSupportVis" ref="AnlBlue"             visible="true"  showDaughters="true" />
+    <vis name="FFTrackerShieldingVis" ref="AnlLightGray"           visible="true"  showDaughters="true" />
+    <vis name="FFTrackerServiceVis" ref="AnlGold"             visible="true"  showDaughters="true" />
     <vis name="FFTrackerLayerVis"   ref="TrackerVis"          visible="true"  showDaughters="true" />
     <vis name="FFTrackerModuleVis"  ref="FFTrackerLayerVis"   visible="true"  showDaughters="true" />
     <vis name="FFTrackerSurfaceVis" ref="FFTrackerLayerVis"   visible="true"  showDaughters="true" />
     <comment> For shielded modules by default just display to module instead of 6 layers </comment>
-    <vis name="FFTrackerShieldedModuleVis" ref="FFTrackerModuleVis"   visible="true"  showDaughters="false" />
+    <vis name="FFTrackerShieldedModuleVis" ref="FFTrackerModuleVis"   visible="true"  showDaughters="true" />
 
     <comment>
       Luminosity Visualisation

diff --git a/compact/far_forward/roman_pots_eRD24_design.xml b/compact/far_forward/roman_pots_eRD24_design.xml
diff --git a/compact/fields/beamline_10x100.xml b/compact/fields/beamline_10x100.xml
@@ -54,4 +54,14 @@
     <constant name="Q0EF_BMax" value="0.0*tesla"/>
     <constant name="Q1EF_BMax"  value="0.0*tesla"/>
 
+    <comment>
+    These are the ten-sigma cuts for the Roman pots, translated to the physical layout we currently have.
+    They are not perfectly ten-sigma for reasons of physical geometry.
+    </comment>
+
+    <constant name="offset_central_RP_section" value ="0.71*cm"/>
+    <constant name="offset_intermediate_1_RP_section" value ="0.55*cm"/>
+    <constant name="offset_intermediate_2_RP_section" value ="0.0*cm"/>
+    <constant name="offset_outer_RP_section" value ="0.0*cm"/>
+
   </define>
diff --git a/compact/fields/beamline_10x110_H2.xml b/compact/fields/beamline_10x110_H2.xml
@@ -55,4 +55,16 @@
     <constant name="Q0EF_BMax" value="0.0*tesla"/>
     <constant name="Q1EF_BMax"  value="0.0*tesla"/>
 
+    <comment>
+    These are the ten-sigma cuts for the Roman pots, translated to the physical layout we currently have.
+    They are not perfectly ten-sigma for reasons of physical geometry.
+
+    Nuclei currently based on nearest per-nucleon proton energy (needs eventual update from machine).
+    </comment>
+
+    <constant name="offset_central_RP_section" value ="0.71*cm"/>
+    <constant name="offset_intermediate_1_RP_section" value ="0.55*cm"/>
+    <constant name="offset_intermediate_2_RP_section" value ="0.0*cm"/>
+    <constant name="offset_outer_RP_section" value ="0.0*cm"/>
+
   </define>
diff --git a/compact/fields/beamline_10x275.xml b/compact/fields/beamline_10x275.xml
@@ -54,4 +54,14 @@
     <constant name="Q0EF_BMax" value="0.0*tesla"/>
     <constant name="Q1EF_BMax"  value="0.0*tesla"/>
 
+    <comment>
+    These are the ten-sigma cuts for the Roman pots, translated to the physical layout we currently have.
+    They are not perfectly ten-sigma for reasons of physical geometry.
+    </comment>
+
+    <constant name="offset_central_RP_section" value ="0.27*cm"/>
+    <constant name="offset_intermediate_1_RP_section" value ="0.0*cm"/>
+    <constant name="offset_intermediate_2_RP_section" value ="0.0*cm"/>
+    <constant name="offset_outer_RP_section" value ="0.0*cm"/>
+
   </define>
diff --git a/compact/fields/beamline_18x110_Au.xml b/compact/fields/beamline_18x110_Au.xml
@@ -55,4 +55,16 @@
     <constant name="Q0EF_BMax" value="0.0*tesla"/>
     <constant name="Q1EF_BMax"  value="0.0*tesla"/>
 
+    <comment>
+    These are the ten-sigma cuts for the Roman pots, translated to the physical layout we currently have.
+    They are not perfectly ten-sigma for reasons of physical geometry.
+
+    Nuclei currently based on nearest per-nucleon proton energy (needs eventual update from machine).
+    </comment>
+
+    <constant name="offset_central_RP_section" value ="0.71*cm"/>
+    <constant name="offset_intermediate_1_RP_section" value ="0.55*cm"/>
+    <constant name="offset_intermediate_2_RP_section" value ="0.0*cm"/>
+    <constant name="offset_outer_RP_section" value ="0.0*cm"/>
+
   </define>
diff --git a/compact/fields/beamline_18x110_H2.xml b/compact/fields/beamline_18x110_H2.xml
@@ -55,4 +55,16 @@
     <constant name="Q0EF_BMax" value="0.0*tesla"/>
     <constant name="Q1EF_BMax"  value="0.0*tesla"/>
 
+    <comment>
+    These are the ten-sigma cuts for the Roman pots, translated to the physical layout we currently have.
+    They are not perfectly ten-sigma for reasons of physical geometry.
+
+    Nuclei currently based on nearest per-nucleon proton energy (needs eventual update from machine).
+    </comment>
+
+    <constant name="offset_central_RP_section" value ="0.71*cm"/>
+    <constant name="offset_intermediate_1_RP_section" value ="0.55*cm"/>
+    <constant name="offset_intermediate_2_RP_section" value ="0.0*cm"/>
+    <constant name="offset_outer_RP_section" value ="0.0*cm"/>
+
   </define>
diff --git a/compact/fields/beamline_18x110_He3.xml b/compact/fields/beamline_18x110_He3.xml
@@ -55,4 +55,16 @@
     <constant name="Q0EF_BMax" value="0.0*tesla"/>
     <constant name="Q1EF_BMax"  value="0.0*tesla"/>
 
+    <comment>
+    These are the ten-sigma cuts for the Roman pots, translated to the physical layout we currently have.
+    They are not perfectly ten-sigma for reasons of physical geometry.
+
+    Nuclei currently based on nearest per-nucleon proton energy (needs eventual update from machine).
+    </comment>
+
+    <constant name="offset_central_RP_section" value ="0.71*cm"/>
+    <constant name="offset_intermediate_1_RP_section" value ="0.55*cm"/>
+    <constant name="offset_intermediate_2_RP_section" value ="0.0*cm"/>
+    <constant name="offset_outer_RP_section" value ="0.0*cm"/>
+
   </define>
diff --git a/compact/fields/beamline_18x110_Pb.xml b/compact/fields/beamline_18x110_Pb.xml
@@ -55,4 +55,16 @@
     <constant name="Q0EF_BMax" value="0.0*tesla"/>
     <constant name="Q1EF_BMax"  value="0.0*tesla"/>
 
+    <comment>
+    These are the ten-sigma cuts for the Roman pots, translated to the physical layout we currently have.
+    They are not perfectly ten-sigma for reasons of physical geometry.
+
+    Nuclei currently based on nearest per-nucleon proton energy (needs eventual update from machine).
+    </comment>
+
+    <constant name="offset_central_RP_section" value ="0.71*cm"/>
+    <constant name="offset_intermediate_1_RP_section" value ="0.55*cm"/>
+    <constant name="offset_intermediate_2_RP_section" value ="0.0*cm"/>
+    <constant name="offset_outer_RP_section" value ="0.0*cm"/>
+
   </define>
diff --git a/compact/fields/beamline_18x275.xml b/compact/fields/beamline_18x275.xml
@@ -55,4 +55,15 @@
     <constant name="Q0EF_BMax" value="0.0*tesla"/>
     <constant name="Q1EF_BMax"  value="0.0*tesla"/>
 
+    <comment>
+    These are the ten-sigma cuts for the Roman pots, translated to the physical layout we currently have.
+    They are not perfectly ten-sigma for reasons of physical geometry.
+    </comment>
+
+    <constant name="offset_central_RP_section" value ="0.27*cm"/>
+    <constant name="offset_intermediate_1_RP_section" value ="0.0*cm"/>
+    <constant name="offset_intermediate_2_RP_section" value ="0.0*cm"/>
+    <constant name="offset_outer_RP_section" value ="0.0*cm"/>
+
+
   </define>
diff --git a/compact/fields/beamline_5x100.xml b/compact/fields/beamline_5x100.xml
@@ -54,4 +54,14 @@
     <constant name="Q0EF_BMax" value="0.0*tesla"/>
     <constant name="Q1EF_BMax"  value="0.0*tesla"/>
 
+    <comment>
+    These are the ten-sigma cuts for the Roman pots, translated to the physical layout we currently have.
+    They are not perfectly ten-sigma for reasons of physical geometry.
+    </comment>
+
+    <constant name="offset_central_RP_section" value ="0.71*cm"/>
+    <constant name="offset_intermediate_1_RP_section" value ="0.55*cm"/>
+    <constant name="offset_intermediate_2_RP_section" value ="0.0*cm"/>
+    <constant name="offset_outer_RP_section" value ="0.0*cm"/>
+
   </define>
diff --git a/compact/fields/beamline_5x110_H2.xml b/compact/fields/beamline_5x110_H2.xml
@@ -55,4 +55,16 @@
     <constant name="Q0EF_BMax" value="0.0*tesla"/>
     <constant name="Q1EF_BMax"  value="0.0*tesla"/>
 
+    <comment>
+    These are the ten-sigma cuts for the Roman pots, translated to the physical layout we currently have.
+    They are not perfectly ten-sigma for reasons of physical geometry.
+
+    Nuclei currently based on nearest per-nucleon proton energy (needs eventual update from machine).
+    </comment>
+
+    <constant name="offset_central_RP_section" value ="0.71*cm"/>
+    <constant name="offset_intermediate_1_RP_section" value ="0.55*cm"/>
+    <constant name="offset_intermediate_2_RP_section" value ="0.0*cm"/>
+    <constant name="offset_outer_RP_section" value ="0.0*cm"/>
+
   </define>
diff --git a/compact/fields/beamline_5x41.xml b/compact/fields/beamline_5x41.xml
@@ -54,4 +54,14 @@
     <constant name="Q0EF_BMax"  value="0.0*tesla"/>
     <constant name="Q1EF_BMax"  value="0.0*tesla"/>
 
+    <comment>
+    These are the ten-sigma cuts for the Roman pots, translated to the physical layout we currently have.
+    They are not perfectly ten-sigma for reasons of physical geometry.
+    </comment>
+
+    <constant name="offset_central_RP_section" value ="2.96*cm"/>
+    <constant name="offset_intermediate_1_RP_section" value ="2.75*cm"/> <!-- rough extrapolation -->
+    <constant name="offset_intermediate_2_RP_section" value ="1.80*cm"/> <!-- rough extrapolation -->
+    <constant name="offset_outer_RP_section" value ="0.0*cm"/>
+
   </define>
diff --git a/compact/fields/beamline_5x41_H2.xml b/compact/fields/beamline_5x41_H2.xml
@@ -55,4 +55,16 @@
     <constant name="Q0EF_BMax" value="0.0*tesla"/>
     <constant name="Q1EF_BMax"  value="0.0*tesla"/>
 
+    <comment>
+    These are the ten-sigma cuts for the Roman pots, translated to the physical layout we currently have.
+    They are not perfectly ten-sigma for reasons of physical geometry.
+
+    Nuclei currently based on nearest per-nucleon proton energy (needs eventual update from machine).
+    </comment>
+
+    <constant name="offset_central_RP_section" value ="2.96*cm"/>
+    <constant name="offset_intermediate_1_RP_section" value ="2.75*cm"/> <!-- rough extrapolation -->
+    <constant name="offset_intermediate_2_RP_section" value ="1.80*cm"/> <!-- rough extrapolation -->
+    <constant name="offset_outer_RP_section" value ="0.0*cm"/>
+
   </define>
diff --git a/compact/fields/beamline_5x41_He3.xml b/compact/fields/beamline_5x41_He3.xml
@@ -55,4 +55,16 @@
     <constant name="Q0EF_BMax" value="0.0*tesla"/>
     <constant name="Q1EF_BMax"  value="0.0*tesla"/>
 
+    <comment>
+    These are the ten-sigma cuts for the Roman pots, translated to the physical layout we currently have.
+    They are not perfectly ten-sigma for reasons of physical geometry.
+
+    Nuclei currently based on nearest per-nucleon proton energy (needs eventual update from machine).
+    </comment>
+
+    <constant name="offset_central_RP_section" value ="2.96*cm"/>
+    <constant name="offset_intermediate_1_RP_section" value ="2.75*cm"/> <!-- rough extrapolation -->
+    <constant name="offset_intermediate_2_RP_section" value ="1.80*cm"/> <!-- rough extrapolation -->
+    <constant name="offset_outer_RP_section" value ="0.0*cm"/>
+
   </define>
diff --git a/compact/fields/beamline_5x41_He4.xml b/compact/fields/beamline_5x41_He4.xml
@@ -55,4 +55,16 @@
     <constant name="Q0EF_BMax" value="0.0*tesla"/>
     <constant name="Q1EF_BMax"  value="0.0*tesla"/>
 
+    <comment>
+    These are the ten-sigma cuts for the Roman pots, translated to the physical layout we currently have.
+    They are not perfectly ten-sigma for reasons of physical geometry.
+
+    Nuclei currently based on nearest per-nucleon proton energy (needs eventual update from machine).
+    </comment>
+
+    <constant name="offset_central_RP_section" value ="2.96*cm"/>
+    <constant name="offset_intermediate_1_RP_section" value ="2.75*cm"/> <!-- rough extrapolation -->
+    <constant name="offset_intermediate_2_RP_section" value ="1.80*cm"/> <!-- rough extrapolation -->
+    <constant name="offset_outer_RP_section" value ="0.0*cm"/>
+
   </define>
diff --git a/compact/tracking/definitions_craterlake.xml b/compact/tracking/definitions_craterlake.xml
@@ -41,15 +41,18 @@
 
     <comment> Main parameters for Barrel TOF layers </comment>
     <comment> Barrel TOF region </comment>
-    <constant name="BarrelTOF_zmin"          value="112.5*cm"/>
-    <constant name="BarrelTOF_zmax"          value="174.0*cm"/>
+    <constant name="BarrelTOF1_zmin"          value="115.0*cm"/>
+    <constant name="BarrelTOF1_zmax"          value="14.75*cm"/>
+    <constant name="BarrelTOF2_zmin"           value="-15.25*cm"/>
+    <constant name="BarrelTOF2_zmax"           value="174.0*cm"/>
+
     <constant name="BarrelTOF_radius_design" value="64.6*cm"/>
 
     <comment> Forward TOF region  </comment>
     <constant name="ForwardTOFRegion_zmin"        value="174.0*cm" />
     <constant name="ForwardTOFRegion_tan"         value="CentralTrackingRegionP_tan" />
-    <constant name="ForwardTOFRegion_minR"        value="8*cm" />
-    <constant name="ForwardTOFRegion_maxR"        value="50*cm" />
+    <constant name="ForwardTOFRegion_minR"        value="9.5*cm" />
+    <constant name="ForwardTOFRegion_maxR"        value="60.5*cm" />
     <constant name="ForwardTOF_xOffset"           value="-2.75*cm" />
     <constant name="ForwardTOF_det_height"        value="2.0*cm" />
     <constant name="ForwardTOF_length"            value="min(ForwardTOFRegion_length, 2.*cm)"/>