Skip to content

Commit

Permalink
[pre-commit.ci] auto fixes from pre-commit.com hooks
Browse files Browse the repository at this point in the history 
for more information, see https://pre-commit.ci
  • Loading branch information
@pre-commit-ci
pre-commit-ci[bot] committed Oct 9, 2024
1 parent a2d3c89 commit 6fcbd30
Show file tree
Hide file tree
Showing 16 changed files with 41 additions and 41 deletions.
10 changes: 5 additions & 5 deletions compact/far_forward/roman_pots_eRD24_design.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
Roman Pots Implementation updated strawman layout (only layer materials)
Author: Alex Jentsch
Date of first commit: June 15th, 2021
Last update: Oct 8th, 2024
Last update: Oct 8th, 2024
---------------------------------
</comment>

Expand All @@ -32,14 +32,14 @@

<constant name="ForwardRomanPotStation1_insertion_intermediate" value="2.4*cm + offset_intermediate_1_RP_section"/>
<constant name="ForwardRomanPotStation2_insertion_intermediate" value="2.4*cm + offset_intermediate_1_RP_section"/>

<constant name="ForwardRomanPotStation1_insertion_intermediate_541" value="2.4*cm + offset_intermediate_2_RP_section"/>
<constant name="ForwardRomanPotStation2_insertion_intermediate_541" value="2.4*cm + offset_intermediate_2_RP_section"/>

<constant name="ForwardRomanPotStation1_insertion_outer" value="2.4*cm + offset_outer_RP_section"/>
<constant name="ForwardRomanPotStation2_insertion_outer" value="2.4*cm + offset_outer_RP_section"/>


<!-- Each module is a sandwich of 1mm aluminum, 0.3mm air, 0.3mm silicon AC-LGAD, 0.3mm inactive silicon ASIC, 0.3mm copper cooling, and 1mm aluminum -->
<!-- Vacuum is between each module -->

Expand Down Expand Up @@ -107,7 +107,7 @@
</array>
</module_assembly>
<module_assembly name="Station1Bottom">
<array nx="6" ny="3" module="ModuleRP1" width="6*ForwardRomanPot_ModuleWidth" height="3*ForwardRomanPot_ModuleHeight">
<array nx="6" ny="3" module="ModuleRP1" width="6*ForwardRomanPot_ModuleWidth" height="3*ForwardRomanPot_ModuleHeight">
<position x="6.0*ForwardRomanPot_ModuleWidth" y="-ForwardRomanPotStation1_insertion_outer"/>
</array>
<array nx="6" ny="3" module="ModuleRP1" width="6*ForwardRomanPot_ModuleWidth" height="3*ForwardRomanPot_ModuleHeight">
Expand All @@ -127,7 +127,7 @@
</array>
<array nx="1" ny="3" module="ModuleRP1" width="ForwardRomanPot_ModuleWidth" height="3*ForwardRomanPot_ModuleHeight">
<position x="-2.5*ForwardRomanPot_ModuleWidth" y="-ForwardRomanPotStation1_insertion_intermediate_541"/>
</array>
</array>
</module_assembly>

<layer id="1" vis="FFTrackerLayerVis">
Expand Down
4 changes: 2 additions & 2 deletions compact/fields/beamline_10x100.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@
<constant name="B2PF_Bmax" value="-1.74139319*tesla"/>
<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.
They are not perfectly ten-sigma for reasons of physical geometry.
</comment>

<constant name="offset_central_RP_section" value ="0.71*cm"/>
Expand Down
6 changes: 3 additions & 3 deletions compact/fields/beamline_10x110_H2.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@
<constant name="B2PF_Bmax" value="-4.7890142*tesla"/>
<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.
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>

Expand Down
2 changes: 1 addition & 1 deletion compact/fields/beamline_10x275.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@

<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.
They are not perfectly ten-sigma for reasons of physical geometry.
</comment>

<constant name="offset_central_RP_section" value ="0.27*cm"/>
Expand Down
6 changes: 3 additions & 3 deletions compact/fields/beamline_18x110_Au.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@
<constant name="B2PF_Bmax" value="-4.7890142*tesla"/>
<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.
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>

Expand Down
6 changes: 3 additions & 3 deletions compact/fields/beamline_18x110_H2.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@
<constant name="B2PF_Bmax" value="-4.7890142*tesla"/>
<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.
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>

Expand Down
6 changes: 3 additions & 3 deletions compact/fields/beamline_18x110_He3.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@
<constant name="B2PF_Bmax" value="-4.7890142*tesla"/>
<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.
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>

Expand Down
6 changes: 3 additions & 3 deletions compact/fields/beamline_18x110_Pb.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@
<constant name="B2PF_Bmax" value="-4.7890142*tesla"/>
<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.
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>

Expand Down
2 changes: 1 addition & 1 deletion compact/fields/beamline_18x275.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@

<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.
They are not perfectly ten-sigma for reasons of physical geometry.
</comment>

<constant name="offset_central_RP_section" value ="0.27*cm"/>
Expand Down
4 changes: 2 additions & 2 deletions compact/fields/beamline_5x100.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@
<constant name="B2PF_Bmax" value="-1.74139319*tesla"/>
<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.
They are not perfectly ten-sigma for reasons of physical geometry.
</comment>

<constant name="offset_central_RP_section" value ="0.71*cm"/>
Expand Down
6 changes: 3 additions & 3 deletions compact/fields/beamline_5x110_H2.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@
<constant name="B2PF_Bmax" value="-4.7890142*tesla"/>
<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.
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>

Expand Down
4 changes: 2 additions & 2 deletions compact/fields/beamline_5x41.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@
<constant name="B2PF_Bmax" value="-0.71381565*tesla"/>
<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.
They are not perfectly ten-sigma for reasons of physical geometry.
</comment>

<constant name="offset_central_RP_section" value ="2.96*cm"/>
Expand Down
6 changes: 3 additions & 3 deletions compact/fields/beamline_5x41_H2.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@
<constant name="B2PF_Bmax" value="-4.7890142*tesla"/>
<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.
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>

Expand Down
6 changes: 3 additions & 3 deletions compact/fields/beamline_5x41_He3.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@
<constant name="B2PF_Bmax" value="-4.7890142*tesla"/>
<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.
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>

Expand Down
6 changes: 3 additions & 3 deletions compact/fields/beamline_5x41_He4.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@
<constant name="B2PF_Bmax" value="-4.7890142*tesla"/>
<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.
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>

Expand Down
2 changes: 1 addition & 1 deletion src/ForwardRomanPot_geo.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
if (x_pos) {
arr_pos += Position(x_pos.x(0), x_pos.y(0), x_pos.z(0));
}

DetElement mod_de(ma_de, ma_name + std::string("_mod") + std::to_string(i_mod), i_mod);
pv = ma_vol.placeVolume(arr_vol, arr_pos);
pv.addPhysVolID("module", i_mod);
Expand Down

0 comments on commit 6fcbd30

Please sign in to comment.