Merge pull request #706 from SBNSoftware/feature/howard_forNuMI2023A_…

…from_gputnam-configs_CherrypickPR699 Cherry-picked #699 to feature/howard_forNuMI2023A_from_gputnam-configs
SBNSoftware · Jun 12, 2024 · 3065037 · 3065037
2 parents 5e41e0a + 5bafd63
commit 3065037
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git 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"

diff --git 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
@@ -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;

diff --git 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