SBNSoftware · mattiasotgia · May 16, 2025 · May 16, 2025 · May 16, 2025 · May 17, 2025
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -17,9 +17,9 @@ cmake_minimum_required(VERSION 3.20 FATAL_ERROR)
 # cmake_policy(VERSION 3.19)
 
 find_package(cetmodules 3.24.01 REQUIRED)
-#project(icaruscode VERSION 10.06.00.01 LANGUAGES CXX)
+#project(icaruscode VERSION 10.06.00.06 LANGUAGES CXX)
 
-set(${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING 10.06.00.01-p03)
+set(${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING 10.06.00.06-p03)
 project(icaruscode LANGUAGES CXX)
 
 message(STATUS

diff --git a/fcl/caf/cafmaker_add_detsim2d_icarus.fcl b/fcl/caf/cafmaker_add_detsim2d_icarus.fcl
@@ -3,16 +3,3 @@ physics.producers.cafmaker.SimChannelLabel: "merge" # 2D, YZ sim
 
 # SimChannel's get re-made by 2D drift simulation -- use these to backtrack
 services.BackTrackerService.BackTracker.SimChannelModuleLabel: "merge"
-
-# MCReco also needs correct SimChannels
-# need to use new config names to make MCParticle/SimChannel labels different
-physics.producers.mcreco.G4ModName: @erase 
-physics.producers.mcreco.MCParticleLabel: "largeant"
-physics.producers.mcreco.SimChannelLabel: "merge"
-
-# Mini production, pre signal shape tuning
-# this_cal_constants: [1.343e-2, 1.338e-2, 0.01227]
-# Post signal shape tuning, post gain fixing
-# See docdb 32139
-this_cal_constants: [1.343e-2, 1.338e-2, 0.0128041]
-#include "set_caf_calconst.fcl"
diff --git a/fcl/caf/cafmaker_add_overlay_icarus.fcl b/fcl/caf/cafmaker_add_overlay_icarus.fcl
@@ -0,0 +1,7 @@
+physics.producers.cafmaker.CRTHitLabel: overlayCRTHit
+
+services.BackTrackerService.BackTracker.OverrideRealData: true
+services.ParticleInventoryService.ParticleInventory.OverrideRealData: true
+
+physics.producers.cafmaker.OverrideRealData: true
+physics.producers.cafmaker.CreateBlindedCAF: false
diff --git a/fcl/caf/cafmaker_defs.fcl b/fcl/caf/cafmaker_defs.fcl
@@ -14,7 +14,7 @@
 #include "eventweight_genie_sbn.fcl"
 #include "eventweight_genie_systtools.fcl"
 #include "eventweight_flux_sbn.fcl"
-#include "mcreco.fcl"
+#include "eventweight_geant4_sbn.fcl"
 #include "mcsproducer.fcl"
 #include "rangeproducer.fcl"
 #include "flashmatch_simple_icarus.fcl"
@@ -87,8 +87,6 @@ recoana_datacalo_producers.vertexStubCryoW.NormTools: @local::icarus_calonormtoo
 
 # Producers for making analysis level products
 recoana_caf_preprocess_producers: {
-  mcreco: @local::standard_mcreco
-
   pandoraTrackMCSCryoE: @local::mcs_sbn
   pandoraTrackMCSCryoW: @local::mcs_sbn
 
@@ -105,6 +103,7 @@ recoana_caf_preprocess_producers: {
   genieweight: @local::sbn_eventweight_genie
   systtools: @local::sbn_systtools
   fluxweight: @local::sbn_eventweight_flux
+  geant4weight: @local::sbn_eventweight_geant4
 }
 
 # Overwrite labels
@@ -124,6 +123,7 @@ recoana_caf_preprocess_producers.pandoraPidGausCryoW.CalorimetryModuleLabel: "pa
 
 recoana_caf_preprocess_producers.genieweight.weight_functions: @local::recoana_caf_preprocess_producers.genieweight.weight_functions_genie
 recoana_caf_preprocess_producers.fluxweight.weight_functions: @local::recoana_caf_preprocess_producers.fluxweight.weight_functions_flux
+recoana_caf_preprocess_producers.geant4weight.weight_functions: @local::recoana_caf_preprocess_producers.geant4weight.weight_functions_reint
 
 # Producers for making SCE products
 recoana_sce_producers: {
@@ -228,7 +228,7 @@ caf_preprocess_sce_producers: {
 }
 
 # Sequences
-caf_preprocess_sequence: [ mcreco,
+caf_preprocess_sequence: [ 
     # Calorimetry
     pandoraCaloGausCryoE, pandoraCaloGausCryoW,
     pandoraPidGausCryoE, pandoraPidGausCryoW,
@@ -256,9 +256,9 @@ caf_preprocess_data_sequence: [
     ShowerCosmicDistCryoE, ShowerCosmicDistCryoW
     ]
 
-caf_preprocess_evtw_sequence: [@sequence::caf_preprocess_sequence, rns, genieweight, fluxweight]
+caf_preprocess_evtw_sequence: [@sequence::caf_preprocess_sequence, rns, genieweight, fluxweight, geant4weight]
 
-caf_preprocess_sce_sequence: [ mcreco,
+caf_preprocess_sce_sequence: [ 
   # Run the SCE correction
   pandoraGausSCECryoE, pandoraGausSCECryoW,
   # Then remake tracks
@@ -278,7 +278,7 @@ caf_preprocess_sce_sequence: [ mcreco,
   # TODO: rns??
 ]
 
-caf_preprocess_sce_evtw_sequence: [@sequence::caf_preprocess_sce_sequence, rns, genieweight, fluxweight]
+caf_preprocess_sce_evtw_sequence: [@sequence::caf_preprocess_sce_sequence, rns, genieweight, fluxweight, geant4weight]
 
 # CAFMaker config
 cafmaker: @local::standard_cafmaker
@@ -313,6 +313,7 @@ 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"
 cafmaker.SystWeightLabels: ["genieweight", "fluxweight"]

diff --git a/fcl/caf/cafmakerjob_icarus_detsim2d_noyzsim.fcl b/fcl/caf/cafmakerjob_icarus_detsim2d_noyzsim.fcl
@@ -0,0 +1,11 @@
+#include "cafmakerjob_icarus.fcl"
+#include "cafmaker_add_detsim2d_icarus.fcl"
+
+# Fix for CAFMaker simchannel -- using correct (?)
+physics.producers.cafmaker.SimChannelLabel: "daq:simpleSC"
+
+# Fix for BackTracker simchannel
+services.BackTrackerService.BackTracker.SimChannelModuleLabel: "daq:simpleSC"
+
+# Fix for MCReco simchannel
+physics.producers.mcreco.SimChannelLabel: "daq:simpleSC"
diff --git a/fcl/caf/cafmakerjob_icarus_detsim2d_overlay.fcl b/fcl/caf/cafmakerjob_icarus_detsim2d_overlay.fcl
@@ -1,7 +1,8 @@
 #include "cafmakerjob_icarus.fcl"
-#include "cafmaker_add_detsim2d_icarus.fcl"
 
-services.BackTrackerService.BackTracker.OverrideRealData: true
-services.ParticleInventoryService.ParticleInventory.OverrideRealData: true
+# overwrite the producers to use data versions
+physics.producers: @local::caf_preprocess_data_producers
+physics.runprod: [ @sequence::caf_preprocess_data_sequence, cafmaker]
 
-physics.producers.cafmaker.OverrideRealData: true
+#include "cafmaker_add_detsim2d_icarus.fcl"
+#include "cafmaker_add_overlay_icarus.fcl"
diff --git a/fcl/caf/cafmakerjob_icarus_detsim2d_overlay_simpledet.fcl b/fcl/caf/cafmakerjob_icarus_detsim2d_overlay_simpledet.fcl
@@ -0,0 +1,4 @@
+#include "cafmakerjob_icarus_detsim2d_overlay.fcl"
+
+physics.producers.cafmaker.SimChannelLabel: "daq:simpleSC"
+services.BackTrackerService.BackTracker.SimChannelModuleLabel: "daq:simpleSC"
diff --git a/fcl/caf/cafmakerjob_icarus_detsim2d_simpledet.fcl b/fcl/caf/cafmakerjob_icarus_detsim2d_simpledet.fcl
@@ -0,0 +1,4 @@
+#include "cafmakerjob_icarus_detsim2d.fcl"
+
+physics.producers.cafmaker.SimChannelLabel: "daq:simpleSC"
+services.BackTrackerService.BackTracker.SimChannelModuleLabel: "daq:simpleSC"
diff --git a/fcl/caf/cafmakerjob_icarus_detsim2d_systtools_and_fluxwgt_overlay.fcl b/fcl/caf/cafmakerjob_icarus_detsim2d_systtools_and_fluxwgt_overlay.fcl
@@ -1,5 +1,10 @@
 #include "cafmakerjob_icarus_detsim2d_systtools_and_fluxwgt.fcl"
 
-services.BackTrackerService.BackTracker.OverrideRealData: true
-services.ParticleInventoryService.ParticleInventory.OverrideRealData: true
-physics.producers.cafmaker.OverrideRealData: true
+# overwrite the producers to use data versions
+physics.producers: @local::caf_preprocess_data_producers
+physics.runprod: [ @sequence::caf_preprocess_data_sequence, rns, systtools, geant4weight, fluxweight, cafmaker]
+
+physics.producers.cafmaker.SystWeightLabels: ["systtools", "geant4weight", "fluxweight"]
+
+#include "cafmaker_add_detsim2d_icarus.fcl"
+#include "cafmaker_add_overlay_icarus.fcl"
diff --git a/fcl/caf/cafmakerjob_icarus_sce_systtools.fcl b/fcl/caf/cafmakerjob_icarus_sce_systtools.fcl
@@ -1,6 +1,6 @@
 #include "cafmakerjob_icarus_sce.fcl"
 
-physics.runprod: [ @sequence::caf_preprocess_sce_sequence, rns, systtools, cafmaker ]
+physics.runprod: [ @sequence::caf_preprocess_sce_sequence, rns, systtools, geant4weight, cafmaker ]
 
-physics.producers.cafmaker.SystWeightLabels: ["systtools"]
+physics.producers.cafmaker.SystWeightLabels: ["systtools", "geant4weight"]
 
diff --git a/fcl/caf/cafmakerjob_icarus_sce_systtools_and_fluxwgt.fcl b/fcl/caf/cafmakerjob_icarus_sce_systtools_and_fluxwgt.fcl
@@ -1,6 +1,6 @@
 #include "cafmakerjob_icarus_sce.fcl"
 
-physics.runprod: [ @sequence::caf_preprocess_sce_sequence, rns, systtools, fluxweight, cafmaker ]
+physics.runprod: [ @sequence::caf_preprocess_sce_sequence, rns, systtools, geant4weight, fluxweight, cafmaker ]
 
-physics.producers.cafmaker.SystWeightLabels: ["systtools", "fluxweight"]
+physics.producers.cafmaker.SystWeightLabels: ["systtools", "geant4weight", "fluxweight"]
 
diff --git a/fcl/caf/cafmakerjob_icarus_systtools.fcl b/fcl/caf/cafmakerjob_icarus_systtools.fcl
@@ -1,6 +1,6 @@
 #include "cafmakerjob_icarus.fcl"
 
-physics.runprod: [ @sequence::caf_preprocess_sequence, rns, systtools, cafmaker ]
+physics.runprod: [ @sequence::caf_preprocess_sequence, rns, systtools, geant4weight, cafmaker ]
 
-physics.producers.cafmaker.SystWeightLabels: ["systtools"]
+physics.producers.cafmaker.SystWeightLabels: ["systtools", "geant4weight"]
 
diff --git a/fcl/caf/cafmakerjob_icarus_systtools_and_fluxwgt.fcl b/fcl/caf/cafmakerjob_icarus_systtools_and_fluxwgt.fcl
@@ -1,6 +1,6 @@
 #include "cafmakerjob_icarus.fcl"
 
-physics.runprod: [ @sequence::caf_preprocess_sequence, rns, systtools, fluxweight, cafmaker ]
+physics.runprod: [ @sequence::caf_preprocess_sequence, rns, systtools, geant4weight, fluxweight, cafmaker ]
 
-physics.producers.cafmaker.SystWeightLabels: ["systtools", "fluxweight"]
+physics.producers.cafmaker.SystWeightLabels: ["systtools", "geant4weight", "fluxweight"]
 
diff --git a/fcl/configurations/calibration_database_GlobalTags_icarus.fcl b/fcl/configurations/calibration_database_GlobalTags_icarus.fcl
@@ -5,8 +5,8 @@
 BEGIN_PROLOG
 
 ICARUS_Calibration_GlobalTags: {
-  @table::TPC_CalibrationTags_Jan2025
-  @table::PMT_CalibrationTags_Run3_Feb2025
+  @table::TPC_CalibrationTags_Oct2025
+  @table::PMT_CalibrationTags_Oct2025
   @table::CRT_CalibrationTags_Oct2023
 }
 

diff --git a/fcl/configurations/calibration_database_PMT_TagSets_icarus.fcl b/fcl/configurations/calibration_database_PMT_TagSets_icarus.fcl
@@ -79,4 +79,26 @@ PMT_CalibrationTags_Run3_Feb2025: {
                                      # Run 3: run>=11590
 }
 
+# These are the standard tags for analyses on Run 1, Run 2, Run 3 and Run 4 data (as of Oct 2025)
+# These tagged versions of the databases contain tables relevant for Run 1, Run 2, Run 3 and Run 4.
+# Notes: 
+#   - New cosmics corrections for Run 4 (run>=12837)
+PMT_CalibrationTags_Oct2025: {
+  pmt_cables_delays_data:    "v2r5"  # tables for run>=0 (null)
+                                     # Run 1: run>=8046
+                                     # Run 2: run>=9301, run>=9628, run>=9773
+                                     # Run 3: run>=10369, run>=10441, run>=10865
+                                     # Run 4: run>=12040, run>=12455, run>=12777
+  pmt_laser_timing_data:     "v2r3"  # tables for run>=0 (null)
+                                     # Run 1: run>=8046
+                                     # Run 2: run>=9301, run>=9628, run>=9773
+                                     # Run 3: run>=10908, run>=11590
+                                     # Run 4: run>=12058, run>=12837
+  pmt_cosmics_timing_data:   "v2r3"  # tables for run>=0 (null)
+                                     # Run 1: run>=8046
+                                     # Run 2: run>=9301, run>=9628, run>=9773
+                                     # Run 3: run>=11590
+                                     # Run 4: run>=12837
+}
+
 END_PROLOG
diff --git a/fcl/configurations/calibration_database_TPC_TagSets_icarus.fcl b/fcl/configurations/calibration_database_TPC_TagSets_icarus.fcl
@@ -37,4 +37,26 @@ TPC_CalibrationTags_Jan2025: {
 
 }
 
+## TPC_CalibrationTags_Jul2025 
+# Update to 2D deconv tags. Change TPC equalization to be per-plane
+TPC_CalibrationTags_Jul2025: {
+
+  tpc_channelstatus_data: "v3r4"
+  tpc_elifetime_data: "v3r0"
+  tpc_dqdxcalibration_allplanes_data: "v1r0"
+  tpc_yz_correction_allplanes_data: "v2r0"
+
+}
+
+## TPC_CalibrationTags_Oct2025 
+# Include Run 4 in calibrations
+TPC_CalibrationTags_Oct2025: {
+
+  tpc_channelstatus_data: "v4r0"
+  tpc_elifetime_data: "v3r1"
+  tpc_dqdxcalibration_allplanes_data: "v1r1"
+  tpc_yz_correction_allplanes_data: "v2r1"
+
+}
+
 END_PROLOG
diff --git a/fcl/detsim/detsim_2d_icarus_refactored.fcl b/fcl/detsim/detsim_2d_icarus_refactored.fcl
@@ -19,7 +19,7 @@ physics: {
 
     crtdaq:         @local::icarus_crtsim
      opdaq:         @local::icarus_simpmt
-       daq:         @local::icarus_simwire_wirecell_filtersed
+       daq:         @local::icarus_simwire_wirecell_shifted
 
        rns:         { module_type: "RandomNumberSaver" }
   } # producers
@@ -55,3 +55,5 @@ physics.producers.crtdaq.G4ModuleLabel: "shifted"
 physics.producers.opdaq.InputModule: "pdfastsim"
 physics.producers.shifted.InitAuxDetSimChannelLabel: "genericcrt"
 physics.producers.shifted.InitSimPhotonsLabel: "pdfastsim"
+
+physics.producers.daq.wcls_main.params.files_fields: "icarus_final_fit_dqdx6.json.bz2"
diff --git a/fcl/detsim/detsim_2d_icarus_refactored_keepSimChannel.fcl b/fcl/detsim/detsim_2d_icarus_refactored_keepSimChannel.fcl
@@ -0,0 +1,57 @@
+#include "services_icarus_simulation.fcl"
+#include "detsimmodules_wirecell_ICARUS.fcl"
+#include "opdetsim_pmt_icarus.fcl"
+#include "crtsimmodules_icarus.fcl"
+#include "trigger_emulation_icarus.fcl"
+#include "rootoutput_icarus.fcl"
+
+process_name: DetSim
+
+services: {
+  @table::icarus_detsim_services
+  #FileCatalogMetadata:  @local::art_file_catalog_mc
+} # services
+
+physics: {
+
+  producers: {
+    @table::icarus_shifting_triggersim.producers
+
+    crtdaq:         @local::icarus_crtsim
+     opdaq:         @local::icarus_simpmt
+       daq:         @local::icarus_simwire_wirecell_shifted
+
+       rns:         { module_type: "RandomNumberSaver" }
+  } # producers
+
+  simulate: [ rns, opdaq, @sequence::icarus_shifting_triggersim.path, daq, crtdaq ]
+
+  # define the output stream, there could be more than one if using filters
+  stream:  [ rootoutput ]
+
+} # physics
+
+outputs: {
+  rootoutput: {
+    @table::icarus_rootoutput
+    outputCommands: [
+      "keep *"
+     , "drop *_ionization_*_*"
+     , "drop *_simdrift_*_*"
+     , "drop *_pdfastsim_*_*"
+     , "drop raw::OpDetWaveform*_opdaq_*_*"
+     , "drop sim::SimEnergyDeposits_largeant_*_*"
+     , "drop sim::SimEnergyDepositLites_sedlite_*_*"
+     , "drop sim::SimEnergyDeposits_shifted_*_*"
+     , "drop *_pmtlvdsgatesinit_*_*"
+     , "drop *_pmtfixedthrinit_*_*"
+     , "drop *_pmttriggerwindowsinit_*_*"
+     , "drop *_triggersimgatesinit_*_*"
+      ]
+  }
+}
+
+physics.producers.crtdaq.G4ModuleLabel: "shifted"
+physics.producers.opdaq.InputModule: "pdfastsim"
+physics.producers.shifted.InitAuxDetSimChannelLabel: "genericcrt"
+physics.producers.shifted.InitSimPhotonsLabel: "pdfastsim"
diff --git a/fcl/detsim/detsim_2d_icarus_refactored_overlay.fcl b/fcl/detsim/detsim_2d_icarus_refactored_overlay.fcl
@@ -0,0 +1,3 @@
+#include "detsim_2d_icarus_refactored.fcl"
+
+physics.producers.daq: @local::icarus_simwire_wirecell_shifted_overlay
diff --git a/fcl/detsim/detsim_2d_icarus_refactored_yzsim_Run4.fcl b/fcl/detsim/detsim_2d_icarus_refactored_yzsim_Run4.fcl
@@ -0,0 +1,3 @@
+#include "detsim_2d_icarus_refactored_yzsim.fcl"
+
+physics.producers.daq.wcls_main.params.YZScaleMapJson: "yzmap_gain_icarus_v4_run4.json"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		#include "detsim_2d_icarus_refactored.fcl"

		physics.producers.daq: @local::icarus_simwire_wirecell_shifted_overlay
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		#include "detsim_2d_icarus_refactored_yzsim.fcl"

		physics.producers.daq.wcls_main.params.YZScaleMapJson: "yzmap_gain_icarus_v4_run4.json"