Merge pull request #141 from brownd1978/filter

Cleanup Filtering

JobConfig/cosmic/S1DSStops.fcl

@@ -4,10 +4,9 @@
 # Yuri Oksuzian, 2021
 #include "Offline/fcl/standardServices.fcl"
 #include "Production/JobConfig/common/prolog.fcl"
-#include "Production/JobConfig/primary/prolog.fcl"
 #include "Production/JobConfig/cosmic/prolog.fcl"
 
-process_name : Primary
+process_name : S1DSStops
 
 services: @local::Services.Sim
 
@@ -29,15 +28,27 @@ physics: {
 
   # Here we moved the genCounter at the end in order to get a correct scaling of the
   # cosmic livetime after resampling
-  PrimaryPath :  [generate, @sequence::Common.g4Sequence, stepPointMomentumFilter, cosmicFilter, compressPV, genCounter]
-  EndPath : @local::Primary.EndPath
-
+  S1Path :  [generate, @sequence::Common.g4Sequence, stepPointMomentumFilter, cosmicFilter, compressPV, genCounter]
+  EndPath : [ genCountLogger, S1Output ]
 }
 
-outputs : { Output : @local::Primary.Output }
+outputs : {
+  S1Output : {
+    module_type : RootOutput
+    SelectEvents : [ S1Path ]
+    fileName :  @nil
+    outputCommands : [
+      "drop *_*_*_*",
+      "keep art::TriggerResults_*_*_*",
+      "keep mu2e::StatusG4_*_*_*",
+      "keep mu2e::GenEventCount_*_*_*",
+      "keep mu2e::CosmicLivetime_*_*_*",
+      "keep *_compressPV_*_*",
+      "keep mu2e::GenParticles_*_*_*",
+      "keep *_cosmicFilter_*_*"]
+  }
+}
 
-outputs.Output.fileName : "sim.owner.CosmicDSStops.version.sequencer.art"
-outputs.Output.outputCommands : [@sequence::Primary.KeptProducts, "keep mu2e::CosmicLivetime_*_*_*", "keep *_compressPV_*_*", "keep mu2e::GenParticles_*_*_*", "keep *_cosmicFilter_*_*"]
 
 physics.producers.g4run.TrajectoryControl: @local::mu2eg4DefaultTrajectories
 physics.producers.g4run.SDConfig.enableSD: [ CRV ]
@@ -46,12 +57,10 @@ physics.producers.g4run.Mu2eG4CommonCut: @local::Cosmic.Mu2eG4CommonCutCosmicS1
 # final configuration
 #
 #include "Production/JobConfig/common/epilog.fcl"
-#include "Production/JobConfig/primary/epilog.fcl"
 
+physics.trigger_paths : [ S1Path ]
 physics.end_paths : [ EndPath ]
-# no histogram output
-services.TFileService.fileName : "/dev/null"
 services.SeedService.baseSeed         :  773651
 
 # Need this to increase the world volume.
-services.GeometryService.inputFile: "Production/JobConfig/cosmic/geom_cosmic_current.txt"
+services.GeometryService.inputFile : "Production/JobConfig/cosmic/geom_cosmic.txt"

JobConfig/cosmic/S1DSStopsCORSIKA.fcl

@@ -19,9 +19,5 @@ source: {
   fluxConstant: 1.8e4
 }
 
-
 physics.producers.generate : @local::Cosmic.generateCORSIKA
-
-services.GeometryService.inputFile : "Production/JobConfig/cosmic/geom_cosmic.txt"
-services.GeometryService.simulatedDetector : { tool_type: "Mu2e" }
-outputs.Output.fileName         : "sim.owner.CosmicDSStopsCORSIKA.version.sequencer.art"
+outputs.S1Output.fileName         : "sim.owner.CosmicDSStopsCORSIKA.version.sequencer.art"

JobConfig/cosmic/S1DSStopsCRY.fcl

@@ -2,4 +2,4 @@
 
 source.module_type: EmptyEvent
 physics.producers.generate : @local::Cosmic.generateCRY
-outputs.Output.fileName : "sim.owner.CosmicDSStopsCRY.version.sequencer.art"
+outputs.S1Output.fileName : "sim.owner.CosmicDSStopsCRY.version.sequencer.art"

JobConfig/cosmic/S2Converter.fcl

@@ -10,10 +10,10 @@ physics.producers.FindMCPrimary.PrimaryGenIds: ["CosmicCRY", "CosmicCORSIKA"]
 physics.TriggerPath: [ @sequence::TrackerMC.StepSim, @sequence::CaloMC.StepSim, CrvSteps,
     TrkStepFilter, CaloStepFilter, compressDetStepMCs, FindMCPrimary ]
 
-physics.filters.TrkStepFilter : @local::Primary.filters.DetStepFilter
+physics.filters.TrkStepFilter : @local::Primary.filters.PrimaryFilter
 physics.filters.TrkStepFilter.MaximumPartMom: 500
 physics.filters.TrkStepFilter.CaloShowerSteps: [ ]
-physics.filters.CaloStepFilter : @local::Primary.filters.DetStepFilter
+physics.filters.CaloStepFilter : @local::Primary.filters.PrimaryFilter
 physics.filters.CalStepFilter.MaximumPartMom: 500
 physics.filters.CaloStepFilter.StrawGasSteps: [ ]
 

JobConfig/cosmic/S2Resampler.fcl

@@ -1,17 +1,37 @@
 # Re-sample cosmics from stage-1
 # Yuri Oksuzian, 2020
 #include "Offline/CommonMC/fcl/prolog.fcl"
+#include "Offline/fcl/standardServices.fcl"
+#include "Production/JobConfig/common/prolog.fcl"
+#include "Production/JobConfig/primary/prolog.fcl"
 #include "Production/JobConfig/cosmic/prolog.fcl"
-#include "Production/JobConfig/primary/Primary.fcl"
-
+process_name: CosmicS2
+# the following will change when we read art stops
+source: { module_type : EmptyEvent }
+services : @local::Services.Sim
+physics : {
+  producers : {
+    @table::Common.producers
+    @table::Primary.producers
+  }
+  filters : {
+    @table::Common.filters
+    @table::Primary.filters
+  }
+  analyzers : { @table::Primary.analyzers }
+  PrimaryPath : [ genCounter, cosmicTimeOffset, cosmicResample, @sequence::Common.g4Sequence, @sequence::Primary.PrimarySequence]
+  EndPath : @local::Primary.EndPath
+  trigger_paths : [ PrimaryPath ]
+  end_paths : [ EndPath ]
+}
+outputs : { PrimaryOutput :@local::Primary.PrimaryOutput }
+#
 # Bring in info from the previous stage
 physics.filters.cosmicResample: @local::Cosmic.cosmicResample
-physics.filters.cosmicResample.mu2e.MaxEventsToSkip: 18415 # this number depends on the production details
+physics.filters.cosmicResample.mu2e.MaxEventsToSkip: 18415 # this number depends on the production details FIXME!
 physics.filters.cosmicResample.mu2e.products.cosmicLivetimeMixer.moduleLabel: "generate"
 physics.filters.cosmicResample.mu2e.products.cosmicLivetimeMixer.genCounterLabel: "genCounter::Primary"
 
-physics.filters.signalFilter: @local::Cosmic.signalFilter
-
 # Point Mu2eG4 to the pre-simulated data
 physics.producers.g4run.inputs: @local::Cosmic.MultiStageParametersCosmicS2
 
@@ -29,20 +49,11 @@ physics.producers.g4run.Mu2eG4CommonCut: @local::Cosmic.Mu2eG4CommonCutCosmicS2
 physics.producers.g4run.SDConfig.preSimulatedHits:  ["cosmicResample:CRV"]
 physics.producers.FindMCPrimary.PrimaryGenIds: ["CosmicCRY", "CosmicCORSIKA"]
 
-physics.PrimaryPath: [ genCounter, cosmicTimeOffset, cosmicResample, @sequence::Common.g4Sequence, @sequence::Primary.PrimarySequence ]
-physics.SelectSignal: [ genCounter, cosmicTimeOffset, cosmicResample, @sequence::Common.g4Sequence, @sequence::Primary.PrimarySequence, signalFilter ]
-physics.trigger_paths : [ PrimaryPath, SelectSignal ]
-physics.EndPath : [ @sequence::Primary.EndSequence, Output, LooseOutput ]
-
-outputs : {
-  Output : @local::Cosmic.Output
-  LooseOutput : @local::Cosmic.LooseOutput
-}
-
-outputs.LooseOutput.fileName        : "dts.owner.CosmicLoose.version.sequencer.art"
-outputs.LooseOutput.outputCommands : [@sequence::Primary.KeptProducts,
-   "keep mu2e::CosmicLivetime_*_mixed_*"]
-
-outputs.Output.fileName        : "dts.owner.Cosmic.version.sequencer.art"
-outputs.Output.outputCommands : [@sequence::Primary.KeptProducts,
+outputs.PrimaryOutput.fileName        : "dts.owner.Cosmic.version.sequencer.art"
+outputs.PrimaryOutput.outputCommands : [@sequence::Primary.KeptProducts,
    "keep mu2e::CosmicLivetime_*_mixed_*"]
+#
+# final configuration
+#
+#include "Production/JobConfig/common/epilog.fcl"
+#include "Production/JobConfig/primary/epilog.fcl"

JobConfig/cosmic/prolog.fcl

@@ -110,17 +110,6 @@ Cosmic: {
     mcTrajectoryInputs : [ "g4run" ]
     vetoDaughters: []
   }
-  signalFilter : {
-    module_type : DetectorStepFilter
-    MinimumTrkStepEnergy : 1.0e-6 # 1 ev
-    KeepPDG : [ ] # Loop at steps from all particle types
-    CaloShowerSteps: []
-    CrvSteps: []
-    StrawGasSteps: [ compressDetStepMCs ]
-    MinimumPartMom : 50.0 # MeV/c
-    MaximumPartMom : 250.0 # MeV/c
-    MinimumTrkSteps : 10 # primary must produce at least this many StrawGasSteps
-  }
   cosmicResample: {
     module_type: ResamplingMixer
     fileNames: @nil
@@ -195,16 +184,5 @@ Cosmic: {
     ]
   }
 
-  Output : {
-    module_type : RootOutput
-    SelectEvents : [ SelectSignal ]
-    fileName    : @nil
-  }
-
-  LooseOutput : {
-    module_type : RootOutput
-    SelectEvents : [ PrimaryPath ]
-    fileName    : @nil
-  }
 }
 END_PROLOG