Merge branch 'feature/mvicenzi_timing_run3_updates' into release/Mar25Production

gputnam · gputnam · commit 53bd2a850a01 · 2025-04-28T15:09:49.000-05:00
diff --git a/fcl/configurations/calibration_database_GlobalTags_icarus.fcl b/fcl/configurations/calibration_database_GlobalTags_icarus.fcl
@@ -6,7 +6,7 @@ BEGIN_PROLOG
 
 ICARUS_Calibration_GlobalTags: {
   @table::TPC_CalibrationTags_Feb2024
-  @table::PMT_CalibrationTags_Run3_Dec2023
+  @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 (mvicenzi@bnl.gov), J. Kim (jae.sung.kim.3426@gmail.com)
-# 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/icaruscode/Timing/PMTTimingCorrectionsProvider.cxx b/icaruscode/Timing/PMTTimingCorrectionsProvider.cxx
@@ -223,11 +223,11 @@ void icarusDB::PMTTimingCorrectionsProvider::readTimeCorrectionDatabase(const ar
         mf::LogVerbatim(fLogCategory) << "channel, trigger cable delay, reset cable delay, laser corrections, muons corrections" << std::endl;
         for( auto const & [key, value] : fDatabaseTimingCorrections ){
             mf::LogVerbatim(fLogCategory) 
-               << key << " " 
-               << value.triggerCableDelay << "," 
+               << key << ": " 
+               << value.triggerCableDelay << ", " 
                << value.resetCableDelay << ", " 
                << value.laserCableDelay << ", "
-               << value.cosmicsCorrections << ","
+               << value.cosmicsCorrections
                << std::endl; 
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ BEGIN_PROLOG`
`6`	`6`
`7`	`7`	`ICARUS_Calibration_GlobalTags: {`
`8`	`8`	`@table::TPC_CalibrationTags_Feb2024`
`9`		`- @table::PMT_CalibrationTags_Run3_Dec2023`
	`9`	`+ @table::PMT_CalibrationTags_Run3_Feb2025`
`10`	`10`	`@table::CRT_CalibrationTags_Oct2023`
`11`	`11`	`}`
`12`	`12`