first commit

Author: Michael Carrigan

icaruscode/TPC/Calorimetry/NormalizeDriftSQLite_tool.cc

@@ -142,8 +142,11 @@ double icarus::calo::NormalizeDriftSQLite::Normalize(double dQdx, const art::Eve
   // Get the hit time
   double thit = fClockData->TPCTick2TrigTime(hit.PeakTime()) - t0;
 
+  //std::cout << "TPC Tick2TrigTime: " << fClockData->TPCTick2TrigTime(hit.PeakTime()) << ", t0: " << t0 << ", hit: " << hit.PeakTime() << std::endl;
+
   if (fVerbose) std::cout << "NormalizeDriftSQLite Tool -- Norm factor: " << exp(thit / thiselifetime) << " at TPC: " << tpc << " Cryo: " << cryo << " Time: " << thit << " Track T0: " << t0 << std::endl;
 
+  //std::cout << "dQdx before: " << dQdx << ", dQdx after: " << dQdx*exp(thit / thiselifetime) << ", thit: " << thit << ", lifetime: " << thiselifetime << std::endl;
   // Scale
   if (thiselifetime > 0) {
     dQdx = dQdx*exp(thit / thiselifetime);

icaruscode/TPC/Calorimetry/NormalizeTPCPerPlaneSQL_tool.cc

@@ -117,6 +117,9 @@ double icarus::calo::NormalizeTPCPerPlaneSQL::Normalize(double dQdx, const art::
     case 4:
       runID = 12960;
       break;
+    case 5:
+      runID = 14079;
+      break;
     default:
       runID = e.id().runID().run();
       break;

icaruscode/TPC/Calorimetry/NormalizeYZSQL_tool.cc

@@ -163,6 +163,8 @@ void icarus::calo::NormalizeYZSQL::configure(const fhicl::ParameterSet& pset) {}
 
 const icarus::calo::NormalizeYZSQL::ScaleInfo& icarus::calo::NormalizeYZSQL::GetScaleInfo(uint64_t run) {
 
+  //std::cout << "NormalizeYZSQL Tool -- Getting scale info for run: " << run << std::endl;
+
   // check the cache
   if (fScaleInfos.count(run)) {
     return fScaleInfos.at(run);
@@ -232,6 +234,8 @@ 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) {
 
+  //std::cout << "NormalizeYZSQL Tool -- MC Flag: " << fMC << " Run: " << e.id().runID().run() << ", Subrun: " << e.id().subRunID().run() << std::endl;
+
   // Get the info
   uint64_t runID = -1;
   switch (fMC) {
@@ -247,6 +251,9 @@ double icarus::calo::NormalizeYZSQL::Normalize(double dQdx, const art::Event &e,
     case 4:
       runID = 12960;
       break;
+    case 5:
+      runID = 14079;
+      break;
     default:
       runID = e.id().runID().run();
       break;

icaruscode/TPC/Calorimetry/normtools_icarus.fcl

@@ -34,7 +34,7 @@ driftnorm_sql: {
   tool_type: NormalizeDriftSQLite
   DBFileName: tpc_elifetime_data 
   DBTag: @local::ICARUS_Calibration_GlobalTags.tpc_elifetime_data
-  Verbose: false
+  Verbose: true
 }
 
 tpcgain_sql: {