From 51aef570bbe20330a73e20e26365e4d8127e46c3 Mon Sep 17 00:00:00 2001 From: Matteo Vicenzi Date: Wed, 6 Mar 2024 11:56:38 -0600 Subject: [PATCH 1/4] updates to fcl files --- .../calibration_database_GlobalTags_icarus.fcl | 2 +- .../calibration_database_PMT_TagSets_icarus.fcl | 15 +++++++++++++-- icaruscode/Timing/timing_icarus.fcl | 2 +- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/fcl/configurations/calibration_database_GlobalTags_icarus.fcl b/fcl/configurations/calibration_database_GlobalTags_icarus.fcl index 84def123b..e1b4864d5 100644 --- 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_March2024 @table::CRT_CalibrationTags_Oct2023 } diff --git a/fcl/configurations/calibration_database_PMT_TagSets_icarus.fcl b/fcl/configurations/calibration_database_PMT_TagSets_icarus.fcl index 65deb72ff..fe1389275 100644 --- a/fcl/configurations/calibration_database_PMT_TagSets_icarus.fcl +++ b/fcl/configurations/calibration_database_PMT_TagSets_icarus.fcl @@ -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,15 @@ 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 and Run 3 data (as of March 2024) +# These tagged versions of the databases contain tables relevant for Run 1, Run 2 and Run 3. +# Notes: +# - New laser table after final Run 3 gain equalization +# - No Run 3 cosmics corrections yet +PMT_CalibrationTags_Run3_March2024: { + pmt_cables_delays_data: "v2r4" # tables for run>=0 (null), run>=8046, run>=9301, run>=9628, run>=9773, run>=10369 and run>=10865 + pmt_laser_timing_data: "v2r3" # tables for run>=0 (null), run>=8046, run>=9301, run>=9628, run>=9773, run>=10908 and run>=11590 + pmt_cosmics_timing_data: "v2r1" # tables for run>=0 (null), run>=8046, run>=9301, run>=9628 and run>=9773 +} + END_PROLOG diff --git a/icaruscode/Timing/timing_icarus.fcl b/icaruscode/Timing/timing_icarus.fcl index c09df28b3..4658d7a44 100644 --- a/icaruscode/Timing/timing_icarus.fcl +++ b/icaruscode/Timing/timing_icarus.fcl @@ -11,7 +11,7 @@ icarus_pmttimingservice: LaserTag: @local::ICARUS_Calibration_GlobalTags.pmt_laser_timing_data CosmicsTag: @local::ICARUS_Calibration_GlobalTags.pmt_cosmics_timing_data } - Verbose: false + Verbose: true } icarus_ophit_timing_correction: From e0dcfb7e73c8a1dcba9b0aa24ec8db443c40b173 Mon Sep 17 00:00:00 2001 From: Matteo Vicenzi Date: Thu, 20 Feb 2025 08:30:14 -0600 Subject: [PATCH 2/4] preparing new tags --- ...calibration_database_GlobalTags_icarus.fcl | 2 +- ...alibration_database_PMT_TagSets_icarus.fcl | 30 +++++++++++++------ icaruscode/Timing/timing_icarus.fcl | 2 +- 3 files changed, 23 insertions(+), 11 deletions(-) diff --git a/fcl/configurations/calibration_database_GlobalTags_icarus.fcl b/fcl/configurations/calibration_database_GlobalTags_icarus.fcl index e1b4864d5..2387a591c 100644 --- 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_March2024 + @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 index fe1389275..4a77ad6b0 100644 --- 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 @@ -56,15 +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 and Run 3 data (as of March 2024) -# 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, 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 laser table after final Run 3 gain equalization -# - No Run 3 cosmics corrections yet -PMT_CalibrationTags_Run3_March2024: { - pmt_cables_delays_data: "v2r4" # tables for run>=0 (null), run>=8046, run>=9301, run>=9628, run>=9773, run>=10369 and run>=10865 - pmt_laser_timing_data: "v2r3" # tables for run>=0 (null), run>=8046, run>=9301, run>=9628, run>=9773, run>=10908 and run>=11590 - pmt_cosmics_timing_data: "v2r1" # tables for run>=0 (null), run>=8046, run>=9301, run>=9628 and run>=9773 +# - 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 table (more statistics) +PMT_CalibrationTags_Run3_Feb2025: { + pmt_cables_delays_data: "v?r?" # 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: "v?r?" # 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: "v?r?" # 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/timing_icarus.fcl b/icaruscode/Timing/timing_icarus.fcl index 4658d7a44..c09df28b3 100644 --- a/icaruscode/Timing/timing_icarus.fcl +++ b/icaruscode/Timing/timing_icarus.fcl @@ -11,7 +11,7 @@ icarus_pmttimingservice: LaserTag: @local::ICARUS_Calibration_GlobalTags.pmt_laser_timing_data CosmicsTag: @local::ICARUS_Calibration_GlobalTags.pmt_cosmics_timing_data } - Verbose: true + Verbose: false } icarus_ophit_timing_correction: From 4ecd53624ac057b4c30d22613c3f359737945412 Mon Sep 17 00:00:00 2001 From: Matteo Vicenzi Date: Thu, 20 Feb 2025 14:11:50 -0600 Subject: [PATCH 3/4] updated tags --- .../calibration_database_PMT_TagSets_icarus.fcl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fcl/configurations/calibration_database_PMT_TagSets_icarus.fcl b/fcl/configurations/calibration_database_PMT_TagSets_icarus.fcl index 4a77ad6b0..aaa87828a 100644 --- a/fcl/configurations/calibration_database_PMT_TagSets_icarus.fcl +++ b/fcl/configurations/calibration_database_PMT_TagSets_icarus.fcl @@ -61,19 +61,19 @@ PMT_CalibrationTags_Run3_Dec2023: { # 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 table (more statistics) +# - New cosmics corrections for Run 3, updates to Run 1,2 tables (more statistics) PMT_CalibrationTags_Run3_Feb2025: { - pmt_cables_delays_data: "v?r?" # tables for run>=0 (null) + 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: "v?r?" # tables for run>=0 (null) + 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: "v?r?" # tables for run>=0 (null) + 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 From 0fabf8a9ed9b1162e7fe96c821cde288be9b22b4 Mon Sep 17 00:00:00 2001 From: Matteo Vicenzi Date: Fri, 21 Feb 2025 09:45:51 -0600 Subject: [PATCH 4/4] fix up debugging printouts --- icaruscode/Timing/PMTTimingCorrectionsProvider.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/icaruscode/Timing/PMTTimingCorrectionsProvider.cxx b/icaruscode/Timing/PMTTimingCorrectionsProvider.cxx index cdf968863..c2be07204 100644 --- 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; } }