Merge branch 'release/SBN2025A' into feature/mvicenzi_repro_step1

Author: mvicenzi

CMakeLists.txt

@@ -17,10 +17,10 @@ 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.06 LANGUAGES CXX)
+project(icaruscode VERSION 10.06.00.07 LANGUAGES CXX)
 
-set(${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING 10.06.00.06-p01)
-project(icaruscode LANGUAGES CXX)
+#set(${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING 10.06.00.06-p01)
+#project(icaruscode LANGUAGES CXX)
 
 message(STATUS
   "\n-- ============================================================================="

fcl/configurations/calibration_database_GlobalTags_icarus.fcl

@@ -5,8 +5,8 @@
 BEGIN_PROLOG
 
 ICARUS_Calibration_GlobalTags: {
-  @table::TPC_CalibrationTags_Jul2025
-  @table::PMT_CalibrationTags_Run3_Feb2025
+  @table::TPC_CalibrationTags_Oct2025
+  @table::PMT_CalibrationTags_Oct2025
   @table::CRT_CalibrationTags_Oct2023
 }
 

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

fcl/configurations/calibration_database_TPC_TagSets_icarus.fcl

@@ -37,7 +37,7 @@ TPC_CalibrationTags_Jan2025: {
 
 }
 
-## TPC_CalibrationTags_Jul2024 
+## TPC_CalibrationTags_Jul2025 
 # Update to 2D deconv tags. Change TPC equalization to be per-plane
 TPC_CalibrationTags_Jul2025: {
 
@@ -48,4 +48,15 @@ TPC_CalibrationTags_Jul2025: {
 
 }
 
+## 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

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"

fcl/detsim/detsim_2d_icarus_refactored_yzsim_overlay_Run4.fcl

@@ -0,0 +1,3 @@
+#include "detsim_2d_icarus_refactored_yzsim_overlay.fcl"
+
+physics.producers.daq.wcls_main.params.YZScaleMapJson: "yzmap_gain_icarus_v4_run4.json"