From 0448a447ffcd927def3db4eab703ef17f9d1e3b4 Mon Sep 17 00:00:00 2001 From: David Nathan Brown Date: Tue, 7 Oct 2025 10:11:35 -0700 Subject: [PATCH 01/17] Set geometry default to MDC2020 (legacy) --- JobConfig/common/epilog.fcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/JobConfig/common/epilog.fcl b/JobConfig/common/epilog.fcl index 3d48940a..88781162 100644 --- a/JobConfig/common/epilog.fcl +++ b/JobConfig/common/epilog.fcl @@ -7,4 +7,4 @@ services.scheduler.wantSummary: true #show summary of error logger services.message.destinations.log.outputStatistics : true # define the default geometry. This overrides the Offline default -services.GeometryService.inputFile: "Offline/Mu2eG4/geom/geom_common.txt" +services.GeometryService.inputFile: "Offline/Mu2eG4/geom/geom_common_MDC2020.txt" From 430cf24122388d5832bca8c110ac5298aa07fc98 Mon Sep 17 00:00:00 2001 From: David Nathan Brown Date: Tue, 7 Oct 2025 11:13:01 -0700 Subject: [PATCH 02/17] Nest extracted config so it can be overriden in 1 spot. Set extracted for this branch to MDC2020 --- JobConfig/common/epilog_Extracted.fcl | 4 ++++ JobConfig/cosmic/ExtractedCORSIKA.fcl | 3 +-- JobConfig/cosmic/ExtractedCRY.fcl | 3 +-- JobConfig/cosmic/geom_cosmic_extracted.txt | 5 +---- JobConfig/digitize/Extracted.fcl | 2 +- JobConfig/reco/Extracted.fcl | 2 +- JobConfig/recoMC/Extracted.fcl | 4 ++-- 7 files changed, 11 insertions(+), 12 deletions(-) create mode 100644 JobConfig/common/epilog_Extracted.fcl diff --git a/JobConfig/common/epilog_Extracted.fcl b/JobConfig/common/epilog_Extracted.fcl new file mode 100644 index 00000000..7f36cfcf --- /dev/null +++ b/JobConfig/common/epilog_Extracted.fcl @@ -0,0 +1,4 @@ +# Overrides for extracted +services.GeometryService.inputFile: "Production/JobConfig/cosmic/geom_cosmic_extracted.txt" +services.GeometryService.bFieldFile: "Offline/Mu2eG4/geom/bfgeom_no_field.txt" + diff --git a/JobConfig/cosmic/ExtractedCORSIKA.fcl b/JobConfig/cosmic/ExtractedCORSIKA.fcl index 12fce0b9..dcbfd33b 100644 --- a/JobConfig/cosmic/ExtractedCORSIKA.fcl +++ b/JobConfig/cosmic/ExtractedCORSIKA.fcl @@ -12,5 +12,4 @@ physics.producers.generate : { targetBoxYmax : 9880 } outputs.PrimaryOutput.fileName : "dts.owner.CosmicCORSIKAExtracted.version.sequencer.art" -services.GeometryService.inputFile: "Production/JobConfig/cosmic/geom_cosmic_extracted.txt" -services.GeometryService.bFieldFile: "Offline/Mu2eG4/geom/bfgeom_no_field.txt" +#include "Production/JobConfig/common/epilog_Extracted.fcl" diff --git a/JobConfig/cosmic/ExtractedCRY.fcl b/JobConfig/cosmic/ExtractedCRY.fcl index 686fef8d..5b2263d0 100644 --- a/JobConfig/cosmic/ExtractedCRY.fcl +++ b/JobConfig/cosmic/ExtractedCRY.fcl @@ -7,9 +7,8 @@ physics.producers.generate : { inputFile : "Production/JobConfig/cosmic/extractedCRYconfig.txt" } outputs.PrimaryOutput.fileName : "dts.owner.CosmicCRYExtracted.version.sequencer.art" -services.GeometryService.inputFile: "Production/JobConfig/cosmic/geom_cosmic_extracted.txt" -services.GeometryService.bFieldFile: "Offline/Mu2eG4/geom/bfgeom_no_field.txt" physics.filters.PrimaryFilter.CrvSteps: [ "CrvSteps" ] physics.producers.g4run.physics.minRangeCut : 10 physics.producers.g4run.physics.minRangeRegionCuts: { CalorimeterMother : 0.1 TrackerMother : 0.001 CRSmother_CRV_EX : 0.1 CRSmother_CRV_T1: 0.1 CRSmother_CRV_T2: 0.1 garageFakeDS3Vacuum: 0.01} // {RegionName : mm } physics.producers.g4run.TrajectoryControl.defaultMinPointDistance: 15 +#include "Production/JobConfig/common/epilog_Extracted.fcl" diff --git a/JobConfig/cosmic/geom_cosmic_extracted.txt b/JobConfig/cosmic/geom_cosmic_extracted.txt index dd586f8d..4f6179d6 100644 --- a/JobConfig/cosmic/geom_cosmic_extracted.txt +++ b/JobConfig/cosmic/geom_cosmic_extracted.txt @@ -1,7 +1,4 @@ -#include "Offline/Mu2eG4/geom/geom_common_extracted.txt" - -// Cosmis s1 samples for CD3 were generated with the TDR target geometry. -// Keep using it for the subsequent stages. +#include "Offline/Mu2eG4/geom/geom_common_extracted_MDC2020.txt" double world.minimalMargin.xmin = 500000; double world.minimalMargin.xmax = 500000; diff --git a/JobConfig/digitize/Extracted.fcl b/JobConfig/digitize/Extracted.fcl index bb7b7b31..e2d33634 100644 --- a/JobConfig/digitize/Extracted.fcl +++ b/JobConfig/digitize/Extracted.fcl @@ -1,6 +1,6 @@ # configure Extracted digitization #include "Production/JobConfig/digitize/NoField.fcl" # use extracted geometry -services.GeometryService.inputFile: "Offline/Mu2eG4/geom/geom_common_extracted.txt" +#include "Production/JobConfig/common/epilog_Extracted.fcl" # override CRV lookup tables, photon yields, etc. for the extracted position #include "Offline/CRVResponse/fcl/epilog_extracted.fcl" diff --git a/JobConfig/reco/Extracted.fcl b/JobConfig/reco/Extracted.fcl index 02e0b5dd..41c85089 100644 --- a/JobConfig/reco/Extracted.fcl +++ b/JobConfig/reco/Extracted.fcl @@ -2,6 +2,6 @@ # Extracted = NoField with shifted geometry # #include "Production/JobConfig/reco/NoField.fcl" -services.GeometryService.inputFile: "Offline/Mu2eG4/geom/geom_common_extracted.txt" +#include "Production/JobConfig/common/epilog_Extracted.fcl" physics.producers.KKLine.ModuleSettings.SampleSurfaces : [ @sequence::physics.producers.KKLine.ModuleSettings.SampleSurfaces, "TCRV" ] #temporary until extrapolation is working #include "Offline/CRVReco/fcl/epilog_extracted.fcl" diff --git a/JobConfig/recoMC/Extracted.fcl b/JobConfig/recoMC/Extracted.fcl index fb1627f6..41c85089 100644 --- a/JobConfig/recoMC/Extracted.fcl +++ b/JobConfig/recoMC/Extracted.fcl @@ -1,7 +1,7 @@ # # Extracted = NoField with shifted geometry # -#include "Production/JobConfig/recoMC/NoField.fcl" -services.GeometryService.inputFile: "Offline/Mu2eG4/geom/geom_common_extracted.txt" +#include "Production/JobConfig/reco/NoField.fcl" +#include "Production/JobConfig/common/epilog_Extracted.fcl" physics.producers.KKLine.ModuleSettings.SampleSurfaces : [ @sequence::physics.producers.KKLine.ModuleSettings.SampleSurfaces, "TCRV" ] #temporary until extrapolation is working #include "Offline/CRVReco/fcl/epilog_extracted.fcl" From f77942652b2b800337cb6c38fcbbc776d4f53e2b Mon Sep 17 00:00:00 2001 From: David Nathan Brown Date: Wed, 8 Oct 2025 21:49:53 -0700 Subject: [PATCH 03/17] Fix typo --- JobConfig/recoMC/Extracted.fcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/JobConfig/recoMC/Extracted.fcl b/JobConfig/recoMC/Extracted.fcl index 41c85089..9d4bf356 100644 --- a/JobConfig/recoMC/Extracted.fcl +++ b/JobConfig/recoMC/Extracted.fcl @@ -1,7 +1,7 @@ # # Extracted = NoField with shifted geometry # -#include "Production/JobConfig/reco/NoField.fcl" +#include "Production/JobConfig/recoMC/NoField.fcl" #include "Production/JobConfig/common/epilog_Extracted.fcl" physics.producers.KKLine.ModuleSettings.SampleSurfaces : [ @sequence::physics.producers.KKLine.ModuleSettings.SampleSurfaces, "TCRV" ] #temporary until extrapolation is working #include "Offline/CRVReco/fcl/epilog_extracted.fcl" From bd3f3cbb781a0d814329662220b1080df7d9dbee Mon Sep 17 00:00:00 2001 From: David Nathan Brown Date: Thu, 16 Oct 2025 13:21:21 -0500 Subject: [PATCH 04/17] Make config explicit for MDC2020 --- JobConfig/digitize/prolog.fcl | 2 +- JobConfig/pileup/prolog.fcl | 4 ++-- JobConfig/primary/prolog.fcl | 2 +- JobConfig/reco/prolog.fcl | 2 +- JobConfig/recoMC/prolog.fcl | 2 +- Validation/ceDigi.fcl | 2 +- Validation/ceSimReco.fcl | 4 ++-- Validation/ceSteps.fcl | 2 +- Validation/muDauSteps.fcl | 2 +- Validation/potSim.fcl | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/JobConfig/digitize/prolog.fcl b/JobConfig/digitize/prolog.fcl index cab349f0..f0571863 100644 --- a/JobConfig/digitize/prolog.fcl +++ b/JobConfig/digitize/prolog.fcl @@ -6,7 +6,7 @@ #include "Offline/fcl/standardServices.fcl" #include "Offline/TrackerMC/fcl/prolog.fcl" #include "Offline/CaloMC/fcl/prolog.fcl" -#include "Offline/CRVResponse/fcl/prolog.fcl" +#include "Offline/CRVResponse/fcl/prolog_v11.fcl" #include "Offline/Filters/fcl/prolog.fcl" #include "Offline/Compression/fcl/prolog.fcl" #include "Offline/CommonMC/fcl/prolog.fcl" diff --git a/JobConfig/pileup/prolog.fcl b/JobConfig/pileup/prolog.fcl index ecabeabb..39108405 100644 --- a/JobConfig/pileup/prolog.fcl +++ b/JobConfig/pileup/prolog.fcl @@ -3,7 +3,7 @@ # #include "Offline/TrackerMC/fcl/prolog.fcl" #include "Offline/CaloMC/fcl/prolog.fcl" -#include "Offline/CRVResponse/fcl/prolog.fcl" +#include "Offline/CRVResponse/fcl/prolog_v11.fcl" #include "Offline/Filters/fcl/prolog.fcl" #include "Offline/Compression/fcl/prolog.fcl" #include "Production/JobConfig/beam/prolog.fcl" @@ -344,4 +344,4 @@ Pileup.filters.DetStepFilter : { } } -END_PROLOG \ No newline at end of file +END_PROLOG diff --git a/JobConfig/primary/prolog.fcl b/JobConfig/primary/prolog.fcl index 3dd9264c..ce0474d3 100644 --- a/JobConfig/primary/prolog.fcl +++ b/JobConfig/primary/prolog.fcl @@ -3,7 +3,7 @@ # #include "Offline/TrackerMC/fcl/prolog.fcl" #include "Offline/CaloMC/fcl/prolog.fcl" -#include "Offline/CRVResponse/fcl/prolog.fcl" +#include "Offline/CRVResponse/fcl/prolog_v11.fcl" #include "Offline/Filters/fcl/prolog.fcl" #include "Offline/Compression/fcl/prolog.fcl" #include "Offline/CommonMC/fcl/prolog.fcl" diff --git a/JobConfig/reco/prolog.fcl b/JobConfig/reco/prolog.fcl index e874f0d4..d68d0df3 100644 --- a/JobConfig/reco/prolog.fcl +++ b/JobConfig/reco/prolog.fcl @@ -9,7 +9,7 @@ #include "Offline/CaloReco/fcl/prolog.fcl" #include "Offline/CaloCluster/fcl/prolog.fcl" #include "Offline/CalPatRec/fcl/prolog.fcl" -#include "Offline/CRVReco/fcl/prolog.fcl" +#include "Offline/CRVReco/fcl/prolog_v11.fcl" #include "Offline/CosmicReco/fcl/prolog.fcl" #include "Offline/Filters/fcl/prolog.fcl" # diff --git a/JobConfig/recoMC/prolog.fcl b/JobConfig/recoMC/prolog.fcl index 2888b5ee..fc8f2e2d 100644 --- a/JobConfig/recoMC/prolog.fcl +++ b/JobConfig/recoMC/prolog.fcl @@ -4,7 +4,7 @@ #include "Production/JobConfig/reco/prolog.fcl" #include "Offline/CommonMC/fcl/prolog.fcl" #include "Offline/CaloMC/fcl/prolog.fcl" -#include "Offline/CRVResponse/fcl/prolog.fcl" +#include "Offline/CRVResponse/fcl/prolog_v11.fcl" # BEGIN_PROLOG # add MC-specific producers diff --git a/Validation/ceDigi.fcl b/Validation/ceDigi.fcl index b7a67970..b8b490ae 100644 --- a/Validation/ceDigi.fcl +++ b/Validation/ceDigi.fcl @@ -8,7 +8,7 @@ services.TimeTracker.printSummary: true services.SeedService.baseSeed: 8 -services.GeometryService.inputFile : "Offline/Mu2eG4/geom/geom_common_current.txt" +services.GeometryService.inputFile : "Offline/Mu2eG4/geom/geom_common_MDC2020.txt" # file produced by ceSteps.fcl source.fileNames : [ "dts.owner.ceSteps.dsconf.seq.art" ] diff --git a/Validation/ceSimReco.fcl b/Validation/ceSimReco.fcl index c16be6c0..f247c4b9 100644 --- a/Validation/ceSimReco.fcl +++ b/Validation/ceSimReco.fcl @@ -119,7 +119,7 @@ physics.analyzers.recoCompressionCheck.SelectEvents : [ TriggerPath ] # on-spill EWM physics.producers.EWMProducer.SpillType : 1 # add trigger paths -# This doesn't currently work, as the step filter stops processing before digis are made, and +# This doesn't MDC2020ly work, as the step filter stops processing before digis are made, and # the digis are required for trigger FIXME! ##include "Offline/gen/fcl/Trigger/OnSpillTrigMenu/OnSpillTrigMenu.fcl" @@ -156,7 +156,7 @@ physics.filters.TargetStopResampler.fileNames : [ physics.filters.TargetStopResampler.mu2e.MaxEventsToSkip: 0 physics.producers.FindMCPrimary.PrimaryProcess : "mu2eCeMinusEndpoint" -services.GeometryService.inputFile : "Offline/Mu2eG4/geom/geom_common_current.txt" +services.GeometryService.inputFile : "Offline/Mu2eG4/geom/geom_common_MDC2020.txt" services.GeometryService.bFieldFile: "Offline/Mu2eG4/geom/bfgeom_no_tsu_ps_v01.txt" #include "Production/Validation/database.fcl" diff --git a/Validation/ceSteps.fcl b/Validation/ceSteps.fcl index aa97d62b..799b3cfa 100644 --- a/Validation/ceSteps.fcl +++ b/Validation/ceSteps.fcl @@ -11,7 +11,7 @@ physics.filters.TargetStopResampler.fileNames : [ "/cvmfs/mu2e.opensciencegrid.org/DataFiles/Validation/sim.brownd.MuminusStops.MDC2020d.001202_00000000.art" ] physics.filters.TargetStopResampler.mu2e.MaxEventsToSkip: 0 -services.GeometryService.inputFile : "Offline/Mu2eG4/geom/geom_common_current.txt" +services.GeometryService.inputFile : "Offline/Mu2eG4/geom/geom_common_MDC2020.txt" outputs.PrimaryOutput.fileName : "dts.owner.ceSteps.dsconf.seq.art" #include "Production/Validation/database.fcl" diff --git a/Validation/muDauSteps.fcl b/Validation/muDauSteps.fcl index a22327ee..a06fa514 100644 --- a/Validation/muDauSteps.fcl +++ b/Validation/muDauSteps.fcl @@ -8,7 +8,7 @@ services.TimeTracker.printSummary: true services.SeedService.baseSeed: 8 -services.GeometryService.inputFile : "Offline/Mu2eG4/geom/geom_common_current.txt" +services.GeometryService.inputFile : "Offline/Mu2eG4/geom/geom_common_MDC2020.txt" outputs.Output.fileName : "dts.owner.muDauSteps.dsconf.seq.art" physics.filters.TargetStopResampler.fileNames : [ diff --git a/Validation/potSim.fcl b/Validation/potSim.fcl index dd82aba6..ee77084c 100644 --- a/Validation/potSim.fcl +++ b/Validation/potSim.fcl @@ -30,4 +30,4 @@ source.maxEvents: 500 # Initialze seeding of random engines services.SeedService.baseSeed : 8 # latest geometry -services.GeometryService.inputFile : "Offline/Mu2eG4/geom/geom_common_current.txt" +services.GeometryService.inputFile : "Offline/Mu2eG4/geom/geom_common_MDC2020.txt" From d135306e0d2b20b077ae25d21c2a003403d95c95 Mon Sep 17 00:00:00 2001 From: David Nathan Brown Date: Thu, 16 Oct 2025 15:08:45 -0500 Subject: [PATCH 05/17] Patch --- Validation/cosmicSimReco.fcl | 1 + 1 file changed, 1 insertion(+) diff --git a/Validation/cosmicSimReco.fcl b/Validation/cosmicSimReco.fcl index 0a01cd69..cc8abf71 100644 --- a/Validation/cosmicSimReco.fcl +++ b/Validation/cosmicSimReco.fcl @@ -151,3 +151,4 @@ source.maxEvents: 50000 # Initialze seeding of random engines services.SeedService.baseSeed : 8 #include "Production/Validation/database.fcl" +#include "Production/JobConfig/common/epilog.fcl" From f49beb18d4eb2865d21bdf4a5a38d7d3620b0fa4 Mon Sep 17 00:00:00 2001 From: David Nathan Brown Date: Mon, 27 Oct 2025 10:32:56 -0700 Subject: [PATCH 06/17] Fix output name --- JobConfig/reco/NoField.fcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/JobConfig/reco/NoField.fcl b/JobConfig/reco/NoField.fcl index ea6f0f8d..c42a7438 100644 --- a/JobConfig/reco/NoField.fcl +++ b/JobConfig/reco/NoField.fcl @@ -7,7 +7,7 @@ outputs: { KinematicLineOutput : { @table::Reconstruction.Output SelectEvents : [ "RecoPath" ] - fileName: "mcs.owner.description.version.sequencer.art" + fileName: "rec.owner.description.version.sequencer.art" } } From 516f245730ab3172b2693942d60ec7b8330c8555 Mon Sep 17 00:00:00 2001 From: michaelmackenzie Date: Mon, 13 Oct 2025 14:30:55 -0500 Subject: [PATCH 07/17] Add triggerable calo definition --- JobConfig/digitize/Digitize.fcl | 1 + JobConfig/digitize/OnSpill.fcl | 2 +- JobConfig/digitize/prolog.fcl | 14 ++++++++++++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/JobConfig/digitize/Digitize.fcl b/JobConfig/digitize/Digitize.fcl index 9e53c2db..58253ee5 100644 --- a/JobConfig/digitize/Digitize.fcl +++ b/JobConfig/digitize/Digitize.fcl @@ -17,6 +17,7 @@ physics : { TriggerableLHPath : [ @sequence::Digitize.DigitizeSequence, @sequence::Digitize.TriggerableLHSequence ] TriggerableCHPath : [ @sequence::Digitize.DigitizeSequence, @sequence::Digitize.TriggerableCHSequence ] TriggerableTwoTrackPath : [ @sequence::Digitize.DigitizeSequence, @sequence::Digitize.TriggerableTwoTrackSequence ] + TriggerableCaloPath : [ @sequence::Digitize.DigitizeSequence, @sequence::Digitize.TriggerableCaloSequence ] # define the trigger sequences and paths @table::TrigRecoSequences @table::TrigSequences diff --git a/JobConfig/digitize/OnSpill.fcl b/JobConfig/digitize/OnSpill.fcl index 98239990..c80fba69 100644 --- a/JobConfig/digitize/OnSpill.fcl +++ b/JobConfig/digitize/OnSpill.fcl @@ -3,7 +3,7 @@ # set the spill type physics.producers.EWMProducer.SpillType : 1 # Define the default list of triggerable paths -physics.TriggerablePaths : [ "TriggerableLHPath", "TriggerableTwoTrackPath"] +physics.TriggerablePaths : [ "TriggerableLHPath", "TriggerableTwoTrackPath", "TriggerableCaloPath"] # Define the trigger path physics.trigger_paths : [ "DigitizePath", @sequence::physics.TriggerablePaths, @sequence::Trig_physMenu.trigger_paths] # configure 'Triggered' output to be signal diff --git a/JobConfig/digitize/prolog.fcl b/JobConfig/digitize/prolog.fcl index f7524106..5af68fdc 100644 --- a/JobConfig/digitize/prolog.fcl +++ b/JobConfig/digitize/prolog.fcl @@ -120,6 +120,19 @@ Digitize: { prescaleFactor : 1 # by default, prescale all events (n % 1 != 1 for all n) prescaleOffset : 1 } + # Triggerable calo events + TriggerableCalo : { + module_type : CaloShowerSimFilter + MinParticleEnergy : 75.0 + MinTotalEnergy : 75.0 + CaloShowerSimCollection : "compressDigiMCs" + particleTypes : [11, -11, 13, -13, 211, -211, 22] + } + TriggerableCaloPrescale : { + module_type : Prescaler + prescaleFactor : 1 + prescaleOffset : 0 + } @table::TrigFilters.filters } @@ -139,6 +152,7 @@ Digitize: { TriggerableLHSequence : [ TriggerableLHPrescale, TriggerableLH ] TriggerableCHSequence : [ TriggerableCHPrescale, TriggerableCH ] TriggerableTwoTrackSequence : [ TriggerableTwoTrackPrescale, TriggerableTwoTrack ] + TriggerableCaloSequence : [ TriggerableCaloPrescale, TriggerableCalo ] TriggerProducts : [ "keep art::TriggerResults_*_*_*", From 466f0ee28b23d9b9f7d58ec32e78c0fa0a6e40e1 Mon Sep 17 00:00:00 2001 From: michaelmackenzie Date: Fri, 7 Nov 2025 12:09:15 -0600 Subject: [PATCH 08/17] Add calo triggerable path to mixing, remove total calo energy test --- JobConfig/digitize/prolog.fcl | 2 +- JobConfig/mixing/Mix.fcl | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/JobConfig/digitize/prolog.fcl b/JobConfig/digitize/prolog.fcl index 5af68fdc..912dd9c2 100644 --- a/JobConfig/digitize/prolog.fcl +++ b/JobConfig/digitize/prolog.fcl @@ -124,7 +124,7 @@ Digitize: { TriggerableCalo : { module_type : CaloShowerSimFilter MinParticleEnergy : 75.0 - MinTotalEnergy : 75.0 + MinTotalEnergy : 1e6 CaloShowerSimCollection : "compressDigiMCs" particleTypes : [11, -11, 13, -13, 211, -211, 22] } diff --git a/JobConfig/mixing/Mix.fcl b/JobConfig/mixing/Mix.fcl index 25410ba4..71af6566 100644 --- a/JobConfig/mixing/Mix.fcl +++ b/JobConfig/mixing/Mix.fcl @@ -19,6 +19,7 @@ physics : { DigitizePath : [ @sequence::Mixing.MixSequence ] TriggerableLHPath : [ @sequence::Mixing.MixSequence, @sequence::Digitize.TriggerableLHSequence ] TriggerableTwoTrackPath : [ @sequence::Mixing.MixSequence, @sequence::Digitize.TriggerableTwoTrackSequence ] + TriggerableCaloPath : [ @sequence::Mixing.MixSequence, @sequence::Digitize.TriggerableCaloSequence ] # define the trigger sequences and paths @table::TrigRecoSequences @table::TrigSequences @@ -31,7 +32,7 @@ physics.end_paths : [ EndPath ] # set the event timing for OnSpill physics.producers.EWMProducer.SpillType : 1 # Define the default list of triggerable paths -physics.TriggerablePaths : [ "TriggerableLHPath", "TriggerableTwoTrackPath"] +physics.TriggerablePaths : [ "TriggerableLHPath", "TriggerableTwoTrackPath", "TriggerableCaloPath"] # define paths physics.trigger_paths : [ "DigitizePath", @sequence::physics.TriggerablePaths, @sequence::Trig_physMenu.trigger_paths] # configure 'Triggered' output to be signal From 024efeedd0fceed37d2308aa1eb2703fd30f1c80 Mon Sep 17 00:00:00 2001 From: michaelmackenzie Date: Mon, 1 Dec 2025 14:38:20 -0600 Subject: [PATCH 09/17] Use the SelectReco CRV cluster collection for assns, also keep old trig KalSeeds --- JobConfig/digitize/prolog.fcl | 1 + JobConfig/recoMC/epilog.fcl | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/JobConfig/digitize/prolog.fcl b/JobConfig/digitize/prolog.fcl index 912dd9c2..664d430e 100644 --- a/JobConfig/digitize/prolog.fcl +++ b/JobConfig/digitize/prolog.fcl @@ -159,6 +159,7 @@ Digitize: { "keep mu2e::CaloClusters_*_*_*", "keep mu2e::TriggerInfo_*_*_*", "keep mu2e::KalSeeds_Trig*_*_*", + "keep mu2e::KalSeeds_TT*_*_*", "keep mu2e::KalSeedMCs_TT*KSFMC_*_*", "keep mu2e::KalSeedmu2e::KalSeedMCvoidart::Assns_TT*KSFMC_*_*", "keep mu2e::RecoCount_TT*KSFMC_*_*" diff --git a/JobConfig/recoMC/epilog.fcl b/JobConfig/recoMC/epilog.fcl index 251c3438..4cc08f92 100644 --- a/JobConfig/recoMC/epilog.fcl +++ b/JobConfig/recoMC/epilog.fcl @@ -6,5 +6,5 @@ physics.producers.CaloHitTruthMatch.primaryParticle : "compressDigiMCs" # patch CRV physics.producers.CrvCoincidenceClusterMatchMC.crvWaveformsModuleLabel : "compressDigiMCs" -physics.producers.CrvCoincidenceClusterMCAssns.crvCoincidenceTags : [ "CrvCoincidenceClusterFinder" ] +physics.producers.CrvCoincidenceClusterMCAssns.crvCoincidenceTags : [ "SelectReco:CrvCoincidenceClusterFinder" ] physics.producers.CrvCoincidenceClusterMCAssns.crvCoincidenceMCTags : [ "compressRecoMCs:CrvCoincidenceClusterMatchMC" ] From 70168513d3f4eea03ce99ca133b761cd4643636c Mon Sep 17 00:00:00 2001 From: michaelmackenzie Date: Wed, 3 Dec 2025 09:31:51 -0600 Subject: [PATCH 10/17] Rename TT --> Trig --- JobConfig/digitize/prolog.fcl | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/JobConfig/digitize/prolog.fcl b/JobConfig/digitize/prolog.fcl index 664d430e..9502aab3 100644 --- a/JobConfig/digitize/prolog.fcl +++ b/JobConfig/digitize/prolog.fcl @@ -52,22 +52,22 @@ Digitize: { } MakeSS : { module_type : NullProducer } # temporary patch for older MDC2020 output # Trigger MC matching instances for each helix algorithm - TTAprKSFMC : { + TrigAprKSFMC : { @table::CommonMC.TTSelectRecoMC ComboHitCollection : "TrigFlagPH" KalSeedCollections : [ "TrigAprKSF" ] } - TTTprDeKSFMC : { + TrigTprDeKSFMC : { @table::CommonMC.TTSelectRecoMC ComboHitCollection : "TrigFlagPH" KalSeedCollections : [ "TrigKSFDe" ] } - TTMprDeKSFMC : { + TrigMprDeKSFMC : { @table::CommonMC.TTSelectRecoMC ComboHitCollection : "TrigFlagPH" KalSeedCollections : [ "TrigKSFMprDe" ] } - TTCprDeKSFMC : { + TrigCprDeKSFMC : { @table::CommonMC.TTSelectRecoMC ComboHitCollection : "TrigFlagPH" KalSeedCollections : [ "TrigCalSeedFitDe" ] @@ -160,9 +160,9 @@ Digitize: { "keep mu2e::TriggerInfo_*_*_*", "keep mu2e::KalSeeds_Trig*_*_*", "keep mu2e::KalSeeds_TT*_*_*", - "keep mu2e::KalSeedMCs_TT*KSFMC_*_*", - "keep mu2e::KalSeedmu2e::KalSeedMCvoidart::Assns_TT*KSFMC_*_*", - "keep mu2e::RecoCount_TT*KSFMC_*_*" + "keep mu2e::KalSeedMCs_Trig*KSFMC_*_*", + "keep mu2e::KalSeedmu2e::KalSeedMCvoidart::Assns_Trig*KSFMC_*_*", + "keep mu2e::RecoCount_Trig*KSFMC_*_*" ] # "keep mu2e::SimParticlemv_compressDetStepMCs_*_*", #"keep mu2e::GenParticles_compressDetStepMCs_*_*" From 8a12a32449b6bca31b86ad394cdc0fceeaf7309f Mon Sep 17 00:00:00 2001 From: michaelmackenzie Date: Wed, 3 Dec 2025 13:17:37 -0600 Subject: [PATCH 11/17] Update epilog --- JobConfig/digitize/OnSpill_epilog.fcl | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/JobConfig/digitize/OnSpill_epilog.fcl b/JobConfig/digitize/OnSpill_epilog.fcl index d86d6f7c..77353b00 100644 --- a/JobConfig/digitize/OnSpill_epilog.fcl +++ b/JobConfig/digitize/OnSpill_epilog.fcl @@ -2,17 +2,17 @@ # It produces functionally equivalent output as the standard module but is slower, so don't use this script for timing studies # add the trigger MC matching to the appropriate paths # apr -physics.apr_TrkDe_80m70p : [@sequence::physics.apr_TrkDe_80m70p, TTAprKSFMC ] -physics.apr_TrkDe_80m70p_D0200 : [@sequence::physics.apr_TrkDe_80m70p_D0200, TTAprKSFMC ] -physics.apr_TrkDe_50_D0200 : [@sequence::physics.apr_TrkDe_50_D0200, TTAprKSFMC ] -physics.apr_TwoTrkDe_80m70p_D0200 : [@sequence::physics.apr_TwoTrkDe_80m70p_D0200, TTAprKSFMC ] +physics.apr_TrkDe_80m70p : [@sequence::physics.apr_TrkDe_80m70p, TrigAprKSFMC ] +physics.apr_TrkDe_80m70p_D0200 : [@sequence::physics.apr_TrkDe_80m70p_D0200, TrigAprKSFMC ] +physics.apr_TrkDe_50_D0200 : [@sequence::physics.apr_TrkDe_50_D0200, TrigAprKSFMC ] +physics.apr_TwoTrkDe_80m70p_D0200 : [@sequence::physics.apr_TwoTrkDe_80m70p_D0200, TrigAprKSFMC ] # tpr -physics.tpr_TrkDe_80m70p : [@sequence::physics.tpr_TrkDe_80m70p, TTTprDeKSFMC ] -physics.tpr_TrkDe_80m70p_D0200 : [@sequence::physics.tpr_TrkDe_80m70p_D0200, TTTprDeKSFMC ] -physics.tpr_TrkDe_50_D0200 : [@sequence::physics.tpr_TrkDe_50_D0200, TTTprDeKSFMC ] +physics.tpr_TrkDe_80m70p : [@sequence::physics.tpr_TrkDe_80m70p, TrigTprDeKSFMC ] +physics.tpr_TrkDe_80m70p_D0200 : [@sequence::physics.tpr_TrkDe_80m70p_D0200, TrigTprDeKSFMC ] +physics.tpr_TrkDe_50_D0200 : [@sequence::physics.tpr_TrkDe_50_D0200, TrigTprDeKSFMC ] # cpr -physics.cpr_TrkDe_80m70p : [@sequence::physics.cpr_TrkDe_80m70p, TTCprDeKSFMC ] -physics.cpr_TrkDe_80m70p_D0200 : [@sequence::physics.cpr_TrkDe_80m70p_D0200, TTCprDeKSFMC ] -physics.cpr_TrkDe_50_D0200 : [@sequence::physics.cpr_TrkDe_50_D0200, TTCprDeKSFMC ] +physics.cpr_TrkDe_80m70p : [@sequence::physics.cpr_TrkDe_80m70p, TrigCprDeKSFMC ] +physics.cpr_TrkDe_80m70p_D0200 : [@sequence::physics.cpr_TrkDe_80m70p_D0200, TrigCprDeKSFMC ] +physics.cpr_TrkDe_50_D0200 : [@sequence::physics.cpr_TrkDe_50_D0200, TrigCprDeKSFMC ] # mpr -physics.mpr_TrkDe_80m70p_D0200 : [@sequence::physics.mpr_TrkDe_80m70p_D0200, TTMprDeKSFMC ] +physics.mpr_TrkDe_80m70p_D0200 : [@sequence::physics.mpr_TrkDe_80m70p_D0200, TrigMprDeKSFMC ] From 39fb7736c4a56558cc0490d6879e0ddf37c2e52c Mon Sep 17 00:00:00 2001 From: oksuzian <48927306+oksuzian@users.noreply.github.com> Date: Thu, 4 Dec 2025 17:06:38 -0600 Subject: [PATCH 12/17] Resolve conflict --- JobConfig/digitize/prolog.fcl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/JobConfig/digitize/prolog.fcl b/JobConfig/digitize/prolog.fcl index 9502aab3..e4c371f8 100644 --- a/JobConfig/digitize/prolog.fcl +++ b/JobConfig/digitize/prolog.fcl @@ -163,6 +163,8 @@ Digitize: { "keep mu2e::KalSeedMCs_Trig*KSFMC_*_*", "keep mu2e::KalSeedmu2e::KalSeedMCvoidart::Assns_Trig*KSFMC_*_*", "keep mu2e::RecoCount_Trig*KSFMC_*_*" + "keep mu2e::IntensityInfo*_Trig*_*_*", + "keep mu2e::IntensityInfo*_TT*_*_*" ] # "keep mu2e::SimParticlemv_compressDetStepMCs_*_*", #"keep mu2e::GenParticles_compressDetStepMCs_*_*" From d459f0247063d963bbc599a0defb99ef5829d04c Mon Sep 17 00:00:00 2001 From: oksuzian <48927306+oksuzian@users.noreply.github.com> Date: Thu, 4 Dec 2025 17:34:48 -0600 Subject: [PATCH 13/17] Merge pull request #487 from michaelmackenzie/LineFix Add missing comma --- JobConfig/digitize/prolog.fcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/JobConfig/digitize/prolog.fcl b/JobConfig/digitize/prolog.fcl index e4c371f8..fceba372 100644 --- a/JobConfig/digitize/prolog.fcl +++ b/JobConfig/digitize/prolog.fcl @@ -162,7 +162,7 @@ Digitize: { "keep mu2e::KalSeeds_TT*_*_*", "keep mu2e::KalSeedMCs_Trig*KSFMC_*_*", "keep mu2e::KalSeedmu2e::KalSeedMCvoidart::Assns_Trig*KSFMC_*_*", - "keep mu2e::RecoCount_Trig*KSFMC_*_*" + "keep mu2e::RecoCount_Trig*KSFMC_*_*", "keep mu2e::IntensityInfo*_Trig*_*_*", "keep mu2e::IntensityInfo*_TT*_*_*" ] From f5d1f2879286fcd95a8a8eed70dc4a920c78f62f Mon Sep 17 00:00:00 2001 From: oksuzian <48927306+oksuzian@users.noreply.github.com> Date: Thu, 4 Dec 2025 16:00:10 -0600 Subject: [PATCH 14/17] Resolve conflict --- JobConfig/digitize/prolog.fcl | 4 ++++ JobConfig/reco/prolog.fcl | 8 +++++++- JobConfig/recoMC/prolog.fcl | 3 ++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/JobConfig/digitize/prolog.fcl b/JobConfig/digitize/prolog.fcl index fceba372..a1665585 100644 --- a/JobConfig/digitize/prolog.fcl +++ b/JobConfig/digitize/prolog.fcl @@ -158,6 +158,10 @@ Digitize: { "keep art::TriggerResults_*_*_*", "keep mu2e::CaloClusters_*_*_*", "keep mu2e::TriggerInfo_*_*_*", + "keep mu2e::TriggerInfoCollection_*_*_*", + "keep mu2e::HelixSeed*_Trig*Merger*_*_*", + "keep mu2e::HelixSeed*Assns_Trig*_*_*", + "keep mu2e::TimeClusters_Trig*Merger*_*_*", "keep mu2e::KalSeeds_Trig*_*_*", "keep mu2e::KalSeeds_TT*_*_*", "keep mu2e::KalSeedMCs_Trig*KSFMC_*_*", diff --git a/JobConfig/reco/prolog.fcl b/JobConfig/reco/prolog.fcl index 6560ae28..e89f1f47 100644 --- a/JobConfig/reco/prolog.fcl +++ b/JobConfig/reco/prolog.fcl @@ -314,6 +314,7 @@ Reconstruction : { # Middle reco products, pat rec intermediate results MidRecoProducts : [ "keep mu2e::HelixSeeds_MH*_*_*", + "keep mu2e::HelixSeed*Assns_*_*_*", "keep mu2e::TimeClusters_MH*_*_*" ] # Low reco products, useful for debugging and event display @@ -389,7 +390,8 @@ Reconstruction.Output : { fileName : @nil outputCommands : [ "drop *_*_*_*", @sequence::Reconstruction.GeneralProducts, - @sequence::Reconstruction.HighRecoProducts + @sequence::Reconstruction.HighRecoProducts, + @sequence::Reconstruction.MidRecoProducts ] } @@ -399,6 +401,7 @@ Reconstruction.RegrowOutput : { outputCommands : [ @sequence::Reconstruction.GeneralProducts, @sequence::Reconstruction.HighRecoProducts, + @sequence::Reconstruction.MidRecoProducts, "drop *_*_*_Digitize", "drop *_*_*_Mix", "keep *_EWMProducer_*_*", @@ -407,6 +410,9 @@ Reconstruction.RegrowOutput : { "keep mu2e::Calo*_*_*_Reconstruct", "keep mu2e::Crv*_*_*_Reconstruct", "keep mu2e::KalSeed*_SelectReco_*_*", + "keep mu2e::HelixSeed*_*_*_*", + "keep mu2e::TimeClusters_*_*_*", + "keep mu2e::IntensityInfo*_*_*_*", "keep *_compressRecoMCs_*_*", "keep *_SelectReco_*_*", "keep mu2e::KalSeed*_KKDe_*_*", diff --git a/JobConfig/recoMC/prolog.fcl b/JobConfig/recoMC/prolog.fcl index fc8f2e2d..4d124382 100644 --- a/JobConfig/recoMC/prolog.fcl +++ b/JobConfig/recoMC/prolog.fcl @@ -117,7 +117,8 @@ Reconstruction.Output : { @sequence::Reconstruction.GeneralProducts, @sequence::Reconstruction.GeneralMCProducts, @sequence::Reconstruction.HighRecoProducts, - @sequence::Reconstruction.HighRecoMCProducts + @sequence::Reconstruction.HighRecoMCProducts, + @sequence::Reconstruction.MidRecoProducts ] } END_PROLOG From 22790b60aed96021914dbc8187bd3ab23c899ad3 Mon Sep 17 00:00:00 2001 From: oksuzian <48927306+oksuzian@users.noreply.github.com> Date: Sat, 30 May 2026 17:09:05 -0500 Subject: [PATCH 15/17] Swap to MDC2020 muon stops file in ceSimReco.fcl --- Validation/ceSimReco.fcl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Validation/ceSimReco.fcl b/Validation/ceSimReco.fcl index 6f22998a..a57299de 100644 --- a/Validation/ceSimReco.fcl +++ b/Validation/ceSimReco.fcl @@ -151,7 +151,7 @@ physics.producers.g4run.inputs: { } # muon stops file from MDC2020 validation physics.filters.TargetStopResampler.fileNames : [ - "/cvmfs/mu2e.opensciencegrid.org/DataFiles/Validation/sim.mu2e.MuminusStopsVal.MDC2025ac.001430_00000000.art" + "/cvmfs/mu2e.opensciencegrid.org/DataFiles/Validation/sim.brownd.MuminusStops.MDC2020d.001202_00000000.art" ] physics.filters.TargetStopResampler.mu2e.MaxEventsToSkip: 0 physics.producers.FindMCPrimary.PrimaryProcess : "mu2eCeMinusEndpoint" @@ -161,4 +161,3 @@ services.GeometryService.bFieldFile: "Offline/Mu2eG4/geom/bfgeom_no_tsu_ps_v01.t #include "Production/Validation/database.fcl" #include "Offline/CRVResponse/fcl/epilog_run1a_v01.fcl" - From 2831421af1129f5efba7d648f37933048312d2cd Mon Sep 17 00:00:00 2001 From: oksuzian <48927306+oksuzian@users.noreply.github.com> Date: Sat, 30 May 2026 17:11:28 -0500 Subject: [PATCH 16/17] Swap to MDC2020 muon stops file in ceSteps.fcl --- Validation/ceSteps.fcl | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Validation/ceSteps.fcl b/Validation/ceSteps.fcl index 41adc206..799b3cfa 100644 --- a/Validation/ceSteps.fcl +++ b/Validation/ceSteps.fcl @@ -1,6 +1,6 @@ #include "Production/JobConfig/primary/CeEndpoint.fcl" -source.firstRun: 1430 +source.firstRun: 1200 source.maxEvents: 20 services.scheduler.wantSummary: true @@ -8,11 +8,10 @@ services.TimeTracker.printSummary: true services.SeedService.baseSeed: 8 # muon stops file from MDC2020 validation physics.filters.TargetStopResampler.fileNames : [ - "/cvmfs/mu2e.opensciencegrid.org/DataFiles/Validation/sim.mu2e.TargetStopsVal.MDC2025ac.001430_00000000.art" + "/cvmfs/mu2e.opensciencegrid.org/DataFiles/Validation/sim.brownd.MuminusStops.MDC2020d.001202_00000000.art" ] physics.filters.TargetStopResampler.mu2e.MaxEventsToSkip: 0 services.GeometryService.inputFile : "Offline/Mu2eG4/geom/geom_common_MDC2020.txt" outputs.PrimaryOutput.fileName : "dts.owner.ceSteps.dsconf.seq.art" #include "Production/Validation/database.fcl" -#include "Offline/CRVResponse/fcl/epilog_run1a_v01.fcl" From 516dc42303347797974bdf4d485a94b4e934b5d2 Mon Sep 17 00:00:00 2001 From: oksuzian <48927306+oksuzian@users.noreply.github.com> Date: Sat, 30 May 2026 17:15:25 -0500 Subject: [PATCH 17/17] Swap to MDC2020 muon stops file in muDauSteps.fcl --- Validation/muDauSteps.fcl | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Validation/muDauSteps.fcl b/Validation/muDauSteps.fcl index 7c0a7d44..a06fa514 100644 --- a/Validation/muDauSteps.fcl +++ b/Validation/muDauSteps.fcl @@ -1,6 +1,6 @@ #include "Production/JobConfig/pileup/MuStopPileup.fcl" source.maxEvents : 1000 -source.firstRun: 1430 +source.firstRun: 1200 source.firstSubRun: 0 services.scheduler.wantSummary: true @@ -12,9 +12,8 @@ services.GeometryService.inputFile : "Offline/Mu2eG4/geom/geom_common_MDC2020.tx outputs.Output.fileName : "dts.owner.muDauSteps.dsconf.seq.art" physics.filters.TargetStopResampler.fileNames : [ - "/cvmfs/mu2e.opensciencegrid.org/DataFiles/Validation/sim.mu2e.TargetStopsVal.MDC2025ac.001430_00000000.art" + "/cvmfs/mu2e.opensciencegrid.org/DataFiles/Validation/sim.brownd.MuminusStops.MDC2020d.001202_00000000.art" ] physics.filters.TargetStopResampler.mu2e.MaxEventsToSkip: 0 #include "Production/Validation/database.fcl" -#include "Offline/CRVResponse/fcl/epilog_run1a_v01.fcl"