PetrilloAtWork · May 22, 2025 · Feb 8, 2025 · Feb 8, 2025 · Apr 12, 2025 · Jun 17, 2025
diff --git a/fcl/SkipTesting.txt b/fcl/SkipTesting.txt
@@ -18,6 +18,11 @@ services_compat_no_overburden_icarus_v3.fcl
 services_compat_overburden_icarus_v3.fcl
 set_caf_calconst.fcl
 
+override_services_for_simulation.fcl
+
+enable_overlay_sp.fcl
+enable_overlay_stage1.fcl
+
 
 ################################################################################
 # broken, won't fix
@@ -94,5 +99,3 @@ intime_gen_overlay_SimInfoMixer1.fcl
 prodcorsika_proton_intime_filter_bnb_siminfomixer.fcl
 prodcorsika_proton_intime_filter_bnb_siminfomixer2.fcl
 prodcorsika_proton_intime_filter_bnb_siminfomixer1.fcl
-# GRAY PUTNAM 5/8/25: "Enabler" fcl files that should not be dump'd on their own
-enable_overlay_sp.fcl
diff --git a/fcl/caf/cafmaker_defs.fcl b/fcl/caf/cafmaker_defs.fcl
@@ -283,6 +283,9 @@ caf_preprocess_sce_evtw_sequence: [@sequence::caf_preprocess_sce_sequence, rns,
 # CAFMaker config
 cafmaker: @local::standard_cafmaker
 
+# time shift and calibration settings
+cafmaker.ShiftTimeFromTriggerToBeamGate: true
+
 # Set the labels to ICARUS
 cafmaker.PandoraTagSuffixes: ["CryoE", "CryoW"]
 cafmaker.FlashMatchOpDetSuffixes: ["", "op"]
@@ -312,7 +315,6 @@ cafmaker.CRTTrackLabel: "crttrack"
 cafmaker.OpFlashLabel: "opflash"
 # cafmaker.TriggerLabel: "daqTrigger" # see also https://github.com/SBNSoftware/icaruscode/issues/556
 cafmaker.TriggerLabel: "emuTrigger"
-cafmaker.UnshiftedTriggerLabel: "emuTriggerUnshifted"
 cafmaker.CRTSimChanLabel: "shifted"
 cafmaker.FlashTrigLabel: "" # unavailable
 cafmaker.SimChannelLabel: "largeant"

diff --git a/fcl/caf/cafmakerjob_icarus.fcl b/fcl/caf/cafmakerjob_icarus.fcl
@@ -22,6 +22,8 @@ services:
   SpaceChargeService: @local::icarus_spacecharge
 }
 
+#include "override_services_for_simulation.fcl"
+
 outputs:
 {
   outpid:

diff --git a/fcl/decoder/decoder_run2_icarus.fcl b/fcl/decoder/decoder_run2_icarus.fcl
@@ -9,11 +9,11 @@ process_name: stage0
 ## Define the path we'll execute
 physics.path:     [ "filterdataintegrity",
       "triggerconfig",
-      "daqTrigger",                # Note sure if we actually need some of these trigger and PMT stuff other than daqPMT... Gianluca?
+      "daqTrigger",
       "pmtconfig",
       "daqPMT",
       "pmtconfigbaselines",
-      "pmtthr",                    # ???
+      "pmtthr",                    # discrimination for trigger emulation (cheaper than carrying waveforms around)
       "pmtbaselines",
       "daqCRT",
       "crthit",

diff --git a/fcl/detsim/CMakeLists.txt b/fcl/detsim/CMakeLists.txt
@@ -1,5 +1,6 @@
 # add underlying subfolders
 add_subdirectory(SBNNoise)
+add_subdirectory(partial)
 add_subdirectory(commissioning)
 add_subdirectory(archive)
 

diff --git a/fcl/detsim/commissioning/run4642like_detsim_icarus.fcl b/fcl/detsim/commissioning/run4642like_detsim_icarus.fcl
@@ -25,7 +25,7 @@
 #
 
 #include "services_common_icarus.fcl"
-#include "opdetsim_pmt_icarus.fcl"
+#include "pmtsimulation_icarus.fcl"
 #include "rootoutput_icarus.fcl"
 
 process_name: DetSim4642
@@ -38,7 +38,7 @@ services: @local::icarus_common_services  # from services_common_icarus.fcl
 physics: {
   producers: {
     opdaq: {
-      @table::icarus_simpmt_noise  # from opdetsim_pmt_icarus.fcl
+      @table::icarus_pmtsimulationalg_202202_noise  # from pmtsimulation_icarus.fcl
 
       #
       # enabled readout window

diff --git a/fcl/detsim/commissioning/run4759like_detsim_icarus.fcl b/fcl/detsim/commissioning/run4759like_detsim_icarus.fcl
@@ -25,7 +25,7 @@
 #
 
 #include "services_common_icarus.fcl"
-#include "opdetsim_pmt_icarus.fcl"
+#include "pmtsimulation_icarus.fcl"
 #include "rootoutput_icarus.fcl"
 
 process_name: DetSim4759
@@ -38,7 +38,7 @@ services: @local::icarus_common_services  # from services_common_icarus.fcl
 physics: {
   producers: {
     opdaq: {
-      @table::icarus_simpmt_noise  # from opdetsim_pmt_icarus.fcl
+      @table::icarus_pmtsimulationalg_202202_noise  # from pmtsimulation_icarus.fcl
 
       #
       # enabled readout window

diff --git a/fcl/detsim/detsim_1d_icarus.fcl b/fcl/detsim/detsim_1d_icarus.fcl
@@ -99,3 +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.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,3 +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.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,5 +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.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
@@ -0,0 +1,7 @@
+#include "detsim_2d_icarus_refactored.fcl"
+
+# 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.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
@@ -1,3 +1,10 @@
 #include "detsim_2d_icarus_refactored.fcl"
 
 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.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
@@ -0,0 +1,7 @@
+#include "detsim_2d_icarus_refactored_overlay.fcl"
+
+# Run3/4 optical tune (with no noise)
+physics.producers.opdaq: @local::icarus_simpmt_run4_nonoise
+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
@@ -65,6 +65,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.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
@@ -1,3 +1,9 @@
 #include "detsim_2d_icarus_refactored_yzsim.fcl"
 
 physics.producers.daq.wcls_main.params.YZScaleMapJson: "yzmap_gain_icarus_v4_run4.json"
+
+# 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.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,3 +57,6 @@ outputs: {
 }
 
 physics.producers.opdaq.InputModule: "pdfastsim"
+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
@@ -1,3 +1,9 @@
 #include "detsim_2d_icarus_refactored_yzsim_notrigger.fcl"
 
 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.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,3 +4,10 @@ physics.producers.daq0: @local::icarus_simwire_wirecell_yz_overlay_0
 physics.producers.daq1: @local::icarus_simwire_wirecell_yz_overlay_1
 physics.producers.daq2: @local::icarus_simwire_wirecell_yz_overlay_2
 physics.producers.daq3: @local::icarus_simwire_wirecell_yz_overlay_3
+
+# turn off mc noise on pmt waveforms 
+physics.producers.opdaq: @local::icarus_simpmt_nonoise
+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
@@ -1,3 +1,9 @@
 #include "detsim_2d_icarus_refactored_yzsim_overlay.fcl"
 
 physics.producers.daq.wcls_main.params.YZScaleMapJson: "yzmap_gain_icarus_v4_run4.json"
+
+# Run3/4 optical tune (with no noise)
+physics.producers.opdaq: @local::icarus_simpmt_run4_nonoise
+physics.producers.opdaq.ApplyTimingDelays:        true
+physics.producers.opdaq.UseGainDatabase:          true
+physics.producers.opdaq.UseChannelStatusDatabase: true
diff --git a/fcl/detsim/partial/CMakeLists.txt b/fcl/detsim/partial/CMakeLists.txt
@@ -0,0 +1,8 @@
+# Install fcl files in /job subdirectory.
+install_fhicl()
+
+# Also put a copy in the source tree.
+
+FILE(GLOB fcl_files *.fcl)
+install_source( EXTRAS ${fcl_files} )
+
diff --git a/fcl/detsim/partial/detsim_opdetonly_icarus.fcl b/fcl/detsim/partial/detsim_opdetonly_icarus.fcl
@@ -0,0 +1,40 @@
+#
+# File:    detsim_opdetonly_icarus.fcl
+# Purpose: Simulation of the optical detector response.
+# Date:    January 27, 2025
+# Author:  Gianluca Petrillo (petrillo@slac.stanford.edu)
+#
+# This job configuration runs the standard detector simulation, like
+# `detsim_1d_icarus.fcl` does, but only for the optical detector.
+#
+#
+# Output
+# -------
+#
+# * `std::vector<raw::OpDetWaveform>` (`opdaq`): raw PMT waveforms
+#
+#
+#
+#
+# Changes
+# --------
+#
+# 20250127 (petrillo@slac.stanford.edu) [v1.0]
+#   original version (from `detsim_1d_icarus.fcl`)
+#
+
+#include "detsim_1d_icarus.fcl"
+
+process_name: OpDetSim
+
+services.DetPedestalService:         @erase
+services.ChannelStatusService:       @erase
+services.IICARUSChannelMap:          @erase
+services.SignalShapingICARUSService: @erase
+
+# run only the `opdaq` module:
+physics.producers: {
+  opdaq: @local::physics.producers.opdaq  # simplify configuration removing all other producers
+}
+physics.simulate: [ opdaq ]
+
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,6 +22,8 @@ services: @@
       SpaceChargeService: @local::icarus_spacecharge
     }
+    #include "override_services_for_simulation.fcl"
     outputs:
     {
       outpid:
@@ Expand Down @@