Merge main back into MDC2020

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"

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"
+

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"

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"

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;

JobConfig/digitize/Extracted.fcl

@@ -6,6 +6,6 @@ physics.filters : { @table::physics.filters @table::Trig_extrPosMenuPSConfig }
 physics.trigger_paths : ["DigitizePath", @sequence::physics.TriggerableBits, @sequence::Trig_extrPosMenu.trigger_paths]
 
 # 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"

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"

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"

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"

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"

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"
 #

JobConfig/recoMC/Extracted.fcl

@@ -2,6 +2,6 @@
 # Extracted = NoField with shifted geometry
 #
 #include "Production/JobConfig/recoMC/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"

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

Validation/ceDigi.fcl

@@ -6,7 +6,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" ]

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"
 
@@ -151,14 +151,13 @@ 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"
 
-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"
 #include "Offline/CRVResponse/fcl/epilog_run1a_v01.fcl"
-

Validation/ceSteps.fcl

@@ -1,18 +1,17 @@
 #include "Production/JobConfig/primary/CeEndpoint.fcl"
 
-source.firstRun: 1430
+source.firstRun: 1200
 source.maxEvents: 20
 
 services.scheduler.wantSummary: true
 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_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"
-#include "Offline/CRVResponse/fcl/epilog_run1a_v01.fcl"

Validation/cosmicSimReco.fcl

@@ -144,4 +144,5 @@ source.maxEvents: 50000
 # Initialze seeding of random engines
 services.SeedService.baseSeed         :  8
 #include "Production/Validation/database.fcl"
+#include "Production/JobConfig/common/epilog.fcl"
 #include "Offline/CRVResponse/fcl/epilog_run1a_v01.fcl"

Validation/muDauSteps.fcl

@@ -1,18 +1,19 @@
 #include "Production/JobConfig/pileup/MuStopPileup.fcl"
 source.maxEvents : 1000
-source.firstRun: 1430
+source.firstRun: 1200
 source.firstSubRun: 0
 
 services.scheduler.wantSummary: true
 services.TimeTracker.printSummary: true
 
 services.SeedService.baseSeed: 8
 
+services.GeometryService.inputFile : "Offline/Mu2eG4/geom/geom_common_MDC2020.txt"
+
 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"

Validation/potSim.fcl

@@ -29,3 +29,5 @@ outputs.fullOutput.fileName: "sim.owner.val-potSim.dsconf.seq.art"
 source.maxEvents: 500
 # Initialze seeding of random engines
 services.SeedService.baseSeed         :  8
+# latest geometry
+services.GeometryService.inputFile : "Offline/Mu2eG4/geom/geom_common_MDC2020.txt"