Merge branch 'main' into mpgd_gas_mix

eic · Sep 25, 2024 · 4ab308e · 4ab308e
2 parents 7a990c6 + 22e5f68
commit 4ab308e
Show file tree

Hide file tree

Showing 4 changed files with 421 additions and 25 deletions.
diff --git a/.github/workflows/linux-eic-shell.yml b/.github/workflows/linux-eic-shell.yml
@@ -411,39 +411,28 @@ jobs:
           noverlaps="$(grep -c GeomVol1002 doc/overlap_check_geant4.out || true)"
           if [[ "${noverlaps}" -gt "0" ]] ; then echo "${noverlaps} overlaps found!" && false ; fi
 
-  trigger-benchmarks:
+  trigger-container:
     runs-on: ubuntu-latest
+    if: ${{ github.actor != 'dependabot[bot]' }}
     needs: [check-overlap-tgeo, check-overlap-geant4-fast]
-    strategy:
-      matrix:
-        detector_config: [epic_craterlake]
-        benchmark_repo: [detector_benchmarks, physics_benchmarks, reconstruction_benchmarks]
-        include:
-        - benchmark_repo: detector_benchmarks
-          project_id: 399
-          secret_var: EICWEB_DETECTOR_BENCHMARK_TRIGGER
-        - benchmark_repo: physics_benchmarks
-          project_id: 400
-          secret_var: EICWEB_PHYSICS_BENCHMARK_TRIGGER
-        - benchmark_repo: reconstruction_benchmarks
-          project_id: 408
-          secret_var: EICWEB_RECONSTRUCTION_BENCHMARK_TRIGGER
     steps:
     - uses: eic/trigger-gitlab-ci@v3
       id: trigger
       with:
         url: https://eicweb.phy.anl.gov
-        project_id: ${{ matrix.project_id }}
-        token: ${{ secrets[matrix.secret_var] }}
+        project_id: 290
+        token: ${{ secrets.EICWEB_CONTAINER_TRIGGER }}
         ref_name: master
         variables: |
           DETECTOR=epic
           DETECTOR_REPOSITORYURL=${{ github.server_url }}/${{ github.repository }}
           DETECTOR_VERSION=${{ github.sha }}
-          DETECTOR_CONFIG=${{ matrix.detector_config }}
+          DETECTOR_CONFIG=epic_craterlake
           GITHUB_REPOSITORY=${{ github.repository }}
           GITHUB_SHA=${{ github.event.pull_request.head.sha || github.sha }}
-          PIPELINE_NAME=${{ github.event.pull_request.title || github.ref_name }}
+          GITHUB_PR=${{ github.event.pull_request.number }}
+          EPIC_VERSION="${{ github.event.pull_request.head.ref || github.ref_name }}"
+          PIPELINE_NAME=${{ github.repository }}: ${{ github.event.pull_request.title || github.ref_name }}
     - run: |
         gh api \
            --method POST \
@@ -452,7 +441,7 @@ jobs:
           -f state="pending" \
           -f target_url="${{ steps.trigger.outputs.web_url }}" \
           -f description="Triggered... $(TZ=America/New_York date)" \
-          -f context="eicweb/${{ matrix.benchmark_repo }} (${{ matrix.detector_config }})"
+          -f context="eicweb/eic_container"
       env:
         GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 

diff --git a/compact/tracking/tof_barrel.xml b/compact/tracking/tof_barrel.xml
@@ -68,6 +68,15 @@
     <constant name="BarrelTOF_length2"             value="BarrelTOF_length1"/>
     <constant name="BarrelTOF_length"              value="BarrelTOF_length2"/>
 
+    <constant name="BarrelTOF_Sensor_length"       value="4*cm"/>
+    <constant name="BarrelTOF_Sensor_deadspaceY"   value="0.1*cm"/>
+    <constant name="BarrelTOF_Sensor_amount"       value="64"/>
+
+    <constant name="BarrelTOF_ring_center"         value="144*cm"/>
+    <constant name="BarrelTOF_ring_width"          value="0.7*cm"/>
+    <constant name="BarrelTOF_Sensor_Center_before_ring" value="-0.5*BarrelTOF_length1+BarrelTOF_ring_center-BarrelTOF_ring_width-0.5*BarrelTOF_Sensor_length"/>
+    <constant name="BarrelTOF_First_Sensor_Center"   value="-(0.5*BarrelTOF_Sensor_amount-1)*(BarrelTOF_Sensor_length+BarrelTOF_Sensor_deadspaceY) + BarrelTOF_Sensor_Center_before_ring"/>
+
   </define>
 
   <display>
@@ -89,8 +98,8 @@
         Tracker Barrel Modules
       </comment>
       <module name="BarrelTOF_Module1" vis="TOFBarrelModuleVis">
-        <module_component name="sensor" material="Silicon" sensitive="true" width="BarrelTOF_Sensor_width" length="BarrelTOF_length1" thickness="BarrelTOF_Sensor_thickness" vis="TOFSensorVis" >
-          <position x="BarrelTOF_Sensor_position" y="0" z="0" />
+        <module_component name="sensor" material="Silicon" sensitive="true" width="BarrelTOF_Sensor_width" length="BarrelTOF_Sensor_length" thickness="BarrelTOF_Sensor_thickness" vis="TOFSensorVis" >
+                <GridSensors start_x="BarrelTOF_Sensor_position" start_y="BarrelTOF_First_Sensor_Center" start_z="0" xdist="0" ydist="BarrelTOF_Sensor_length+BarrelTOF_Sensor_deadspaceY" nx="1" ny="BarrelTOF_Sensor_amount" ny_before_ring="0.5*BarrelTOF_Sensor_amount" ring_extra_width="BarrelTOF_ring_width-2*BarrelTOF_Sensor_deadspaceY"/>
         </module_component>
         <module_component name="hybridtop" material="Kapton" sensitive="false" width="BarrelTOF_Module_width" length="BarrelTOF_length1" thickness="BarrelTOF_Hybrid_thickness" vis="TOFHybridVis" >
           <position x="BarrelTOF_Service_position" y="0" z="0" />
@@ -140,8 +149,8 @@
 
   <readouts>
     <readout name="TOFBarrelHits">
-      <segmentation type="CartesianGridXY" grid_size_x="0.1*mm" grid_size_y="1*cm" />
-      <id>system:8,layer:4,module:12,sensor:2,x:32:-16,y:-16</id>
+      <segmentation type="CartesianGridXY" grid_size_x="0.5*mm" grid_size_y="1*cm" offset_x="0.25*mm" offset_y="0.5*cm"/>
+      <id>system:8,layer:4,module:12,sensor:10,x:40:-8,y:-16</id>
     </readout>
   </readouts>