From b139c79a2406ee214593c59603c895ef1b50527e Mon Sep 17 00:00:00 2001
From: Rob Kutschke <kutschke@fnal.gov>
Date: Thu, 13 Jan 2022 13:51:47 -0600
Subject: [PATCH 1/4] Modify variant geometry files to be based on
 geom_common.txt, not a named file.

---
 Mu2eG4/geom/geom_common_no_ds.txt     | 2 +-
 Mu2eG4/geom/geom_common_no_tsu_ps.txt | 2 +-
 Mu2eG4/geom/geom_common_reco.txt      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Mu2eG4/geom/geom_common_no_ds.txt b/Mu2eG4/geom/geom_common_no_ds.txt
index 223a8c677a..381f2f32f9 100644
--- 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_tsu_ps.txt b/Mu2eG4/geom/geom_common_no_tsu_ps.txt
index ba74540730..6c3d0e0524 100644
--- a/Mu2eG4/geom/geom_common_no_tsu_ps.txt
+++ b/Mu2eG4/geom/geom_common_no_tsu_ps.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_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
index 5c1d3338f8..6a5e874c97 100644
--- 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.

From 1f03837cd3d58431a22ee990f1453f8d83ca4a0b Mon Sep 17 00:00:00 2001
From: Rob Kutschke <kutschke@fnal.gov>
Date: Thu, 13 Jan 2022 14:31:21 -0600
Subject: [PATCH 2/4] Fix incorrect comment.

---
 Mu2eG4/geom/geom_common_no_tsu_ps.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Mu2eG4/geom/geom_common_no_tsu_ps.txt b/Mu2eG4/geom/geom_common_no_tsu_ps.txt
index 6c3d0e0524..159c9afd13 100644
--- a/Mu2eG4/geom/geom_common_no_tsu_ps.txt
+++ b/Mu2eG4/geom/geom_common_no_tsu_ps.txt
@@ -1,7 +1,7 @@
 //
 // 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_common.txt"

From 49e0aece756e8cf96974d73a332d3787ed4e6dd0 Mon Sep 17 00:00:00 2001
From: Rob Kutschke <kutschke@fnal.gov>
Date: Thu, 13 Jan 2022 16:14:51 -0600
Subject: [PATCH 3/4] First version of a standard no field geometry.

---
 Mu2eG4/geom/geom_common_no_field.txt | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 Mu2eG4/geom/geom_common_no_field.txt

diff --git a/Mu2eG4/geom/geom_common_no_field.txt b/Mu2eG4/geom/geom_common_no_field.txt
new file mode 100644
index 0000000000..26b16877a1
--- /dev/null
+++ 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:

From adaf89a09044f15f693f3a6a2540b0c650286f81 Mon Sep 17 00:00:00 2001
From: Rob Kutschke <kutschke@fnal.gov>
Date: Thu, 13 Jan 2022 16:16:40 -0600
Subject: [PATCH 4/4] Correct the base geometry to geom_common, not
 geom_common_current.

---
 Mu2eG4/geom/geom_common_extracted.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Mu2eG4/geom/geom_common_extracted.txt b/Mu2eG4/geom/geom_common_extracted.txt
index 32527a8542..3e0a04fa99 100644
--- 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"