SBNSoftware · mvicenzi · Jan 13, 2026 · Jan 13, 2026 · Jan 13, 2026 · Jan 13, 2026
diff --git a/fcl/detsim/detsim_1d_icarus.fcl b/fcl/detsim/detsim_1d_icarus.fcl
@@ -99,4 +99,6 @@ services.Geometry.GDML: "icarus_complete_20220518_overburden.gdml"
 services.Geometry.ROOT: "icarus_complete_20220518_overburden.gdml"
 physics.producers.crtdaq.G4ModuleLabel: "largeant"
 physics.producers.opdaq.InputModule: "largeant"
-physics.producers.opdaq.ApplyTimingDelays: false  # keep false for non-overlay MC
+physics.producers.opdaq.ApplyTimingDelays:        false  # keep false for non-overlay MC
+physics.producers.opdaq.UseGainDatabase:          false  # keep false for non-overlay MC
+physics.producers.opdaq.UseChannelStatusDatabase: false  # keep false for non-overlay MC
diff --git a/fcl/detsim/detsim_2d_icarus.fcl b/fcl/detsim/detsim_2d_icarus.fcl
@@ -55,4 +55,6 @@ outputs: {
 services.Geometry.GDML: "icarus_complete_20220518_overburden.gdml"
 services.Geometry.ROOT: "icarus_complete_20220518_overburden.gdml"
 physics.producers.crtdaq.G4ModuleLabel: "shifted"
-physics.producers.opdaq.ApplyTimingDelays: false  # keep false for non-overlay MC
+physics.producers.opdaq.ApplyTimingDelays:        false  # keep false for non-overlay MC
+physics.producers.opdaq.UseGainDatabase:          false  # keep false for non-overlay MC
+physics.producers.opdaq.UseChannelStatusDatabase: false  # keep false for non-overlay MC
diff --git a/fcl/detsim/detsim_2d_icarus_refactored.fcl b/fcl/detsim/detsim_2d_icarus_refactored.fcl
@@ -53,6 +53,8 @@ outputs: {
 
 physics.producers.crtdaq.G4ModuleLabel: "shifted"
 physics.producers.opdaq.InputModule: "pdfastsim"
-physics.producers.opdaq.ApplyTimingDelays: false  # keep false for non-overlay MC
+physics.producers.opdaq.ApplyTimingDelays:        false  # keep false for non-overlay MC
+physics.producers.opdaq.UseGainDatabase:          false  # keep false for non-overlay MC
+physics.producers.opdaq.UseChannelStatusDatabase: false  # keep false for non-overlay MC
 physics.producers.shifted.InitAuxDetSimChannelLabel: "genericcrt"
 physics.producers.shifted.InitSimPhotonsLabel: "pdfastsim"
diff --git a/fcl/detsim/detsim_2d_icarus_refactored_Run4.fcl b/fcl/detsim/detsim_2d_icarus_refactored_Run4.fcl
@@ -2,4 +2,6 @@
 
 # Run3/4 optical tune
 physics.producers.opdaq: @local::icarus_simpmt_run4
-physics.producers.opdaq.ApplyTimingDelays: false  # keep false for non-overlay MC
+physics.producers.opdaq.ApplyTimingDelays:        false  # keep false for non-overlay MC
+physics.producers.opdaq.UseGainDatabase:          false  # keep false for non-overlay MC
+physics.producers.opdaq.UseChannelStatusDatabase: false  # keep false for non-overlay MC
diff --git a/fcl/detsim/detsim_2d_icarus_refactored_overlay.fcl b/fcl/detsim/detsim_2d_icarus_refactored_overlay.fcl
@@ -4,5 +4,7 @@ physics.producers.daq: @local::icarus_simwire_wirecell_shifted_overlay
 
 # turn off mc noise on pmt waveforms 
 physics.producers.opdaq: @local::icarus_simpmt_nonoise
-physics.producers.opdaq.ApplyTimingDelays: true 
+physics.producers.opdaq.ApplyTimingDelays:        true
+physics.producers.opdaq.UseGainDatabase:          true
+physics.producers.opdaq.UseChannelStatusDatabase: true
 
diff --git a/fcl/detsim/detsim_2d_icarus_refactored_overlay_Run4.fcl b/fcl/detsim/detsim_2d_icarus_refactored_overlay_Run4.fcl
@@ -2,4 +2,6 @@
 
 # Run3/4 optical tune (with no noise)
 physics.producers.opdaq: @local::icarus_simpmt_run4_nonoise
-physics.producers.opdaq.ApplyTimingDelays: true 
+physics.producers.opdaq.ApplyTimingDelays:        true
+physics.producers.opdaq.UseGainDatabase:          true
+physics.producers.opdaq.UseChannelStatusDatabase: true
diff --git a/fcl/detsim/detsim_2d_icarus_refactored_yzsim.fcl b/fcl/detsim/detsim_2d_icarus_refactored_yzsim.fcl
@@ -62,7 +62,9 @@ outputs: {
 
 physics.producers.crtdaq.G4ModuleLabel: "shifted"
 physics.producers.opdaq.InputModule: "pdfastsim"
-physics.producers.opdaq.ApplyTimingDelays: false  # keep false for non-overlay MC
+physics.producers.opdaq.ApplyTimingDelays:        false  # keep false for non-overlay MC
+physics.producers.opdaq.UseGainDatabase:          false  # keep false for non-overlay MC
+physics.producers.opdaq.UseChannelStatusDatabase: false  # keep false for non-overlay MC
 physics.producers.shifted.InitAuxDetSimChannelLabel: "genericcrt"
 physics.producers.shifted.InitSimPhotonsLabel: "pdfastsim"
 physics.producers.filtersed.InitSimEnergyDepositLabel: "shifted"

diff --git a/fcl/detsim/detsim_2d_icarus_refactored_yzsim_Run4.fcl b/fcl/detsim/detsim_2d_icarus_refactored_yzsim_Run4.fcl
@@ -4,4 +4,6 @@ physics.producers.daq.wcls_main.params.YZScaleMapJson: "yzmap_gain_icarus_v4_run
 
 # Run3/4 optical tune
 physics.producers.opdaq: @local::icarus_simpmt_run4
-physics.producers.opdaq.ApplyTimingDelays: false  # keep false for non-overlay MC
+physics.producers.opdaq.ApplyTimingDelays:        false  # keep false for non-overlay MC
+physics.producers.opdaq.UseGainDatabase:          false  # keep false for non-overlay MC
+physics.producers.opdaq.UseChannelStatusDatabase: false  # keep false for non-overlay MC
diff --git a/fcl/detsim/detsim_2d_icarus_refactored_yzsim_notrigger.fcl b/fcl/detsim/detsim_2d_icarus_refactored_yzsim_notrigger.fcl
@@ -57,4 +57,6 @@ outputs: {
 }
 
 physics.producers.opdaq.InputModule: "pdfastsim"
-physics.producers.opdaq.ApplyTimingDelays: false  # keep false for non-overlay MC
+physics.producers.opdaq.ApplyTimingDelays:        false  # keep false for non-overlay MC
+physics.producers.opdaq.UseGainDatabase:          false  # keep false for non-overlay MC
+physics.producers.opdaq.UseChannelStatusDatabase: false  # keep false for non-overlay MC
diff --git a/fcl/detsim/detsim_2d_icarus_refactored_yzsim_notrigger_overlay.fcl b/fcl/detsim/detsim_2d_icarus_refactored_yzsim_notrigger_overlay.fcl
@@ -4,4 +4,6 @@ physics.producers.daq: @local::icarus_simwire_wirecell_yz_overlay
 
 # turn off mc noise on pmt waveforms 
 physics.producers.opdaq: @local::icarus_simpmt_nonoise
-physics.producers.opdaq.ApplyTimingDelays: true
+physics.producers.opdaq.ApplyTimingDelays:        true
+physics.producers.opdaq.UseGainDatabase:          true
+physics.producers.opdaq.UseChannelStatusDatabase: true
diff --git a/fcl/detsim/detsim_2d_icarus_refactored_yzsim_overlay.fcl b/fcl/detsim/detsim_2d_icarus_refactored_yzsim_overlay.fcl
@@ -4,4 +4,6 @@ physics.producers.daq: @local::icarus_simwire_wirecell_yz_overlay
 
 # turn off mc noise on pmt waveforms 
 physics.producers.opdaq: @local::icarus_simpmt_nonoise
-physics.producers.opdaq.ApplyTimingDelays: true 
+physics.producers.opdaq.ApplyTimingDelays:        true
+physics.producers.opdaq.UseGainDatabase:          true
+physics.producers.opdaq.UseChannelStatusDatabase: true
diff --git a/fcl/detsim/detsim_2d_icarus_refactored_yzsim_overlay_Run4.fcl b/fcl/detsim/detsim_2d_icarus_refactored_yzsim_overlay_Run4.fcl
@@ -4,4 +4,6 @@ physics.producers.daq.wcls_main.params.YZScaleMapJson: "yzmap_gain_icarus_v4_run
 
 # Run3/4 optical tune (with no noise)
 physics.producers.opdaq: @local::icarus_simpmt_run4_nonoise
-physics.producers.opdaq.ApplyTimingDelays: true
+physics.producers.opdaq.ApplyTimingDelays:        true
+physics.producers.opdaq.UseGainDatabase:          true
+physics.producers.opdaq.UseChannelStatusDatabase: true
diff --git a/fcl/detsim/partial/detsim_opdetonly_icarus_overlay_reprocessing_run2.fcl b/fcl/detsim/partial/detsim_opdetonly_icarus_overlay_reprocessing_run2.fcl
@@ -72,7 +72,9 @@ physics.producers: {
 
 # build waveforms from simPhotons (already shifted)
 physics.producers.opdaq.InputModule: "shifted::DetSim"
-physics.producers.opdaq.ApplyTimingDelays: true
+physics.producers.opdaq.ApplyTimingDelays:        true
+physics.producers.opdaq.UseGainDatabase:          true
+physics.producers.opdaq.UseChannelStatusDatabase: true
 
 # make sure the triggersim chain used the "new" products
 # instead of the "old" ones which I cannot drop on input

diff --git a/fcl/detsim/partial/detsim_opdetonly_icarus_overlay_reprocessing_run4.fcl b/fcl/detsim/partial/detsim_opdetonly_icarus_overlay_reprocessing_run4.fcl
@@ -11,4 +11,6 @@
 # switch to Run3/Run-4 tune
 physics.producers.opdaq: @local::icarus_simpmt_run4_nonoise
 physics.producers.opdaq.InputModule: "shifted::DetSim"
-physics.producers.opdaq.ApplyTimingDelays: true
+physics.producers.opdaq.ApplyTimingDelays:        true
+physics.producers.opdaq.UseGainDatabase:          true
+physics.producers.opdaq.UseChannelStatusDatabase: true
diff --git a/fcl/reco/Definitions/stage0_icarus_driver_common.fcl b/fcl/reco/Definitions/stage0_icarus_driver_common.fcl
@@ -4,6 +4,7 @@
 #include "stage0_icarus_defs.fcl"
 #include "services_common_icarus.fcl"
 #include "channelmapping_icarus.fcl"
+#include "pmt_channel_status_icarus.fcl"
 
 process_name: Stage0
 
@@ -13,6 +14,7 @@ services:
   IICARUSChannelMap:           @local::icarus_channelmappinggservice
   IPMTTimingCorrectionService: @local::icarus_pmttimingservice
   IPhotonCalibratorService:    @local::icarus_photon_calibration
+  IPMTChannelStatusService:    @local::icarus_pmt_channel_status
                                @table::icarus_wirecalibration_minimum_services
 }
 

diff --git a/fcl/reco/Definitions/stage0_icarus_mc_defs.fcl b/fcl/reco/Definitions/stage0_icarus_mc_defs.fcl
@@ -76,7 +76,6 @@ icarus_stage0_overlay_PMT: [
                          ophituncorrected, # @local::icarus_ophit_data
                          ophit,            # ovveride to @local::icarus_ophit_timing_correction 
                                            # this happens in enable_overlay.fcl 
-                         mcophit,
                          opflashCryoE,
                          opflashCryoW
 ]

diff --git a/fcl/reco/Stage0/data/partial/decodePMT_icarus.fcl b/fcl/reco/Stage0/data/partial/decodePMT_icarus.fcl
@@ -53,6 +53,7 @@
 #include "services_common_icarus.fcl"
 #include "channelmapping_icarus.fcl"
 #include "timing_icarus.fcl"
+#include "pmt_channel_status_icarus.fcl"
 
 #include "rootoutput_icarus.fcl"
 #include "decoderdefs_icarus.fcl"
@@ -71,7 +72,8 @@ services: {
   DetectorClocksService:       @local::icarus_detectorclocks
   IICARUSChannelMap:           @local::icarus_channelmappinggservice
   IPMTTimingCorrectionService: @local::icarus_pmttimingservice
-
+  IPMTChannelStatusService:    @local::icarus_pmt_channel_status
+
   TFileService: { fileName: "Trees-%ifb_%tc-%p.root" }
 }
 

diff --git a/fcl/reco/Stage0/overlay/stage0_run3_wc_icarus_overlay.fcl b/fcl/reco/Stage0/overlay/stage0_run3_wc_icarus_overlay.fcl
diff --git a/fcl/reco/Stage0/overlay/stage0_run3_wcdnn_icarus_overlay.fcl b/fcl/reco/Stage0/overlay/stage0_run3_wcdnn_icarus_overlay.fcl
diff --git a/fcl/reco/Stage0/overlay/stage0_run4_wc_icarus_overlay.fcl b/fcl/reco/Stage0/overlay/stage0_run4_wc_icarus_overlay.fcl
diff --git a/fcl/reco/Stage0/overlay/stage0_run4_wcdnn_icarus_overlay.fcl b/fcl/reco/Stage0/overlay/stage0_run4_wcdnn_icarus_overlay.fcl
diff --git a/fcl/reco/Stage0/partial/stage0_run2_opdetonly_icarus_overlay_reprocessing.fcl b/fcl/reco/Stage0/partial/stage0_run2_opdetonly_icarus_overlay_reprocessing.fcl
@@ -16,10 +16,6 @@
 ## This would make the data component consistent and the MC signal biased.
 ## Such a choice makes the configuration independent of the run period...
 
-## ... excpet for the `mcophit` module (fake hit reconstruction)
-## This module requires a fixed SPE tune (no db interface) so it must be manually set
-## to the run-period SPE tune used in DetSim.
-
 process_name: OpMCstage0
 
 ## only perform PMT/CRT MCstage0 on top of reprocessed MC overlay files
@@ -33,10 +29,5 @@ physics.path: [   @sequence::icarus_stage0_overlay_PMT,
                   @sequence::icarus_stage0_mc_crtreco # only reco, hits from overlay
               ]
 
-## update mcophit producer to pick up Run-2 SPE tune
-## (ophit picks up SPEArea from the database automatically)
-physics.producers.mcophit.SPEArea: @local::SPERun2.Area
-physics.producers.mcophit.SPEAmplitude: @local::SPERun2.Amplitude
-
 
 
diff --git a/fcl/reco/Stage0/partial/stage0_run3_opdetonly_icarus_overlay_reprocessing.fcl b/fcl/reco/Stage0/partial/stage0_run3_opdetonly_icarus_overlay_reprocessing.fcl
diff --git a/fcl/reco/Stage0/partial/stage0_run4_opdetonly_icarus_overlay_reprocessing.fcl b/fcl/reco/Stage0/partial/stage0_run4_opdetonly_icarus_overlay_reprocessing.fcl
diff --git a/fcl/services/services_icarus_simulation.fcl b/fcl/services/services_icarus_simulation.fcl
@@ -40,6 +40,8 @@
 #include "signalservices_icarus.fcl"
 #include "photpropservices_icarus.fcl"
 #include "timing_icarus.fcl"
+#include "pmt_channel_status_icarus.fcl"
+#include "pmt_calibration_icarus.fcl"
 
 BEGIN_PROLOG
 
@@ -115,11 +117,12 @@ icarus_g4_services: {
 
 # Define icarus_detsim_services ... (2*)
 icarus_detsim_services: {
-    
+
     @table::icarus_detsim_dark_services
     IPMTTimingCorrectionService:       @local::icarus_pmttimingservice
-    # PmtGainService:                 @local::icarus_pmtgain_service
-
+    IPMTChannelStatusService:          @local::icarus_pmt_channel_status
+    IPhotonCalibratorService:          @local::icarus_photon_calibration
+
 } # icarus_detsim_services
 
 

diff --git a/icaruscode/PMT/Algorithms/CMakeLists.txt b/icaruscode/PMT/Algorithms/CMakeLists.txt
@@ -6,6 +6,7 @@ art_make_library(
         SOURCE ${lib_srcs}
 	LIBRARIES
 		icaruscode::Decode_DecoderTools
+                icaruscode::PMT_Calibration
 		icarusalg::Utilities
 		larcorealg::Geometry
 		lardataobj::RawData