From eb09d5f68d74c91542e99a2cd4799eb8278b2981 Mon Sep 17 00:00:00 2001 From: michaelmackenzie Date: Mon, 27 Sep 2021 11:16:05 -0500 Subject: [PATCH 1/3] Add option to not build the IPA --- GeometryService/src/MECOStyleProtonAbsorberMaker.cc | 11 ++++++----- Mu2eG4/geom/geom_noIPA_common.txt | 9 +++++++++ 2 files changed, 15 insertions(+), 5 deletions(-) create mode 100644 Mu2eG4/geom/geom_noIPA_common.txt diff --git a/GeometryService/src/MECOStyleProtonAbsorberMaker.cc b/GeometryService/src/MECOStyleProtonAbsorberMaker.cc index f299415f02..be83c07e9c 100644 --- a/GeometryService/src/MECOStyleProtonAbsorberMaker.cc +++ b/GeometryService/src/MECOStyleProtonAbsorberMaker.cc @@ -132,21 +132,22 @@ namespace mu2e { // Decide which pabs will be turned on ////////////////////////////////////// - bool pabs1 = true; - bool pabs2 = true; + bool pabs1 = _config.getBool("protonabsorber.buildIPA", true); + bool pabs2 = _config.getBool("protonabsorber.buildIPA", true); bool opa1 = _config.getBool("protonabsorber.outerPA", false); bool opa2 = true; // if pabs starts from DS3 region - if (distFromTargetEnd > targetEndToDS2End) { + if (pabs1 && distFromTargetEnd > targetEndToDS2End) { pabs1 = false; } // if pabs is short enouhg to locate at DS2 region only - if (distFromTargetEnd + pabsZHalfLen*2.< targetEndToDS2End) { + if (pabs2 && distFromTargetEnd + pabsZHalfLen*2.< targetEndToDS2End) { pabs2 = false; } - if (!pabs1 && !pabs2) { + + if (!pabs1 && !pabs2 && _config.getBool("protonabsorber.buildIPA", true)) { return; } diff --git a/Mu2eG4/geom/geom_noIPA_common.txt b/Mu2eG4/geom/geom_noIPA_common.txt new file mode 100644 index 0000000000..bad1a94891 --- /dev/null +++ b/Mu2eG4/geom/geom_noIPA_common.txt @@ -0,0 +1,9 @@ +// Geometry without the IPA +#include "Offline/Mu2eG4/geom/geom_common.txt" +bool protonabsorber.buildIPA = false; +bool protonabsorber.ipa.buildSupports = false; + +// This tells emacs to view this file in c++ mode. +// Local Variables: +// mode:c++ +// End: From f925c646f9b86624ec8fd8eabf45d620ae3e3dce Mon Sep 17 00:00:00 2001 From: michaelmackenzie Date: Mon, 27 Sep 2021 11:20:10 -0500 Subject: [PATCH 2/3] Add a geometry file with the 15um Mu2e era tracker wires --- Mu2eG4/geom/geom_Mu2eTrackerStraws_common.txt | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 Mu2eG4/geom/geom_Mu2eTrackerStraws_common.txt diff --git a/Mu2eG4/geom/geom_Mu2eTrackerStraws_common.txt b/Mu2eG4/geom/geom_Mu2eTrackerStraws_common.txt new file mode 100644 index 0000000000..6a5c19b64c --- /dev/null +++ b/Mu2eG4/geom/geom_Mu2eTrackerStraws_common.txt @@ -0,0 +1,27 @@ +// Geometry using the Mu2e era tracker straws +#include "Offline/Mu2eG4/geom/geom_common.txt" + +// Mu2e era straw parameters taken from tracker_v6.txt +double tracker.strawOuterRadius = 2.5; +double tracker.strawWallThickness = 0.015; +double tracker.strawGap = 1.25; +double tracker.wireRadius = 0.0125; +string tracker.mat.strawgas = "StrawGas"; +string tracker.mat.wire = "G4_W"; +vector tracker.strawMaterials = { "G4_MYLAR", "StrawGas", "G4_W" }; +// define an inactive length at each end of every straw +double tracker.passivationMargin = -4.; +// Define the parameters of the metal coatings on the straws and wires. +double tracker.straw.wallOuterMetal.thickness = 0.00005; +string tracker.straw.wallOuterMetal.material = "G4_Al"; +double tracker.straw.wallInnerMetal1.thickness = 0.00005; +string tracker.straw.wallInnerMetal1.material = "G4_Al"; +double tracker.straw.wallInnerMetal2.thickness = 0.00002; +string tracker.straw.wallInnerMetal2.material = "G4_Au"; +double tracker.straw.wirePlate.thickness = 0.00025; +string tracker.straw.wirePlate.material = "G4_Au"; + +// This tells emacs to view this file in c++ mode. +// Local Variables: +// mode:c++ +// End: From c40586453b55c75ae636a219dd1439a9fefb8661 Mon Sep 17 00:00:00 2001 From: michaelmackenzie Date: Mon, 27 Sep 2021 12:14:25 -0500 Subject: [PATCH 3/3] Move Mu2e era straw params to separate config file --- Mu2eG4/geom/geom_Mu2eTrackerStraws_common.txt | 21 +--------------- Mu2eG4/geom/tracker_straw_params_v01.txt | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+), 20 deletions(-) create mode 100644 Mu2eG4/geom/tracker_straw_params_v01.txt diff --git a/Mu2eG4/geom/geom_Mu2eTrackerStraws_common.txt b/Mu2eG4/geom/geom_Mu2eTrackerStraws_common.txt index 6a5c19b64c..0269ee03cc 100644 --- a/Mu2eG4/geom/geom_Mu2eTrackerStraws_common.txt +++ b/Mu2eG4/geom/geom_Mu2eTrackerStraws_common.txt @@ -1,25 +1,6 @@ // Geometry using the Mu2e era tracker straws #include "Offline/Mu2eG4/geom/geom_common.txt" - -// Mu2e era straw parameters taken from tracker_v6.txt -double tracker.strawOuterRadius = 2.5; -double tracker.strawWallThickness = 0.015; -double tracker.strawGap = 1.25; -double tracker.wireRadius = 0.0125; -string tracker.mat.strawgas = "StrawGas"; -string tracker.mat.wire = "G4_W"; -vector tracker.strawMaterials = { "G4_MYLAR", "StrawGas", "G4_W" }; -// define an inactive length at each end of every straw -double tracker.passivationMargin = -4.; -// Define the parameters of the metal coatings on the straws and wires. -double tracker.straw.wallOuterMetal.thickness = 0.00005; -string tracker.straw.wallOuterMetal.material = "G4_Al"; -double tracker.straw.wallInnerMetal1.thickness = 0.00005; -string tracker.straw.wallInnerMetal1.material = "G4_Al"; -double tracker.straw.wallInnerMetal2.thickness = 0.00002; -string tracker.straw.wallInnerMetal2.material = "G4_Au"; -double tracker.straw.wirePlate.thickness = 0.00025; -string tracker.straw.wirePlate.material = "G4_Au"; +#include "Offline/Mu2eG4/geom/tracker_straw_params_v01.txt" // This tells emacs to view this file in c++ mode. // Local Variables: diff --git a/Mu2eG4/geom/tracker_straw_params_v01.txt b/Mu2eG4/geom/tracker_straw_params_v01.txt new file mode 100644 index 0000000000..d6167f66ab --- /dev/null +++ b/Mu2eG4/geom/tracker_straw_params_v01.txt @@ -0,0 +1,25 @@ +// Mu2e era straw parameters taken from tracker_v6.txt + +double tracker.strawOuterRadius = 2.5; +double tracker.strawWallThickness = 0.015; +double tracker.strawGap = 1.25; +double tracker.wireRadius = 0.0125; +string tracker.mat.strawgas = "StrawGas"; +string tracker.mat.wire = "G4_W"; +vector tracker.strawMaterials = { "G4_MYLAR", "StrawGas", "G4_W" }; +// define an inactive length at each end of every straw +double tracker.passivationMargin = -4.; +// Define the parameters of the metal coatings on the straws and wires. +double tracker.straw.wallOuterMetal.thickness = 0.00005; +string tracker.straw.wallOuterMetal.material = "G4_Al"; +double tracker.straw.wallInnerMetal1.thickness = 0.00005; +string tracker.straw.wallInnerMetal1.material = "G4_Al"; +double tracker.straw.wallInnerMetal2.thickness = 0.00002; +string tracker.straw.wallInnerMetal2.material = "G4_Au"; +double tracker.straw.wirePlate.thickness = 0.00025; +string tracker.straw.wirePlate.material = "G4_Au"; + +// This tells emacs to view this file in c++ mode. +// Local Variables: +// mode:c++ +// End: