Merge pull request #685 from kutschke/GeomFileFix

Modify variant geometry files to be based on geom_common.txt
Mu2e · Jan 13, 2022 · 43be7f9 · 43be7f9
2 parents fd68554 + adaf89a
commit 43be7f9
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 6 deletions.
diff --git a/Mu2eG4/geom/geom_common_extracted.txt b/Mu2eG4/geom/geom_common_extracted.txt
@@ -1,7 +1,7 @@
 // Top level geometry file for extracted detector cosmics running with no magnetic field
 
 // Start from recent baseline geometry
-#include "Offline/Mu2eG4/geom/geom_common_current.txt"
+#include "Offline/Mu2eG4/geom/geom_common.txt"
 
 // Set the magnetic field to zero everywhere.
 #include "Offline/Mu2eG4/geom/bfgeom_no_field.txt"

diff --git a/Mu2eG4/geom/geom_common_no_ds.txt b/Mu2eG4/geom/geom_common_no_ds.txt
@@ -4,7 +4,7 @@
 // The DS field map is removed to save space
 //
 
-#include "Offline/Mu2eG4/geom/geom_2021_PhaseI.txt"
+#include "Offline/Mu2eG4/geom/geom_common.txt"
 #include "Offline/Mu2eG4/geom/bfgeom_no_ds_v01.txt"
 
 // This tells emacs to view this file in c++ mode.

diff --git a/Mu2eG4/geom/geom_common_no_field.txt b/Mu2eG4/geom/geom_common_no_field.txt
@@ -0,0 +1,11 @@
+//
+// Variant on geom_common.txt with all magnetic fields turned off.
+//
+
+#include "Offline/Mu2eG4/geom/geom_common.txt"
+#include "Offline/Mu2eG4/geom/bfgeom_no_field.txt"
+
+// This tells emacs to view this file in c++ mode.
+// Local Variables:
+// mode:c++
+// End:
diff --git a/Mu2eG4/geom/geom_common_no_tsu_ps.txt b/Mu2eG4/geom/geom_common_no_tsu_ps.txt
@@ -1,10 +1,10 @@
 //
 // Variant on geom_common.txt for production running of G4 jobs
-// in which the DS is hidden by stopping rules in G4.
-// The DS field map is removed to save space
+// in which the TSu and PS field maps are not needed.  These
+// field maps are removed to save space.
 //
 
-#include "Offline/Mu2eG4/geom/geom_2021_PhaseI.txt"
+#include "Offline/Mu2eG4/geom/geom_common.txt"
 #include "Offline/Mu2eG4/geom/bfgeom_no_tsu_ps_v01.txt"
 
 // This tells emacs to view this file in c++ mode.

diff --git a/Mu2eG4/geom/geom_common_reco.txt b/Mu2eG4/geom/geom_common_reco.txt
@@ -5,7 +5,7 @@
 // are not needed for reco.
 //
 
-#include "Offline/Mu2eG4/geom/geom_2021_PhaseI.txt"
+#include "Offline/Mu2eG4/geom/geom_common.txt"
 #include "Offline/Mu2eG4/geom/bfgeom_reco_v01.txt"
 
 // This tells emacs to view this file in c++ mode.