[oksuzian]

Summary

The two commissioning geometries from #2051 join the extracted family as versions v05 and v06. The extracted pointer moves to v06, so the extracted configs use the detectors where they are now.

 Mu2eG4/geom/
 ├── geom_common_extracted.txt          # pointer: v04 -> v06
 ├── geom_common_extracted_v04.txt      # unchanged
-├── geom_common_commissioning_v01.txt
-├── geom_common_commissioning_v02.txt
+├── geom_common_extracted_v05.txt      # was commissioning_v01: combined run 123680
+└── geom_common_extracted_v06.txt      # was commissioning_v02: runs 125470 and later
 Mu2eG4/fcl/
-├── gdmldump_commissioning_v01.fcl
-├── gdmldump_commissioning_v02.fcl
+├── gdmldump_extracted_v05.fcl
+└── gdmldump_extracted_v06.fcl

• Fixed includes. v05 and v06 include geom_common_extracted_v04.txt directly, not the geom_common_extracted.txt pointer. So the versions stay fixed, and pointing the pointer at them doesn't make an include loop.
• Same content. The renamed files keep their parameters. Only the header comments change. The v06 calorimeter comment was copied from v01, and now matches its values: the calorimeter moved 245 mm upstream, with the nominal disk separation.
• What the pointer move changes. The CRV is unchanged. Only the tracker, calorimeter, MBS and DS3 extension move. Every job that loads geom_common_extracted.txt, or Production's geom_cosmic_extracted.txt, now gets these positions:
  • Production's extracted configs;
  • the PassN CRV configs, and Tracker/TrkRecoFromDigi.fcl, which brings in Combined_Pass1;
  • the EventDisplay extracted configs;
  • the CRV, CosmicReco and DAQ extracted tests;
  • gdmldump_extracted.fcl;
  • the tracker VST geometries, which include the pointer by design.
• Why: from the #production discussion. The extracted versions already describe the KPP setup, not only the nominal train: v03 and v04 add the CRV on the hatch blocks, the G-blocks and the muon taggers. So the measured positions are the next versions of the same setup, not a second family.
• Old names removed. The commissioning names stay in the v13_41_x releases. In Offline, Production, PassN and EventNtuple, only the two gdmldump configs used them, renamed here, and Production's geom_cosmic_commissioning_v02.txt, replaced in cosmic: geom_cosmic_extracted_v06.txt replaces the commissioning wrapper, add a pinned v04 Production#593.

Evidence

The tests ran on the main CI build 78517a3, with this branch on top. Main has since gained only #2079, a magnetic-field map scaling change; the branch is rebased on it.

Before / After: resolved geometry. I printed it with services.GeometryService.printConfig : true.

file on this branch	compared with, on main	parameters	differing lines
geom_common_extracted_v05.txt	geom_common_commissioning_v01.txt	7,064	0
geom_common_extracted_v06.txt	geom_common_commissioning_v02.txt	7,064	0
geom_common_extracted.txt	geom_common_commissioning_v02.txt	7,064	0
geom_common_extracted_v04.txt	geom_common_extracted_v04.txt	7,063	0

geom_common_extracted.txt before and after differs only in these values:

parameter	before (v04)	after (v06)
tracker.z0	24171	22935
tracker.mother.z0	24175	22939
mu2e.detectorSystemZ0	24171	22935
calorimeter.caloMotherZ0	25842	25597
calorimeter.caloMotherZ1	27220	26975
calorimeter.calorimeterZFront	25843	25598
mbs.MBSCZ	29273	29028
garage.ds3UpstreamExtension	(default 0)	1236

Geant4 surface check on the same build, which includes the calorimeter update #2059:

• geom_common_extracted.txt (now v06): 9,195 volume checks, 0 overlaps.
• geom_common_extracted_v05.txt: 9,195 volume checks, 0 overlaps.

Merge Danger

Door: two-way

Reverting one line of geom_common_extracted.txt restores v04.

Blast Radius: every extracted job

• Samples simulated with the v04 positions, such as MDC2025as dts, must pin v04 when they are digitized or reconstructed again: services.GeometryService.inputFile : "Offline/Mu2eG4/geom/geom_common_extracted_v04.txt". cosmic: geom_cosmic_extracted_v06.txt replaces the commissioning wrapper, add a pinned v04 Production#593 adds the cosmic wrapper geom_cosmic_extracted_v04.txt for them.
• Data from run 123680 needs v05 set explicitly.
• Merge order: merge together with cosmic: geom_cosmic_extracted_v06.txt replaces the commissioning wrapper, add a pinned v04 Production#593. That PR replaces Production's wrapper for the old geom_common_commissioning_v02.txt.

🤖 Generated with Claude Code

https://claude.ai/code/session_014osFTVFtXjUZ6SdxpwLCHo

[FNALbuild]

Hi @oksuzian,
You have proposed changes to files in these packages:

• Mu2eG4

which require these tests: build.

@Mu2e/fnalbuild-users, @Mu2e/write have access to CI actions on main.

⌛ The following tests have been triggered for 792c73b: build (Build queue - API unavailable)

About FNALbuild. Code review on Mu2e/Offline.

[FNALbuild]

☀️ The build tests passed at 792c73b.

Test	Result	Details
test with	✅	Command did not list any other PRs to include
merge	✅	Merged 792c73b at 97cd5c9
build (prof)	✅	Log file. Build time: 04 min 54 sec
ceSimReco	✅	Log file.
g4test_03MT	✅	Log file.
transportOnly	✅	Log file.
POT	✅	Log file.
g4study	✅	Log file.
cosmicSimReco	✅	Log file.
cosmicOffSpill	✅	Log file.
ceSteps	✅	Log file.
ceDigi	✅	Log file.
muDauSteps	✅	Log file.
ceMix	✅	Log file.
rootOverlaps	✅	Log file.
g4surfaceCheck	✅	Log file.
trigger	✅	Log file.
check_cmake	✅	Log file.
FIXME, TODO	✅	TODO (0) FIXME (0) in 0 files
clang-tidy	✅	0 errors 0 warnings
whitespace check	✅	no whitespace errors found

N.B. These results were obtained from a build of this Pull Request at 792c73b after being merged into the base branch at 97cd5c9.

For more information, please check the job page here.
Build artifacts are deleted after 5 days. If this is not desired, select Keep this build forever on the job page.