[private] consolidating pmt updates from feature/gp_overlayFix

fcl/SkipTesting.txt

@@ -18,6 +18,8 @@ services_compat_no_overburden_icarus_v3.fcl
 services_compat_overburden_icarus_v3.fcl
 set_caf_calconst.fcl
 
+override_services_for_simulation.fcl
+
 
 ################################################################################
 # broken, won't fix

fcl/caf/cafmakerjob_icarus.fcl

@@ -22,6 +22,8 @@ services:
   SpaceChargeService: @local::icarus_spacecharge
 }
 
+#include "override_services_for_simulation.fcl"
+
 outputs:
 {
   outpid:

fcl/gen/genie/genie_icarus_bnb.fcl

@@ -30,8 +30,7 @@
 #
 #
 
-#include "genie.fcl"
-#include "beamspilltimings.fcl"
+#include "genie_beam_settings.fcl"
 
 BEGIN_PROLOG
 
@@ -45,46 +44,57 @@ BEGIN_PROLOG
 ###
 ### icarus_genie_BNB_base
 ###
+#
+# Based on SBN shared BNB configuration, it adds:
+#  * flux
+#  * simulation volume: detector enclosure (includes both cryostats)
+#  * event dump in the log
+#
+#
 icarus_genie_BNB_base: {
+
+  @table::sbn_genie_BNB_base  # from genie_beam_settings.fcl
 
-  @table::standard_genie # from genie.fcl
-
+  #
+  # flux
+  #
   FluxType:             "simple_flux"
-  GenFlavors:           [12, 14, -12, -14]
-# TopVolume:            "volTPCActive"
-# TopVolume:            "volCryostat"
-  BeamName:             "booster"
-  EventGeneratorList:   "Default"
 # FluxCopyMethod:       "IFDH"
   FluxSearchPaths:      "/cvmfs/sbn.osgstorage.org/pnfs/fnal.gov/usr/sbn/persistent/stash/physics/beam/GENIE/BNB/standard/v01_00/"
   FluxFiles:            ["converted_beammc_icarus_*.root"]
-  GHepPrintLevel:       13
-  POTPerSpill:          5.0e12
-  EventsPerSpill:       @erase
+
 
-  GlobalTimeOffset:     0.0 # [ns]
-  RandomTimeOffset:     1600.0 # [ns]
+  #
+  # generation volume
+  #
+# TopVolume:            "volTPCActive"
+# TopVolume:            "volCryostat"
+  TopVolume:            "volDetEnclosure"
+
+  #
+  # GENIE event vdump verbosity
+  #
+  GHepPrintLevel:       13
 
 } # icarus_genie_BNB_base
 
 
+#
 # legacy alias
+#
 icarus_genie_simple: @local::icarus_genie_BNB_base
 
 
 ###
 ###  icarus_genie_BNB
 ###
 #
-# Adds BnB time structure.
+# Just as the default.
 #
 icarus_genie_BNB: {
 
   @table::icarus_genie_BNB_base
 
-  SpillTimeConfig: @local::FNAL_BnB_default # from beamspilltimings.fcl
-  RandomTimeOffset: 0.0 # ns; it's ignored anyway when `SpillTimeConfig` is set
-
 } # icarus_genie_BNB
 
 

fcl/gen/numi/genie_icarus_numioffaxis.fcl

@@ -31,7 +31,7 @@
 #   updated NuMI POT to 6+6 batches configuration
 #
 
-#include "genie_icarus_bnb.fcl"
+#include "genie_beam_settings.fcl"
 #include "beamspilltimings.fcl"
 
 
@@ -49,7 +49,7 @@ BEGIN_PROLOG
 ###
 icarus_genie_NuMI_base: {
 
-  @table::icarus_genie_BNB_base # from genie_icarus_bnb.fcl
+  @table::sbn_genie_NuMI_base  # from genie_beam_settings.fcl
 
   #
   # flux
@@ -60,10 +60,18 @@ icarus_genie_NuMI_base: {
   FluxSearchPaths:      "/cvmfs/sbn.osgstorage.org/pnfs/fnal.gov/usr/sbn/persistent/stash/physics/beam/GENIE/NuMI/standard/v03_02/"
   FluxFiles:            ["g4numi*.root"]
 
-  POTPerSpill:          6.0e13 # same as BnB per batch, but 6 batches in spill
-
-  RandomTimeOffset:     9600.0 # same batch as BnB, but 6 batches in spill [ns]
+  #
+  # generation volume
+  #
+# TopVolume:            "volTPCActive"
+# TopVolume:            "volCryostat"
+  TopVolume:            "volDetEnclosure"
 
+  #
+  # GENIE event vdump verbosity
+  #
+  GHepPrintLevel:       13
+
 } # icarus_genie_NuMI_base
 
 
@@ -75,15 +83,12 @@ icarus_genienumi_simple: @local::icarus_genie_NuMI_base
 ### icarus_genie_NuMI
 ###
 #
-# Adds NuMI beam time structure.
+# Just as the default.
 #
 icarus_genie_NuMI: {
 
   @table::icarus_genie_NuMI_base
 
-  SpillTimeConfig: @local::FNAL_NuMI_default # from beamspilltimings.fcl
-  RandomTimeOffset: 0.0 # ns; it's ignored anyway when `SpillTimeConfig` is set
-
 } # icarus_genie_NuMI
 
 # Rock config

fcl/overlays/overlay_waveforms.fcl

@@ -7,99 +7,102 @@
 
 process_name: Overlay
 
+#include "override_services_for_simulation.fcl"
+
 ## Add the MC module to the list of producers
 physics.producers: {
-		      mccrthit: @local::standard_crtsimhitproducer
-		      overlayTPCRawEE:
-		      {
-		        module_type: "OverlayProducts"
-			TPCOverlayRaw: true
-			TPCOverlayHits: false
-			TPCHitsWireAssn: false
-			TPCOverlayROI: false
-                        PMTOverlayRaw: false
-                        PMTOverlayHits: false
-                        CRTOverlayHits: false
-			TPCRawInputLabels: ["daqTPCROI:PHYSCRATEDATATPCEERAW", "daq:TPCEE"]
-		      }
-		      overlayTPCRawEW:
-                      {
-                        module_type: "OverlayProducts"
-                        TPCOverlayRaw: true
-                        TPCOverlayHits: false
-			TPCHitsWireAssn: false
-			TPCOverlayROI: false
-                        PMTOverlayRaw: false
-                        PMTOverlayHits:	false
-                        CRTOverlayHits: false
-			TPCRawInputLabels: ["daqTPCROI:PHYSCRATEDATATPCEWRAW", "daq:TPCEW"]
-                      }
-		      overlayTPCRawWE:
-                      {
-                        module_type: "OverlayProducts"
-                        TPCOverlayRaw: true
-                        TPCOverlayHits: false
-			TPCHitsWireAssn: false
-			TPCOverlayROI: false
-                        PMTOverlayRaw: false
-                        PMTOverlayHits:	false
-                        CRTOverlayHits: false
-                        TPCRawInputLabels: ["daqTPCROI:PHYSCRATEDATATPCWERAW", "daq:TPCWE"]
-                      }
-		      overlayTPCRawWW:
-                      {
-                        module_type: "OverlayProducts"
-                        TPCOverlayRaw: true
-                        TPCOverlayHits: false
-			TPCHitsWireAssn: false
-			TPCOverlayROI: false
-                        PMTOverlayRaw: false
-                        PMTOverlayHits:	false
-                        CRTOverlayHits: false
-			TPCRawInputLabels: ["daqTPCROI:PHYSCRATEDATATPCWWRAW", "daq:TPCWW"]
-                      }
-
-		      overlayOpWaveforms:
-                      {
-                        module_type: "OverlayProducts"
-                        TPCOverlayRaw: false
-                        TPCOverlayHits: false
-                        TPCHitsWireAssn: false
-                        TPCOverlayROI: false
-                        PMTOverlayRaw: true
-                        PMTOverlayHits: false
-                        CRTOverlayHits: false
-                        PMTWaveDataLabel: "daqPMT"
-			PMTWaveSimLabel: "shifted"
-			PMTWaveBaseLabel: "pmtbaselines"
-                      }
+  mccrthit: @local::standard_crtsimhitproducer
+  overlayTPCRawEE:
+  {
+    module_type: "OverlayProducts"
+    TPCOverlayRaw:      true
+    TPCOverlayHits:     false
+    TPCHitsWireAssn:    false
+    TPCOverlayROI:      false
+    PMTOverlayRaw:      false
+    PMTOverlayHits:     false
+    CRTOverlayHits:     false
+    TPCRawInputLabels: ["daqTPCROI:PHYSCRATEDATATPCEERAW", "daq:TPCEE"]
+  }
+  overlayTPCRawEW:
+  {
+    module_type: "OverlayProducts"
+    TPCOverlayRaw:      true
+    TPCOverlayHits:     false
+    TPCHitsWireAssn:    false
+    TPCOverlayROI:      false
+    PMTOverlayRaw:      false
+    PMTOverlayHits:     false
+    CRTOverlayHits:     false
+    TPCRawInputLabels: ["daqTPCROI:PHYSCRATEDATATPCEWRAW", "daq:TPCEW"]
+  }
+  overlayTPCRawWE:
+  {
+    module_type: "OverlayProducts"
+    TPCOverlayRaw:     true
+    TPCOverlayHits:    false
+    TPCHitsWireAssn:   false
+    TPCOverlayROI:     false
+    PMTOverlayRaw:     false
+    PMTOverlayHits:    false
+    CRTOverlayHits:    false
+    TPCRawInputLabels: ["daqTPCROI:PHYSCRATEDATATPCWERAW", "daq:TPCWE"]
+  }
+  overlayTPCRawWW:
+  {
+    module_type: "OverlayProducts"
+    TPCOverlayRaw:     true
+    TPCOverlayHits:    false
+    TPCHitsWireAssn:   false
+    TPCOverlayROI:     false
+    PMTOverlayRaw:     false
+    PMTOverlayHits:    false
+    CRTOverlayHits:    false
+    TPCRawInputLabels: ["daqTPCROI:PHYSCRATEDATATPCWWRAW", "daq:TPCWW"]
+  }
 
-		      overlayCRTHit:
-                      {
-                        module_type: "OverlayProducts"
-                        TPCOverlayRaw: false
-                        TPCOverlayHits:	false
-                        TPCHitsWireAssn: false
-                        TPCOverlayROI: false
-                        PMTOverlayRaw: false
-                        PMTOverlayHits: false
-                        CRTOverlayHits: true
-                        CRTHitInputLabels: ["crthit","mccrthit"]
-                      }
-                   }
+  overlayOpWaveforms:
+  {
+    module_type:        OverlayPMTwaveforms
+
+    DataWaveformTag:   "daqPMT"
+    DataBaselineAssns: "pmtbaselines"
+    SimWaveformTag:    "shifted"       # also their baselines
+
+    # produce a baseline collection
+    # (trigger modules use one directly rather than going through associations)
+    DuplicateBaselines: true
+
+    # check that no noise is in PMT waveform simulation: we require that at least
+    # >50% of the PMT waveforms lie flat on the baseline for their first 500 ns
+    BaselineCheck:    { Length: "0.5 us"  ForgivenessFraction: 0.5 }
+  }
+
+  overlayCRTHit:
+  {
+    module_type: "OverlayProducts"
+    TPCOverlayRaw:     false
+    TPCOverlayHits:    false
+    TPCHitsWireAssn:   false
+    TPCOverlayROI:     false
+    PMTOverlayRaw:     false
+    PMTOverlayHits:    false
+    CRTOverlayHits:    true
+    CRTHitInputLabels: ["crthit","mccrthit"]
+  }
+}
 
 ## Use the following to run the full defined stage0 set of modules
 physics.reco: [ mccrthit, overlayTPCRawWW, overlayTPCRawWE, overlayTPCRawEW, overlayTPCRawEE, overlayOpWaveforms, overlayCRTHit]
 
 ## boiler plate...
-physics.outana:        [ ]
 physics.trigger_paths: [ reco ]
-physics.end_paths:     [ outana, streamROOT ]
+physics.end_paths:     [ streamROOT ]
 
 ## Note that for output we hijack the "rootOutput" definition (but change the naming convention to make more generic for MC)
 outputs.rootOutput.fileName: "%ifb_%tc-%p.root"
 outputs.rootOutput.dataTier: "reconstructed"
-outputs.rootOutput.SelectEvents: ["reco"]
+outputs.rootOutput.SelectEvents: @erase
 
 # Drop the artdaq format files on output
 outputs.rootOutput.outputCommands: ["keep *_*_*_*",

fcl/reco/Definitions/enable_overlay_sp.fcl

@@ -1,4 +1,4 @@
-# add timing corrections to optical path by ovveriding ophit
+# add timing corrections to optical path by overriding ophit
 physics.producers.ophit: @local::icarus_ophit_timing_correction
 
 # Exclude crthit from path -- not needed since it's included at overlay stage
@@ -12,8 +12,12 @@ physics.path: [   @sequence::icarus_stage0_overlay_PMT,
 physics.producers.MCDecodeTPCROI.FragmentsLabelVec: ["overlayTPCRawWW", "overlayTPCRawWE", "overlayTPCRawEW", "overlayTPCRawEE"]
 physics.producers.pmtbaselines.OpticalWaveforms: "overlayOpWaveforms"
 physics.producers.pmtfixedthr.OpticalWaveforms: "overlayOpWaveforms"
-physics.producers.opdetonbeam.OpticalWaveforms: "overlayOpWaveforms"
+physics.producers.pmtfixedthr.Baselines: "overlayOpWaveforms"
+physics.producers.opdetonbeam.Waveforms: "overlayOpWaveforms"
+physics.producers.opdetonbeam.WaveformBaselineAssns: "overlayOpWaveforms"
 physics.producers.ophituncorrected.InputModule: "overlayOpWaveforms"
 physics.producers.ophit.InputLabels: [ "ophituncorrected" ]
 physics.producers.crttrack.DataLabelHits: "overlayCRTHit"
 physics.producers.crtpmt.CrtHitModuleLabel: "overlayCRTHit"
+physics.producers.emuTrigger:
+  @local::icarus_shifting_triggersim.producers.emuTrigger  # from trigger_emulation_icarus.fcl

fcl/reco/Definitions/stage0_icarus_mc_defs.fcl

@@ -85,11 +85,12 @@ icarus_stage0_mc_crtreco: [crttrack, crtpmt]
 
 # adapt input labels
 icarus_stage0_mc_producers.emuTrigger.BeamGates:               shifted
+icarus_stage0_mc_producers.emuTrigger.BeamGateReference:       Trigger  # see `icarus_standard_triggersim` in `trigger_emulation_icarus.fcl`
 icarus_stage0_mc_producers.triggersimgates.module_type:        DummyProducer  # Don't rerun. We have already adjusted the BeamGate
 icarus_stage0_mc_producers.mcophit.SimPhotonsProducer:         shifted
 icarus_stage0_mc_producers.ophit.InputModule:                  shifted
 icarus_stage0_mc_producers.opdetonbeam.Waveforms:              shifted
-icarus_stage0_mc_producers.opdetonbeam.WaveformBaselineAssns:  pmtbaselines
+icarus_stage0_mc_producers.opdetonbeam.WaveformBaselineAssns:  shifted
 icarus_stage0_mc_producers.pmtbaselines.OpticalWaveforms:      shifted
 icarus_stage0_mc_producers.pmtfixedthr.OpticalWaveforms:       shifted