diff --git a/compact/far_forward/roman_pots_eRD24_design.xml b/compact/far_forward/roman_pots_eRD24_design.xml index 4795bf5f9..ea301ec34 100644 --- a/compact/far_forward/roman_pots_eRD24_design.xml +++ b/compact/far_forward/roman_pots_eRD24_design.xml @@ -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 --------------------------------- @@ -32,14 +32,14 @@ - + - + @@ -107,7 +107,7 @@ - + @@ -127,7 +127,7 @@ - + diff --git a/compact/fields/beamline_10x100.xml b/compact/fields/beamline_10x100.xml index 07c599c87..174e6cbea 100644 --- a/compact/fields/beamline_10x100.xml +++ b/compact/fields/beamline_10x100.xml @@ -53,10 +53,10 @@ - + 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. diff --git a/compact/fields/beamline_10x110_H2.xml b/compact/fields/beamline_10x110_H2.xml index 7ca3921b4..47f6eee52 100644 --- a/compact/fields/beamline_10x110_H2.xml +++ b/compact/fields/beamline_10x110_H2.xml @@ -54,11 +54,11 @@ - + 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). diff --git a/compact/fields/beamline_10x275.xml b/compact/fields/beamline_10x275.xml index 48beffe7f..e8a790ecb 100644 --- a/compact/fields/beamline_10x275.xml +++ b/compact/fields/beamline_10x275.xml @@ -56,7 +56,7 @@ 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. diff --git a/compact/fields/beamline_18x110_Au.xml b/compact/fields/beamline_18x110_Au.xml index 414b5887d..78800577e 100644 --- a/compact/fields/beamline_18x110_Au.xml +++ b/compact/fields/beamline_18x110_Au.xml @@ -54,11 +54,11 @@ - + 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). diff --git a/compact/fields/beamline_18x110_H2.xml b/compact/fields/beamline_18x110_H2.xml index 8c602eda4..23c5b4c90 100644 --- a/compact/fields/beamline_18x110_H2.xml +++ b/compact/fields/beamline_18x110_H2.xml @@ -54,11 +54,11 @@ - + 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). diff --git a/compact/fields/beamline_18x110_He3.xml b/compact/fields/beamline_18x110_He3.xml index ba529a2a7..899b830eb 100644 --- a/compact/fields/beamline_18x110_He3.xml +++ b/compact/fields/beamline_18x110_He3.xml @@ -54,11 +54,11 @@ - + 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). diff --git a/compact/fields/beamline_18x110_Pb.xml b/compact/fields/beamline_18x110_Pb.xml index e8f334de3..eee1d8ea4 100644 --- a/compact/fields/beamline_18x110_Pb.xml +++ b/compact/fields/beamline_18x110_Pb.xml @@ -54,11 +54,11 @@ - + 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). diff --git a/compact/fields/beamline_18x275.xml b/compact/fields/beamline_18x275.xml index 682e5c5ae..3e1f2c634 100644 --- a/compact/fields/beamline_18x275.xml +++ b/compact/fields/beamline_18x275.xml @@ -57,7 +57,7 @@ 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. diff --git a/compact/fields/beamline_5x100.xml b/compact/fields/beamline_5x100.xml index 27ea19ec7..0a35ef845 100644 --- a/compact/fields/beamline_5x100.xml +++ b/compact/fields/beamline_5x100.xml @@ -53,10 +53,10 @@ - + 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. diff --git a/compact/fields/beamline_5x110_H2.xml b/compact/fields/beamline_5x110_H2.xml index 2ac9fe92f..7669f7f11 100644 --- a/compact/fields/beamline_5x110_H2.xml +++ b/compact/fields/beamline_5x110_H2.xml @@ -54,11 +54,11 @@ - + 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). diff --git a/compact/fields/beamline_5x41.xml b/compact/fields/beamline_5x41.xml index dd78522cf..1b8a4f0d1 100644 --- a/compact/fields/beamline_5x41.xml +++ b/compact/fields/beamline_5x41.xml @@ -53,10 +53,10 @@ - + 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. diff --git a/compact/fields/beamline_5x41_H2.xml b/compact/fields/beamline_5x41_H2.xml index 13840db4c..101fb0ac4 100644 --- a/compact/fields/beamline_5x41_H2.xml +++ b/compact/fields/beamline_5x41_H2.xml @@ -54,11 +54,11 @@ - + 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). diff --git a/compact/fields/beamline_5x41_He3.xml b/compact/fields/beamline_5x41_He3.xml index 12af34aea..b7ada8161 100644 --- a/compact/fields/beamline_5x41_He3.xml +++ b/compact/fields/beamline_5x41_He3.xml @@ -54,11 +54,11 @@ - + 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). diff --git a/compact/fields/beamline_5x41_He4.xml b/compact/fields/beamline_5x41_He4.xml index afdab412a..21e8abf83 100644 --- a/compact/fields/beamline_5x41_He4.xml +++ b/compact/fields/beamline_5x41_He4.xml @@ -54,11 +54,11 @@ - + 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). diff --git a/src/ForwardRomanPot_geo.cpp b/src/ForwardRomanPot_geo.cpp index 3d20c209e..052178b3d 100644 --- a/src/ForwardRomanPot_geo.cpp +++ b/src/ForwardRomanPot_geo.cpp @@ -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);