From 792c73b9e003a58c3277f934dbbbfba60dd8eaea Mon Sep 17 00:00:00 2001 From: Yuri Oksuzian Date: Thu, 29 Oct 2026 15:40:16 -0500 Subject: [PATCH] Extracted geometry: commissioning v01/v02 become extracted v05/v06, default v06 geom_common_commissioning_v01.txt (run 123680) and _v02.txt (runs 125470 and later) are renamed geom_common_extracted_v05.txt and _v06.txt, so the KPP setups form one versioned family. Each now includes geom_common_extracted_v04.txt directly instead of the geom_common_extracted.txt pointer, which keeps the versions fixed and avoids an include loop. The pointer geom_common_extracted.txt moves from v04 to v06, the detectors where they are now; the CRV is unchanged, only the tracker, calorimeter, MBS and DS3 extension move. The v06 calorimeter comment, copied from v01, now matches its values. The gdmldump configs are renamed with the files. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_014osFTVFtXjUZ6SdxpwLCHo --- ...ommissioning_v01.fcl => gdmldump_extracted_v05.fcl} | 4 ++-- ...ommissioning_v02.fcl => gdmldump_extracted_v06.fcl} | 4 ++-- Mu2eG4/geom/geom_common_extracted.txt | 2 +- ...issioning_v01.txt => geom_common_extracted_v05.txt} | 6 +++--- ...issioning_v02.txt => geom_common_extracted_v06.txt} | 10 +++++----- 5 files changed, 13 insertions(+), 13 deletions(-) rename Mu2eG4/fcl/{gdmldump_commissioning_v01.fcl => gdmldump_extracted_v05.fcl} (50%) rename Mu2eG4/fcl/{gdmldump_commissioning_v02.fcl => gdmldump_extracted_v06.fcl} (50%) rename Mu2eG4/geom/{geom_common_commissioning_v01.txt => geom_common_extracted_v05.txt} (77%) rename Mu2eG4/geom/{geom_common_commissioning_v02.txt => geom_common_extracted_v06.txt} (66%) diff --git a/Mu2eG4/fcl/gdmldump_commissioning_v01.fcl b/Mu2eG4/fcl/gdmldump_extracted_v05.fcl similarity index 50% rename from Mu2eG4/fcl/gdmldump_commissioning_v01.fcl rename to Mu2eG4/fcl/gdmldump_extracted_v05.fcl index 05ee3807d4..a76ddb3f36 100644 --- a/Mu2eG4/fcl/gdmldump_commissioning_v01.fcl +++ b/Mu2eG4/fcl/gdmldump_extracted_v05.fcl @@ -1,3 +1,3 @@ #include "Offline/Mu2eG4/fcl/gdmldump.fcl" -services.GeometryService.inputFile : "Offline/Mu2eG4/geom/geom_common_commissioning_v01.txt" -physics.producers.g4run.debug.GDMLFileName: "mu2e_commissioning_v01.gdml" +services.GeometryService.inputFile : "Offline/Mu2eG4/geom/geom_common_extracted_v05.txt" +physics.producers.g4run.debug.GDMLFileName: "mu2e_extracted_v05.gdml" diff --git a/Mu2eG4/fcl/gdmldump_commissioning_v02.fcl b/Mu2eG4/fcl/gdmldump_extracted_v06.fcl similarity index 50% rename from Mu2eG4/fcl/gdmldump_commissioning_v02.fcl rename to Mu2eG4/fcl/gdmldump_extracted_v06.fcl index c0593d1f58..b2d49e6a81 100644 --- a/Mu2eG4/fcl/gdmldump_commissioning_v02.fcl +++ b/Mu2eG4/fcl/gdmldump_extracted_v06.fcl @@ -1,3 +1,3 @@ #include "Offline/Mu2eG4/fcl/gdmldump.fcl" -services.GeometryService.inputFile : "Offline/Mu2eG4/geom/geom_common_commissioning_v02.txt" -physics.producers.g4run.debug.GDMLFileName: "mu2e_commissioning_v02.gdml" +services.GeometryService.inputFile : "Offline/Mu2eG4/geom/geom_common_extracted_v06.txt" +physics.producers.g4run.debug.GDMLFileName: "mu2e_extracted_v06.gdml" diff --git a/Mu2eG4/geom/geom_common_extracted.txt b/Mu2eG4/geom/geom_common_extracted.txt index cc3545d36c..ec818deea1 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 -#include "Offline/Mu2eG4/geom/geom_common_extracted_v04.txt" +#include "Offline/Mu2eG4/geom/geom_common_extracted_v06.txt" diff --git a/Mu2eG4/geom/geom_common_commissioning_v01.txt b/Mu2eG4/geom/geom_common_extracted_v05.txt similarity index 77% rename from Mu2eG4/geom/geom_common_commissioning_v01.txt rename to Mu2eG4/geom/geom_common_extracted_v05.txt index 44e1c4b62a..b99365a979 100644 --- a/Mu2eG4/geom/geom_common_commissioning_v01.txt +++ b/Mu2eG4/geom/geom_common_extracted_v05.txt @@ -1,8 +1,8 @@ -// Top level geometry file for commissioning running with tracker and calorimeter positions adjusted -// for combined run 123680. +// Extracted geometry v05: the KPP setup of geom_common_extracted_v04.txt with the tracker and calorimeter +// at their positions in combined run 123680 (formerly geom_common_commissioning_v01.txt). // Tracker position from laser tracker (Dylan Palo) and tracker-crv matching (docdb-57589) // Calorimeter position hand tuned to correct mean trkcalohit.cdepth -#include "Offline/Mu2eG4/geom/geom_common_extracted.txt" +#include "Offline/Mu2eG4/geom/geom_common_extracted_v04.txt" // Extend fake DS3 volume to contain detector train double garage.ds3UpstreamExtension = 1236.0; diff --git a/Mu2eG4/geom/geom_common_commissioning_v02.txt b/Mu2eG4/geom/geom_common_extracted_v06.txt similarity index 66% rename from Mu2eG4/geom/geom_common_commissioning_v02.txt rename to Mu2eG4/geom/geom_common_extracted_v06.txt index 8bc7e4a588..4ad78513e9 100644 --- a/Mu2eG4/geom/geom_common_commissioning_v02.txt +++ b/Mu2eG4/geom/geom_common_extracted_v06.txt @@ -1,9 +1,9 @@ -// Top level geometry file for commissioning running with tracker and calorimeter positions adjusted -// for combined run 125470. +// Extracted geometry v06: the KPP setup of geom_common_extracted_v04.txt with the tracker and calorimeter +// at their positions in combined runs 125470 and later (formerly geom_common_commissioning_v02.txt). // Tracker position from laser tracker (Dylan Palo) and tracker-crv matching (docdb-57589) // Calorimeter position hand tuned to correct mean trkcalohit.cdepth -// compared to v01, disk 0 shifted to nominal distance from disk 1 -#include "Offline/Mu2eG4/geom/geom_common_extracted.txt" +// compared to v05, disk 0 shifted to nominal distance from disk 1 +#include "Offline/Mu2eG4/geom/geom_common_extracted_v04.txt" // Extend fake DS3 volume to contain detector train double garage.ds3UpstreamExtension = 1236.0; @@ -13,7 +13,7 @@ double tracker.mother.z0 = 22939.0; double tracker.z0 = 22935.0; double mu2e.detectorSystemZ0 = 22935.; -// disk 0 shifted upstream 701 mm, disk separation increased by 456 mm +// calorimeter shifted upstream 245 mm, nominal disk separation double calorimeter.caloMotherZ0 = 25597.0; double calorimeter.caloMotherZ1 = 26975.0; double calorimeter.calorimeterZFront = 25598.0;