SBNSoftware · gputnam · Mar 6, 2024 · May 7, 2024 · May 8, 2024 · Jul 9, 2024
diff --git a/fcl/CMakeLists.txt b/fcl/CMakeLists.txt
@@ -12,5 +12,8 @@ add_subdirectory(compatibility)
 add_subdirectory(numi-anaA)
 add_subdirectory(syst_variations)
 add_subdirectory(decoder)
+add_subdirectory(supera)
 add_subdirectory(overlays)
+add_subdirectory(standard)
+
 install_fhicl()
diff --git a/fcl/caf/cafmaker_add_detsim2d_icarus.fcl b/fcl/caf/cafmaker_add_detsim2d_icarus.fcl
@@ -1,14 +1,14 @@
 # over-write labels to use Wire-Cell SimChannels
-physics.producers.cafmaker.SimChannelLabel: "daq:simpleSC" # 2D drift
+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: "daq:simpleSC"
+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: "daq:simpleSC"
+physics.producers.mcreco.SimChannelLabel: "merge"
 
 # Mini production, pre signal shape tuning
 # this_cal_constants: [1.343e-2, 1.338e-2, 0.01227]

diff --git a/fcl/caf/cafmaker_defs.fcl b/fcl/caf/cafmaker_defs.fcl
@@ -17,14 +17,12 @@
 #include "mcreco.fcl"
 #include "mcsproducer.fcl"
 #include "rangeproducer.fcl"
-#include "crthitconverter_producer.fcl"
 #include "flashmatch_simple_icarus.fcl"
 #include "scecorrections.fcl"
 #include "trackfindermodules_icarus.fcl"
 #include "showerfindermodules_icarus.fcl"
 #include "sbn_stub.fcl"
 #include "transfer_flashmatch_producer.fcl"
-#include "crtt0producer_icarus.fcl"
 #include "showercosmicdistanceproducer.fcl"
 
 
@@ -87,14 +85,6 @@ recoana_datacalo_producers.vertexChargeCryoW.NormTools: @local::icarus_calonormt
 recoana_datacalo_producers.vertexStubCryoE.NormTools: @local::icarus_calonormtools
 recoana_datacalo_producers.vertexStubCryoW.NormTools: @local::icarus_calonormtools
 
-# CRT Hit to TPC Track matching in E/W
-standard_crtt0producer_cryoE: @local::standard_crtt0producer
-standard_crtt0producer_cryoE.TpcTrackModuleLabel: ["pandoraTrackGausCryoE"]
-standard_crtt0producer_cryoE.PFParticleLabel: ["pandoraGausCryoE"]
-standard_crtt0producer_cryoW: @local::standard_crtt0producer
-standard_crtt0producer_cryoW.TpcTrackModuleLabel: ["pandoraTrackGausCryoW"]
-standard_crtt0producer_cryoW.PFParticleLabel: ["pandoraGausCryoW"]
-
 # Producers for making analysis level products
 recoana_caf_preprocess_producers: {
   mcreco: @local::standard_mcreco
@@ -108,13 +98,9 @@ recoana_caf_preprocess_producers: {
   pandoraPidGausCryoE: @local::icarus_chi2pid
   pandoraPidGausCryoW: @local::icarus_chi2pid
 
-  pandoraCRTMatchCryoE: @local::standard_crtt0producer_cryoE
-  pandoraCRTMatchCryoW: @local::standard_crtt0producer_cryoW
-
   ShowerCosmicDistCryoE: @local::showerCosmicDist_sbn
   ShowerCosmicDistCryoW: @local::showerCosmicDist_sbn
 
-  # crtconvhit: @local::crthitconverter_icarus
   rns: { module_type: "RandomNumberSaver" }
   genieweight: @local::sbn_eventweight_genie
   systtools: @local::sbn_systtools
@@ -251,7 +237,6 @@ caf_preprocess_sequence: [ mcreco,
     # Track Momentum Estimation
     pandoraTrackMCSCryoE, pandoraTrackMCSCryoW,
     pandoraTrackRangeCryoE, pandoraTrackRangeCryoW,
-    pandoraCRTMatchCryoE, pandoraCRTMatchCryoW,
     # TODO: rns??
     # Shower
     ShowerCosmicDistCryoE, ShowerCosmicDistCryoW
@@ -266,7 +251,6 @@ caf_preprocess_data_sequence: [
     # Track Momentum Estimation
     pandoraTrackMCSCryoE, pandoraTrackMCSCryoW,
     pandoraTrackRangeCryoE, pandoraTrackRangeCryoW,
-    pandoraCRTMatchCryoE, pandoraCRTMatchCryoW,
     # TODO: rns??
     # Shower
     ShowerCosmicDistCryoE, ShowerCosmicDistCryoW
@@ -318,7 +302,7 @@ cafmaker.TrackChi2PidLabel: "pandoraPidGaus"
 cafmaker.TrackScatterClosestApproachLabel: "" # unavailable
 cafmaker.TrackStoppingChi2FitLabel: "" # unavailable
 cafmaker.TrackDazzleLabel: "" # unavailable
-cafmaker.CRTHitMatchLabel: "pandoraCRTMatch"
+cafmaker.CRTHitMatchLabel: ""
 cafmaker.CRTTrackMatchLabel: "" # unavailable
 cafmaker.TrackMCSLabel: "pandoraTrackMCS"
 cafmaker.TrackRangeLabel: "pandoraTrackRange"

diff --git a/fcl/caf/cafmakerjob_icarus_detsim2d_systtools_and_fluxwgt_overlay.fcl b/fcl/caf/cafmakerjob_icarus_detsim2d_systtools_and_fluxwgt_overlay.fcl
@@ -0,0 +1,5 @@
+#include "cafmakerjob_icarus_detsim2d_systtools_and_fluxwgt.fcl"
+
+services.BackTrackerService.BackTracker.OverrideRealData: true
+services.ParticleInventoryService.ParticleInventory.OverrideRealData: true
+physics.producers.cafmaker.OverrideRealData: true
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_Feb2024
-  @table::PMT_CalibrationTags_Run3_Dec2023
+  @table::TPC_CalibrationTags_Jan2025
+  @table::PMT_CalibrationTags_Run3_Feb2025
   @table::CRT_CalibrationTags_Oct2023
 }
 

diff --git a/fcl/configurations/calibration_database_PMT_TagSets_icarus.fcl b/fcl/configurations/calibration_database_PMT_TagSets_icarus.fcl
@@ -1,6 +1,6 @@
 # File:    calibration_database_PMT_TagSets_icarus.fcl
 # Author:  M. Vicenzi ([email protected]), J. Kim ([email protected])
-# Date:    August 21, 2023
+# Date:    February 20, 2025
 # Purpose: Tags definitions for the PMT timing calibration databases
 
 BEGIN_PROLOG
@@ -45,8 +45,8 @@ PMT_CalibrationTags_Run2_Dec2023: {
   pmt_cosmics_timing_data:   "v2r1"  # tables for run>=0 (null), run>=8046, run>=9301, run>=9628 and run>=9773 
 }
 
-# These are the standard tags for analyses on Run 1, Run 2 and future Run 3 data (as of December 2023)
-# These tagged versions of the databases contain tables relevant for Run 1, Run 2 and Run 3.
+# These are the standard tags for analyses on Run 1, Run 2 and pre-Run 3 data (as of December 2023)
+# These tagged versions of the databases contain tables relevant for Run 1, Run 2 and pre-Run 3.
 # Notes: 
 #   - New cable delays (mapping changes, upgrades to laser distribution)
 #   - New laser table for the beginning of Run 3 (new signal cables)
@@ -56,4 +56,27 @@ PMT_CalibrationTags_Run3_Dec2023: {
   pmt_cosmics_timing_data:   "v2r1"  # tables for run>=0 (null), run>=8046, run>=9301, run>=9628 and run>=9773 
 }
 
+# These are the standard tags for analyses on Run 1, Run 2, Run 3 and pre-Run 4 data (as of Feb 2025)
+# These tagged versions of the databases contain tables relevant for Run 1, Run 2, Run 3 and pre-Run 4.
+# Notes: 
+#   - New cable delays for Run 4 (after summer 2024 laser and PPS changes)
+#   - New laser tables up to final Run 4 gain equalization
+#   - New cosmics corrections for Run 3, updates to Run 1,2 tables (more statistics)
+PMT_CalibrationTags_Run3_Feb2025: {
+  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:   "v2r2"  # tables for run>=0 (null)
+                                     # Run 1: run>=8046
+                                     # Run 2: run>=9301, run>=9628, run>=9773
+                                     # Run 3: run>=11590
+}
+
 END_PROLOG
diff --git a/fcl/configurations/calibration_database_TPC_TagSets_icarus.fcl b/fcl/configurations/calibration_database_TPC_TagSets_icarus.fcl
@@ -19,11 +19,21 @@ TPC_CalibrationTags_Oct2023: {
 ## - Files decoded with release >=v09_66_02 should use v3r2
 TPC_CalibrationTags_Feb2024: {
 
-  tpc_channelstatus_data: "v3r2"
+  tpc_channelstatus_data: "v3r4"
   tpc_elifetime_data: "v2r1"
   tpc_dqdxcalibration_data: "v2r1"
   tpc_yz_correction_data: "v2r1"
 
 }
 
+## TPC_CalibrationTags_Feb2024 but updating tpc_yz_correction_data to tpc_yz_correction_allplanes_data
+TPC_CalibrationTags_Jan2025: {
+
+  tpc_channelstatus_data: "v3r2"
+  tpc_elifetime_data: "v2r1"
+  tpc_dqdxcalibration_data: "v2r1"
+  tpc_yz_correction_allplanes_data: "v1r0"
+
+}
+
 END_PROLOG
diff --git a/fcl/detsim/detsim_1d_icarus_lite.fcl b/fcl/detsim/detsim_1d_icarus_lite.fcl
diff --git a/fcl/detsim/detsim_2d_icarus.fcl b/fcl/detsim/detsim_2d_icarus.fcl
@@ -19,7 +19,7 @@ physics: {
 
     crtdaq:         @local::icarus_crtsim
      opdaq:         @local::icarus_simpmt
-       daq:         @local::icarus_simwire_wirecell
+       daq:         @local::icarus_simwire_wirecell_shifted
 
        rns:         { module_type: "RandomNumberSaver" }
   } # producers
@@ -36,17 +36,22 @@ outputs: {
     @table::icarus_rootoutput
     outputCommands: [
       "keep *",
-      "drop *_ionization_*_*",
-      "drop *_pmtlvdsgatesinit_*_*",
-      "drop *_pmtfixedthrinit_*_*",
-      "drop *_pmttriggerwindowsinit_*_*",
-      "drop *_triggersimgatesinit_*_*"
+     , "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_*_*"
       ]
   }
 }
 
 #legacy G4 configs
 services.Geometry.GDML: "icarus_complete_20220518_overburden.gdml"
 services.Geometry.ROOT: "icarus_complete_20220518_overburden.gdml"
-physics.producers.daq.wcls_main.configs: ["pgrapher/experiment/icarus/wcls-multitpc-sim-drift-simchannel-shifted.jsonnet"]
-physics.producers.crtdaq.G4ModuleLabel: "shifted"
+physics.producers.crtdaq.G4ModuleLabel: "shifted"
diff --git a/fcl/detsim/detsim_2d_icarus_SConly.fcl b/fcl/detsim/detsim_2d_icarus_SConly.fcl
@@ -0,0 +1,9 @@
+#include "detsim_2d_icarus.fcl"
+
+physics.producers.tpcsim: @local::icarus_simwire_wirecell_SConly
+
+physics.simulate: ["rns", "tpcsim"]
+physics.stream: []
+outputs: {}
+
+process_name: TPCSim
diff --git a/fcl/detsim/detsim_2d_icarus_diff-10.fcl b/fcl/detsim/detsim_2d_icarus_diff-10.fcl
diff --git a/fcl/detsim/detsim_2d_icarus_diff10.fcl b/fcl/detsim/detsim_2d_icarus_diff10.fcl
diff --git a/fcl/detsim/detsim_2d_icarus_fitFR.fcl b/fcl/detsim/detsim_2d_icarus_fitFR.fcl
diff --git a/fcl/detsim/detsim_2d_icarus_fitFR_nonoise.fcl b/fcl/detsim/detsim_2d_icarus_fitFR_nonoise.fcl
diff --git a/fcl/detsim/detsim_2d_icarus_fitFR_overlay.fcl b/fcl/detsim/detsim_2d_icarus_fitFR_overlay.fcl
diff --git a/fcl/detsim/detsim_2d_icarus_fitFR_refactored.fcl b/fcl/detsim/detsim_2d_icarus_fitFR_refactored.fcl
diff --git a/fcl/detsim/detsim_2d_icarus_lite.fcl b/fcl/detsim/detsim_2d_icarus_lite.fcl
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
+       daq:         @local::icarus_simwire_wirecell_filtersed
 
        rns:         { module_type: "RandomNumberSaver" }
   } # producers
@@ -36,17 +36,22 @@ outputs: {
     @table::icarus_rootoutput
     outputCommands: [
       "keep *",
-      "drop *_ionization_*_*",
-      "drop *_pmtlvdsgatesinit_*_*",
-      "drop *_pmtfixedthrinit_*_*",
-      "drop *_pmttriggerwindowsinit_*_*",
-      "drop *_triggersimgatesinit_*_*"
+     , "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.daq.wcls_main.configs: ["pgrapher/experiment/icarus/wcls-multitpc-sim-drift-simchannel-shifted-refactored.jsonnet"]
 physics.producers.crtdaq.G4ModuleLabel: "shifted"
 physics.producers.opdaq.InputModule: "pdfastsim"
 physics.producers.shifted.InitAuxDetSimChannelLabel: "genericcrt"
-physics.producers.shifted.InitSimPhotonsLabel: "pdfastsim"
+physics.producers.shifted.InitSimPhotonsLabel: "pdfastsim"
diff --git a/fcl/detsim/detsim_2d_icarus_refactored_nonoise.fcl b/fcl/detsim/detsim_2d_icarus_refactored_nonoise.fcl