Merge remote-tracking branch 'origin/main' into New_B0ECAL_geo

eic · Nov 12, 2024 · 1badc20 · 1badc20
2 parents 1f0a442 + d491ba7
commit 1badc20
Show file tree

Hide file tree

Showing 40 changed files with 2,640 additions and 1,676 deletions.
diff --git a/.github/workflows/linux-eic-shell.yml b/.github/workflows/linux-eic-shell.yml
@@ -122,29 +122,6 @@ jobs:
         sudo apt-get install -y libxml2-utils
         find install/share -name "*.xml" -exec xmllint {} \; > /dev/null
 
-  trigger-geoviewer:
-    runs-on: ubuntu-latest
-    needs:
-      - xmllint-after-build
-      - list-detector-configs
-    steps:
-    - uses: eic/trigger-gitlab-ci@v3
-      id: trigger
-      with:
-        url: https://eicweb.phy.anl.gov
-        project_id: 539
-        token: ${{ secrets.EICWEB_GEOVIEWER_TRIGGER }}
-        ref_name: main
-        variables: |
-          DETECTOR=epic
-          DETECTOR_REPOSITORYURL=${{ github.server_url }}/${{ github.repository }}
-          DETECTOR_REPOSITORYREF=${{ github.ref }}
-          DETECTOR_CONFIG=${{ needs.list-detector-configs.outputs.configs_csv }}
-          DETECTOR_VERSION=${{ github.sha }}
-          GITHUB_REPOSITORY=${{ github.repository }}
-          GITHUB_SHA=${{ github.event.pull_request.head.sha || github.sha }}
-          GITHUB_PR=${{ github.event.pull_request.number }}
-
   check-geometry-configs:
     needs:
       - build

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/definitions.xml b/compact/definitions.xml
@@ -315,6 +315,7 @@ The unused IDs below are saved for future use.
     <constant name="LumiSpecCAL_ID"          value="194"/>
     <constant name="LumiDirectPCAL_ID"       value="195"/>
 
+    <constant name="BackwardsBeamline_ID"    value="197"/>
     <constant name="TaggerTracker_ID"        value="198"/>
     <constant name="TaggerCalorimeter_ID"    value="199"/>
 
@@ -590,7 +591,7 @@ Service gaps in FW direction (before endcapP ECAL) and BW direction (before endc
 
     <constant name="LFHCAL_zmin"          value="EcalEndcapP_zmin + EcalEndcapP_length"/>
     <comment> LFHCAL is 140 cm total, but current implementation leaves the final 10 cm empty </comment>
-    <constant name="LFHCAL_length"        value="140.0*cm"/>
+    <constant name="LFHCAL_length"        value="134.54*cm"/>
     <constant name="LFHCAL_zmax"          value="LFHCAL_zmin + LFHCAL_length"/>
 
     <constant name="HcalEndcapPInsert_zmin"     value="EcalEndcapP_zmin + EcalEndcapP_length"/>

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_backward/beamline_extension_electron.xml b/compact/far_backward/beamline_extension_electron.xml
@@ -25,7 +25,8 @@
       <pipe id="2" name="Pipe_in_Q4eR"
         xcenter="Q4eR_CenterX" zcenter="Q4eR_CenterZ"
         length="Q4eR_Length" theta="Q4eR_Theta"
-        rout1="Q4eR_InnerRadius" rout2="Q4eR_InnerRadius">
+        rout1="Q4eR_InnerRadius" rout2="Q4eR_InnerRadius"
+        limits="kill_limits">
       </pipe>
       <pipe id="3" name="Pipe_Q4eR_to_B3eR"/>
       <pipe id="4" name="Pipe_in_B3eR"

diff --git a/compact/far_backward/beamline_tracking.xml b/compact/far_backward/beamline_tracking.xml
@@ -0,0 +1,80 @@
+
+<lccdd>
+
+  <detectors>
+    <detector
+    id="BackwardsBeamline_ID"
+    type="BeamPipeTracking"
+    name="Pipe_tracker"
+    readout="BackwardsBeamlineHits">
+
+        <slice
+        pipe_id="0"
+        grandmother="Pipe_Q1eR_to_B2BeR"
+        mother="Pipe_to_Q1eR_vacuum"
+        name="Pipe_to_Q1eR_tracker"/>
+
+        <slice
+        pipe_id="1"
+        grandmother="Pipe_Q1eR_to_B2BeR"
+        mother="Pipe_in_Q1eR_vacuum"
+        name="Pipe_in_Q1eR_tracker"/>
+
+        <slice
+        pipe_id="2"
+        grandmother="Pipe_Q1eR_to_B2BeR"
+        mother="Pipe_in_Q2eR_vacuum"
+        name="Pipe_in_Q2eR_tracker"/>
+
+        <slice
+        pipe_id="3"
+        grandmother="Pipe_Q1eR_to_B2BeR"
+        mother="Pipe_in_B2AeR_vacuum"
+        name="Pipe_in_B2AeR_tracker"/>
+
+        <slice
+        pipe_id="4"
+        grandmother="Pipe_Q1eR_to_B2BeR"
+        mother="Pipe_in_B2BeR_vacuum"
+        name="Pipe_in_B2BeR_tracker"/>
+
+        <slice
+        pipe_id="5"
+        grandmother="Pipe_Q3eR_to_B7eR"
+        mother="Pipe_in_Q3eR_vacuum"
+        name="Pipe_in_Q3eR_tracker_start"
+        end="false"/>
+
+        <slice
+        pipe_id="6"
+        grandmother="Pipe_Q3eR_to_B7eR"
+        mother="Pipe_in_Q3eR_vacuum"
+        name="Pipe_in_Q3eR_tracker_end"/>
+
+        <slice
+        pipe_id="7"
+        grandmother="Pipe_Q3eR_to_B7eR"
+        mother="Pipe_in_Q4eR_vacuum"
+        name="Pipe_in_Q4eR_tracker"/>
+
+    </detector>
+
+    <detector
+        type="BeamPipeStop"
+        name="Backwards_Pipe_Stop"
+        grandmother="Pipe_Q3eR_to_B7eR"
+        mother="Pipe_Q4eR_to_B3eR_vacuum"
+    />
+
+  </detectors>
+
+  <readouts>
+
+    <readout name="BackwardsBeamlineHits">
+      <segmentation type="NoSegmentation"/>
+      <id>system:8,pipe:8,end:2</id>
+    </readout>
+
+  </readouts>
+
+</lccdd>
diff --git a/compact/far_backward/extended.xml b/compact/far_backward/extended.xml
@@ -13,4 +13,6 @@
   <!-- Luminosity detector -->
   <include ref="lumi.xml"/>
 
+  <include ref="beamline_tracking.xml"/>
+
 </lccdd>