add ophituncorrected + ophit flow for mc

Author: mvicenzi

fcl/reco/Definitions/stage0_icarus_mc_defs.fcl

@@ -5,6 +5,7 @@
 #include "icarus_flashfinder.fcl"
 #include "icarus_opana_modules.fcl"
 #include "recowire_icarus.fcl"
+#include "timing_icarus.fcl"
 
 #include "crttruehitproducer.fcl"
 #include "crtsimhitproducer.fcl"
@@ -37,7 +38,8 @@ icarus_stage0_mc_producers:
 
     pmtbaselines:      @local::icarus_opreco_pedestal_fromchannel_MC  # from icarus_ophitfinder.fcl
     opdetonbeam:       @local::copyPMTonBeam  # from decoderdefs_icarus.fcl
-    ophit:             @local::icarus_ophit_data
+    ophituncorrected:  @local::icarus_ophit_data
+    ophit:             @local::icarus_ophit_timing_correction
     mcophit:           @local::ICARUSMCOpHit
 
     ## crt producer
@@ -55,6 +57,7 @@ icarus_stage0_mc_trigger: [
 icarus_stage0_mc_PMT:  [
                          @sequence::icarus_stage0_mc_trigger,
                          pmtbaselines,
+                         ophituncorrected,
                          ophit,
                          mcophit,
                          opflashCryoE,
@@ -68,7 +71,8 @@ icarus_stage0_mc_crtreco: [crttrack, crtpmt]
 icarus_stage0_mc_producers.emuTrigger.BeamGates:               shifted
 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.ophituncorrected.InputModule:       shifted
+icarus_stage0_mc_producers.ophit.InputLabels:                  ["ophituncorrected"]
 icarus_stage0_mc_producers.opdetonbeam.Waveforms:              shifted
 icarus_stage0_mc_producers.opdetonbeam.WaveformBaselineAssns:  pmtbaselines
 icarus_stage0_mc_producers.pmtbaselines.OpticalWaveforms:      shifted

fcl/reco/Stage0/mc/stage0_run2_icarus_mc.fcl

@@ -40,9 +40,6 @@ outputs.rootOutput.outputCommands: ["keep *_*_*_*",
                                     "keep *_daqPMT_*_*"
 ]
 
-# Set the expected input for ophit
-physics.producers.ophit.InputModule: "shifted"
-
 # Note the default assumption is that our detector simulation input will come from the WireCell 2D drift simulation, a la 'daq'
 # If we are running the 1D drift simulation we need to switch to using:
 # `physics.producers.MCDecodeTPCROI.FragmentsLabelVec:   ["daq3:PHYSCRATEDATATPCWW","daq2:PHYSCRATEDATATPCWE","daq1:PHYSCRATEDATATPCEW","daq0:PHYSCRATEDATATPCEE"]`

fcl/reco/Stage0/mc/stage0_run2_wc_icarus_mc.fcl

@@ -39,9 +39,6 @@ outputs.rootOutput.outputCommands: ["keep *_*_*_*",
                                     "keep *_daqPMT_*_*"
 ]
 
-# Set the expected input for ophit
-physics.producers.ophit.InputModule: "shifted"
-
 # Set up for the single module mutliple TPC mode...
 physics.producers.MCDecodeTPCROI.FragmentsLabelVec:               ["daq:TPCWW","daq:TPCWE","daq:TPCEW","daq:TPCEE"]
 physics.producers.MCDecodeTPCROI.OutInstanceLabelVec:             ["PHYSCRATEDATATPCWW", "PHYSCRATEDATATPCWE", "PHYSCRATEDATATPCEW", "PHYSCRATEDATATPCEE"]

fcl/reco/Stage0/mc/stage0_run2_wc_icarus_mc_notriggersim.fcl

@@ -1,7 +1,7 @@
 #include "stage0_run2_wc_icarus_mc.fcl"
 
 # restore non-shifted labels
-physics.producers.ophit.InputModule: "opdaq"
+physics.producers.ophituncorrected.InputModule: "opdaq"
 physics.producers.emuTrigger.BeamGates: "beamgate"
 physics.producers.mcophit.SimPhotonsProducer: "pdfastsim"
 physics.producers.opdetonbeam.Waveforms: "opdaq"