rework stage0 optical workflow for data, mc, overlay

Author: mvicenzi

fcl/reco/Definitions/enable_overlay_sp.fcl

@@ -1,5 +1,8 @@
+# add timing corrections to optical path
+physics.producers.ophit: @local::icarus_ophit_timing_correction
+
 # Exclude crthit from path -- not needed since it's included at overlay stage
-physics.path: [   @sequence::icarus_stage0_mc_PMT, 
+physics.path: [   @sequence::icarus_stage0_overlay_PMT, 
                   MCDecodeTPCROI, 
                   @sequence::icarus_stage0_2d_multiTPC,
                   @sequence::icarus_stage0_mc_crtreco
@@ -11,5 +14,6 @@ physics.producers.pmtbaselines.OpticalWaveforms: "overlayOpWaveforms"
 physics.producers.pmtfixedthr.OpticalWaveforms: "overlayOpWaveforms"
 physics.producers.opdetonbeam.OpticalWaveforms: "overlayOpWaveforms"
 physics.producers.ophituncorrected.InputModule: "overlayOpWaveforms"
+physics.producers.ophit.InputLabels: [ "ophituncorrected" ]
 physics.producers.crttrack.DataLabelHits: "overlayCRTHit"
 physics.producers.crtpmt.CrtHitModuleLabel: "overlayCRTHit"

fcl/reco/Definitions/stage0_icarus_mc_defs.fcl

@@ -39,40 +39,48 @@ icarus_stage0_mc_producers:
     pmtbaselines:      @local::icarus_opreco_pedestal_fromchannel_MC  # from icarus_ophitfinder.fcl
     opdetonbeam:       @local::copyPMTonBeam  # from decoderdefs_icarus.fcl
     ophituncorrected:  @local::icarus_ophit_data
-    ophit:             @local::icarus_ophit_timing_correction
+    ophit:             @local::icarus_ophit_MC
     mcophit:           @local::ICARUSMCOpHit
 
     ## crt producer
     crthit:            @local::standard_crtsimhitproducer
     crttrack:          @local::standard_crttrackproducer
-    crtpmt: 	       @local::standard_crtpmtmatchingproducer
+    crtpmt: 	         @local::standard_crtpmtmatchingproducer
     }
 
 # make the following modifications to job flow for MC vs the data
 icarus_stage0_mc_trigger: [
-                         pmtfixedthr
-                         , @sequence::icarus_standard_triggersim.path  # from trigger_emulation_icarus.fcl
+                         pmtfixedthr,
+                         @sequence::icarus_standard_triggersim.path  # from trigger_emulation_icarus.fcl
                        ]
 
 icarus_stage0_mc_PMT:  [
                          @sequence::icarus_stage0_mc_trigger,
                          pmtbaselines,
-                         ophituncorrected,
-                         ophit,
+                         ophit,            # @local::icarus_ophit_MC
                          mcophit,
                          opflashCryoE,
                          opflashCryoW
                        ]
 
+icarus_stage0_overlay_PMT: [
+                         @sequence::icarus_stage0_mc_trigger,
+                         pmtbaselines,
+                         ophituncorrected, # @local::icarus_ophit_data
+                         ophit,            # ovveride to @local::icarus_ophit_timing_correction 
+                         mcophit,
+                         opflashCryoE,
+                         opflashCryoW
+]
+
 icarus_stage0_mc_crthit:  [crthit]
 icarus_stage0_mc_crtreco: [crttrack, crtpmt]
 
 # adapt input labels
 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.ophituncorrected.InputModule:       shifted
-icarus_stage0_mc_producers.ophit.InputLabels:                  ["ophituncorrected"]
+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.pmtbaselines.OpticalWaveforms:      shifted

fcl/reco/Stage0/mc/stage0_run2_icarus_mc.fcl

@@ -64,3 +64,7 @@ physics.producers.purityana1.RawModuleLabel:   ["MCDecodeTPCROI:PHYSCRATEDATATPC
 
 # restore legacy G4 labels
 physics.producers.mcophit.SimPhotonsProducer: "shifted"
+
+# set RUN-2 tune for optical reconstruction
+physics.producers.ophit.SPEArea: @local::SPERun2.Area
+physics.producers.ophit.SPEShift: @local::SPERun2.Shift

fcl/reco/Stage0/mc/stage0_run2_icarus_mc_notriggersim.fcl

@@ -4,5 +4,6 @@
 physics.producers.emuTrigger.BeamGates: "beamgate"
 physics.producers.mcophit.SimPhotonsProducer: "pdfastsim"
 physics.producers.opdetonbeam.Waveforms: "opdaq"
+physics.producers.ophit.InputModule: "opdaq"
 physics.producers.pmtbaselines.OpticalWaveforms: "opdaq"
 physics.producers.pmtfixedthr.OpticalWaveforms: "opdaq"

fcl/reco/Stage0/mc/stage0_run2_wc_icarus_mc.fcl

@@ -56,3 +56,7 @@ physics.producers.purityana1.RawModuleLabel:   ["MCDecodeTPCROI:PHYSCRATEDATATPC
 
 # restore legacy G4 labels
 physics.producers.mcophit.SimPhotonsProducer: "shifted"
+
+# set RUN-2 tune for optical reconstruction
+physics.producers.ophit.SPEArea: @local::SPERun2.Area
+physics.producers.ophit.SPEShift: @local::SPERun2.Shift

fcl/reco/Stage0/mc/stage0_run2_wc_icarus_mc_notriggersim.fcl

@@ -5,5 +5,6 @@ physics.producers.ophituncorrected.InputModule: "opdaq"
 physics.producers.emuTrigger.BeamGates: "beamgate"
 physics.producers.mcophit.SimPhotonsProducer: "pdfastsim"
 physics.producers.opdetonbeam.Waveforms: "opdaq"
+physics.producers.ophit.InputModule: "opdaq"
 physics.producers.pmtbaselines.OpticalWaveforms: "opdaq"
 physics.producers.pmtfixedthr.OpticalWaveforms: "opdaq"

fcl/reco/Stage0/partial/stage0_run2_opdetonly_icarus_overlay_reprocessing.fcl

@@ -9,15 +9,12 @@ process_name: OpMCstage0
 ## - need to pick correct reconstruction tune for PMT flow
 
 # execute PMT/CRT only path
-physics.path: [   @sequence::icarus_stage0_mc_PMT, 
+physics.path: [   @sequence::icarus_stage0_overlay_PMT, 
                   @sequence::icarus_stage0_mc_crtreco # only reco, hits from overlay
               ]
 
-# update ophit procedurs to pick up Run-2 SPE tune
-physics.producers.ophituncorrected.SPEArea: @local::SPERun2.Area
-physics.producers.ophituncorrected.SPEShift: @local::SPERun2.Shift
-physics.producers.ophitfulluncorrected.SPEArea: @local::SPERun2.Area
-physics.producers.ophitfulluncorrected.SPEShift: @local::SPERun2.Shift
+# update mcophit producer to pick up Run-2 SPE tune
+# main ophit producer picks up from the SPEArea database
 physics.producers.mcophit.SPEArea: @local::SPERun2.Area
 physics.producers.mcophit.SPEAmplitude: @local::SPERun2.Amplitude
 

fcl/reco/Stage0/partial/stage0_run3_opdetonly_icarus_overlay_reprocessing.fcl

@@ -1,9 +1,6 @@
 #include "stage0_run2_opdetonly_icarus_overlay_reprocessing.fcl"
 
-# update ophit procedurs to pick up Run-3 SPE tune
-physics.producers.ophituncorrected.SPEArea: @local::SPERun3.Area
-physics.producers.ophituncorrected.SPEShift: @local::SPERun3.Shift
-physics.producers.ophitfulluncorrected.SPEArea: @local::SPERun3.Area
-physics.producers.ophitfulluncorrected.SPEShift: @local::SPERun3.Shift
+# update mcophit producer to pick up Run-3 SPE tune
+# main ophit producer picks up from the SPEArea database
 physics.producers.mcophit.SPEArea: @local::SPERun3.Area
 physics.producers.mcophit.SPEAmplitude: @local::SPERun3.Amplitude

fcl/reco/Stage0/partial/stage0_run4_opdetonly_icarus_overlay_reprocessing.fcl

@@ -1,9 +1,6 @@
 #include "stage0_run2_opdetonly_icarus_overlay_reprocessing.fcl"
 
 # update ophit procedurs to pick up Run-4 SPE tune
-physics.producers.ophituncorrected.SPEArea: @local::SPERun4.Area
-physics.producers.ophituncorrected.SPEShift: @local::SPERun4.Shift
-physics.producers.ophitfulluncorrected.SPEArea: @local::SPERun4.Area
-physics.producers.ophitfulluncorrected.SPEShift: @local::SPERun4.Shift
+# main ophit producer picks up from the SPEArea database
 physics.producers.mcophit.SPEArea: @local::SPERun4.Area
 physics.producers.mcophit.SPEAmplitude: @local::SPERun4.Amplitude

icaruscode/PMT/OpReco/fcl/icarus_ophitfinder.fcl

@@ -191,10 +191,11 @@ icarus_ophit: # some basic configuration
    InputModule:    "opdaq"
    InputLabels:    []
    ChannelMasks:   []
-   UseCalibrator: true
+   UseCalibrator: true   # use calibrator service (SPEArea database)
+                         # if true, overrides SPEArea / SPEShift below
    HitThreshold:   0.2   # PE
    AreaToPE:       true  # Use area to calculate number of PEs
-   SPEArea:        @local::SPE.Area # If AreaToPE is true, this number is
+   SPEArea:        @local::SPE.Area  # If AreaToPE is true, this number is
                                         # used as single PE area (in ADC counts)
    SPEShift:       @local::SPE.Shift # Used by PhotonCalibratorStandard to compute
                                          # PE = area / SPEArea + SPEShift
@@ -216,7 +217,7 @@ icarus_ophitdebugger.OutputFile:  "ophit_debug.root"
 # this is the "standard" ICARUS configuration for MC optical hit reconstruction:
 icarus_ophit_MC: {
   @table::icarus_ophit
-  PedAlgoPset:    @local::icarus_opreco_pedestal_MC_DocDB24969
+  UseCalibrator: false
   InputModule: "opdaq"
 }
 
@@ -229,7 +230,6 @@ icarus_ophitdebugger_MC.OutputFile:  "ophit_debug.root"
 icarus_ophit_data: {
   @table::icarus_ophit
   InputModule: "daqPMT"
-#  PedAlgoPset: @local::icarus_opreco_pedestal_DocDB24969
 }
 
 icarus_ophitdebugger_data: @local::icarus_ophit_data