From 4ea14bb70ed73ae323de529f48963ef22951ad84 Mon Sep 17 00:00:00 2001 From: David Nathan Brown Date: Tue, 30 Sep 2025 16:45:54 -0700 Subject: [PATCH 1/3] Update to MDC20205, add legacy MDC2020 geometry --- Mu2eG4/geom/geom_common.txt | 2 +- Mu2eG4/geom/geom_common_MDC2020.txt | 4 ++++ Mu2eG4/geom/geom_common_current.txt | 2 +- Mu2eG4/geom/geom_common_extracted.txt | 4 ++-- Mu2eG4/geom/geom_common_extracted_MDC2020.txt | 4 ++++ 5 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 Mu2eG4/geom/geom_common_MDC2020.txt create mode 100644 Mu2eG4/geom/geom_common_extracted_MDC2020.txt diff --git a/Mu2eG4/geom/geom_common.txt b/Mu2eG4/geom/geom_common.txt index 690e02ac02..648a3268fc 100644 --- a/Mu2eG4/geom/geom_common.txt +++ b/Mu2eG4/geom/geom_common.txt @@ -3,7 +3,7 @@ // The file that is included will be time dependent. // -#include "Offline/Mu2eG4/geom/geom_2021_PhaseI_v03.txt" +#include "Offline/Mu2eG4/geom/geom_run1_a.txt" // This tells emacs to view this file in c++ mode. // Local Variables: diff --git a/Mu2eG4/geom/geom_common_MDC2020.txt b/Mu2eG4/geom/geom_common_MDC2020.txt new file mode 100644 index 0000000000..828c461819 --- /dev/null +++ b/Mu2eG4/geom/geom_common_MDC2020.txt @@ -0,0 +1,4 @@ +// +// Geometry used for MDC2020 simulations +// +#include "Offline/Mu2eG4/geom/geom_2021_PhaseI_v03.txt" diff --git a/Mu2eG4/geom/geom_common_current.txt b/Mu2eG4/geom/geom_common_current.txt index 32afe64c71..62269e3ab5 100644 --- a/Mu2eG4/geom/geom_common_current.txt +++ b/Mu2eG4/geom/geom_common_current.txt @@ -2,7 +2,7 @@ // and features that will eventually become default - // the latest for testing.. -#include "Offline/Mu2eG4/geom/geom_2021_PhaseI_v03.txt" +#include "Offline/Mu2eG4/geom/geom_common.txt" // This tells emacs to view this file in c++ mode. // Local Variables: diff --git a/Mu2eG4/geom/geom_common_extracted.txt b/Mu2eG4/geom/geom_common_extracted.txt index cac286390c..af19a346aa 100644 --- a/Mu2eG4/geom/geom_common_extracted.txt +++ b/Mu2eG4/geom/geom_common_extracted.txt @@ -1,2 +1,2 @@ -//Extracted position for the detector KPP - original/old v01 version -#include "Offline/Mu2eG4/geom/geom_common_extracted_v01.txt" +//Extracted position for the detector KPP +#include "Offline/Mu2eG4/geom/geom_common_extracted_v02.txt" diff --git a/Mu2eG4/geom/geom_common_extracted_MDC2020.txt b/Mu2eG4/geom/geom_common_extracted_MDC2020.txt new file mode 100644 index 0000000000..4d2328693c --- /dev/null +++ b/Mu2eG4/geom/geom_common_extracted_MDC2020.txt @@ -0,0 +1,4 @@ +// +// Extracted position used for MDC2020 simulations +// +#include "Offline/Mu2eG4/geom/geom_common_extracted_v01.txt" From 5e9333f90c116d3a98305e931416b1c92f8870b5 Mon Sep 17 00:00:00 2001 From: David Nathan Brown Date: Tue, 7 Oct 2025 09:56:37 -0700 Subject: [PATCH 2/3] Revert to MDC2020 geometry temporarily --- Mu2eG4/geom/geom_common.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mu2eG4/geom/geom_common.txt b/Mu2eG4/geom/geom_common.txt index 648a3268fc..690e02ac02 100644 --- a/Mu2eG4/geom/geom_common.txt +++ b/Mu2eG4/geom/geom_common.txt @@ -3,7 +3,7 @@ // The file that is included will be time dependent. // -#include "Offline/Mu2eG4/geom/geom_run1_a.txt" +#include "Offline/Mu2eG4/geom/geom_2021_PhaseI_v03.txt" // This tells emacs to view this file in c++ mode. // Local Variables: From c0458192ebb62e853327f401fbe7974e34f6d093 Mon Sep 17 00:00:00 2001 From: David Nathan Brown Date: Tue, 7 Oct 2025 10:05:23 -0700 Subject: [PATCH 3/3] Advance default geom to run1_a --- Mu2eG4/geom/geom_common.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mu2eG4/geom/geom_common.txt b/Mu2eG4/geom/geom_common.txt index 690e02ac02..215133abce 100644 --- a/Mu2eG4/geom/geom_common.txt +++ b/Mu2eG4/geom/geom_common.txt @@ -3,7 +3,7 @@ // The file that is included will be time dependent. // -#include "Offline/Mu2eG4/geom/geom_2021_PhaseI_v03.txt" +#include "Offline/Mu2eG4/geom/geom_run1_a.txt // This tells emacs to view this file in c++ mode. // Local Variables: