From 7ef475bba572186d2d339c1847c7854a379504a3 Mon Sep 17 00:00:00 2001 From: Jaesung Kim Date: Sat, 24 Feb 2024 12:59:13 -0600 Subject: [PATCH 1/3] Use RunNum for TPC Calo --- icaruscode/TPC/Calorimetry/NormalizeTPCSQL_tool.cc | 2 +- icaruscode/TPC/Calorimetry/NormalizeYZSQL_tool.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/icaruscode/TPC/Calorimetry/NormalizeTPCSQL_tool.cc b/icaruscode/TPC/Calorimetry/NormalizeTPCSQL_tool.cc index efcac84d7..8189bbb45 100644 --- a/icaruscode/TPC/Calorimetry/NormalizeTPCSQL_tool.cc +++ b/icaruscode/TPC/Calorimetry/NormalizeTPCSQL_tool.cc @@ -99,7 +99,7 @@ icarus::calo::NormalizeTPCSQL::ScaleInfo icarus::calo::NormalizeTPCSQL::GetScale double icarus::calo::NormalizeTPCSQL::Normalize(double dQdx, const art::Event &e, const recob::Hit &hit, const geo::Point_t &location, const geo::Vector_t &direction, double t0) { // Get the info - ScaleInfo i = GetScaleInfo(e.time().timeHigh()); + ScaleInfo i = GetScaleInfo(e.id().runID().run()); // Lookup the TPC, cryo unsigned tpc = hit.WireID().TPC; diff --git a/icaruscode/TPC/Calorimetry/NormalizeYZSQL_tool.cc b/icaruscode/TPC/Calorimetry/NormalizeYZSQL_tool.cc index 8c1619bad..9c4226fcb 100644 --- a/icaruscode/TPC/Calorimetry/NormalizeYZSQL_tool.cc +++ b/icaruscode/TPC/Calorimetry/NormalizeYZSQL_tool.cc @@ -216,7 +216,7 @@ const icarus::calo::NormalizeYZSQL::ScaleInfo& icarus::calo::NormalizeYZSQL::Get double icarus::calo::NormalizeYZSQL::Normalize(double dQdx, const art::Event &e, const recob::Hit &hit, const geo::Point_t &location, const geo::Vector_t &direction, double t0) { // Get the info - ScaleInfo const& i = GetScaleInfo(e.time().timeHigh()); + ScaleInfo const& i = GetScaleInfo(e.id().runID().run()); // compute itpc int cryo = hit.WireID().Cryostat; From 9c2e917b5b984e2521b43b7705185cb6438859b7 Mon Sep 17 00:00:00 2001 From: Jaesung Kim Date: Sat, 24 Feb 2024 12:59:44 -0600 Subject: [PATCH 2/3] Use SQL for default TPC calibreation --- icaruscode/TPC/Calorimetry/normtools_icarus.fcl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/icaruscode/TPC/Calorimetry/normtools_icarus.fcl b/icaruscode/TPC/Calorimetry/normtools_icarus.fcl index 1eb84b21d..383ba4925 100644 --- a/icaruscode/TPC/Calorimetry/normtools_icarus.fcl +++ b/icaruscode/TPC/Calorimetry/normtools_icarus.fcl @@ -58,8 +58,8 @@ yznorm_sql: { Verbose: false } -icarus_calonormtools: [@local::driftnorm, @local::yznorm, @local::tpcgain] -# icarus_calonormtools: [@local::driftnorm_sql, @local::yznorm_sql, @local::tpcgain_sql] +#icarus_calonormtools: [@local::driftnorm, @local::yznorm, @local::tpcgain] + icarus_calonormtools: [@local::driftnorm_sql, @local::yznorm_sql, @local::tpcgain_sql] # Gain with angular dep. recombination # Assume equal on planes -- this is __wrong__ -- will need to be fixed when they are calibrated From 5bafd63802ff6d9ea056638fca938dc693513030 Mon Sep 17 00:00:00 2001 From: Bruce Howard Date: Wed, 12 Jun 2024 09:05:32 -0500 Subject: [PATCH 3/3] Running the CI caught a missing include in dissonant higgs gen fhicl. Adding here. --- fcl/gen/mevprtl/higgs/dissonant_higgs_gen.fcl | 1 + 1 file changed, 1 insertion(+) diff --git a/fcl/gen/mevprtl/higgs/dissonant_higgs_gen.fcl b/fcl/gen/mevprtl/higgs/dissonant_higgs_gen.fcl index 018783075..881dbe274 100644 --- a/fcl/gen/mevprtl/higgs/dissonant_higgs_gen.fcl +++ b/fcl/gen/mevprtl/higgs/dissonant_higgs_gen.fcl @@ -1,5 +1,6 @@ #include "dissonant_higgs.fcl" #include "beamgates_icarus.fcl" +#include "beamspilltimings.fcl" # service configuration # #include "services_icarus_simulation.fcl"