committing working branch version with MC run numbers

Author: Michael Carrigan

fcl/reco/Stage1/data/stage1_run2_shwcal_icarus.fcl

@@ -1,44 +1,28 @@
+# This includes running larcv as part of stage 1 processing
+
 #include "stage1_run2_icarus.fcl"
 
-message:              @local::icarus_message_services_prod
+physics.outana:    [ @sequence::icarus_analysis_larcv_modules ]
+physics.end_paths: [ outana, stream1 ]
+
+applyNorm: true
 
 physics.producers.SBNShowerGausCryoE.ShowerFinderTools[7].CalorimetryAlg:            @local::icarus_calorimetryalgdata
-physics.producers.SBNShowerGausCryoE.ShowerFinderTools[7].ApplyCorrectionsInNorm:    true
+physics.producers.SBNShowerGausCryoE.ShowerFinderTools[7].ApplyCorrectionsInNorm:    @local::applyNorm
 physics.producers.SBNShowerGausCryoE.ShowerFinderTools[7].NormTools:                 @local::icarus_calonormtools
-physics.producers.SBNShowerGausCryoW.ShowerFinderTools[7].CalorimetryAlg:               @local::icarus_calorimetryalgdata
-physics.producers.SBNShowerGausCryoW.ShowerFinderTools[7].ApplyCorrectionsInNorm:       true
-physics.producers.SBNShowerGausCryoW.ShowerFinderTools[7].NormTools:                    @local::icarus_calonormtools
+physics.producers.SBNShowerGausCryoW.ShowerFinderTools[7].CalorimetryAlg:            @local::icarus_calorimetryalgdata
+physics.producers.SBNShowerGausCryoW.ShowerFinderTools[7].ApplyCorrectionsInNorm:    @local::applyNorm
+physics.producers.SBNShowerGausCryoW.ShowerFinderTools[7].NormTools:                 @local::icarus_calonormtools
 
 physics.producers.SBNShowerGausCryoE.ShowerFinderTools[5].CalorimetryAlg:            @local::icarus_calorimetryalgdata
-physics.producers.SBNShowerGausCryoE.ShowerFinderTools[5].ApplyCorrectionsInNorm:    true
+physics.producers.SBNShowerGausCryoE.ShowerFinderTools[5].ApplyCorrectionsInNorm:    @local::applyNorm
 physics.producers.SBNShowerGausCryoE.ShowerFinderTools[5].NormTools:                 @local::icarus_calonormtools
-physics.producers.SBNShowerGausCryoW.ShowerFinderTools[5].CalorimetryAlg:               @local::icarus_calorimetryalgdata
-physics.producers.SBNShowerGausCryoW.ShowerFinderTools[5].ApplyCorrectionsInNorm:       true
-physics.producers.SBNShowerGausCryoW.ShowerFinderTools[5].NormTools:                    @local::icarus_calonormtools
+physics.producers.SBNShowerGausCryoW.ShowerFinderTools[5].CalorimetryAlg:            @local::icarus_calorimetryalgdata
+physics.producers.SBNShowerGausCryoW.ShowerFinderTools[5].ApplyCorrectionsInNorm:    @local::applyNorm
+physics.producers.SBNShowerGausCryoW.ShowerFinderTools[5].NormTools:                 @local::icarus_calonormtools
 
-physics.producers.SBNShowerGausCryoE.ShowerFinderTools[3].ApplyCorrectionsInNorm:    true
+physics.producers.SBNShowerGausCryoE.ShowerFinderTools[3].ApplyCorrectionsInNorm:    @local::applyNorm
 physics.producers.SBNShowerGausCryoE.ShowerFinderTools[3].NormTools:                 @local::icarus_calonormtools
-physics.producers.SBNShowerGausCryoW.ShowerFinderTools[3].ApplyCorrectionsInNorm:       true
-physics.producers.SBNShowerGausCryoW.ShowerFinderTools[3].NormTools:                    @local::icarus_calonormtools
-
-services.message.destinations :
-{
-  STDCOUT:
-  {
-     type:      "cout"      #tells the message service to output this destination to cout
-     threshold: "ERROR"   #tells the message service that this destination applies to WARNING and higher level messages
-     categories:
-     {
-       Cluster3DICARUS:
-       {
-         limit: -1
-         reportEvery: 1
-       }
-       SimDriftElectrons:
-       {
-         limit: 0
-       }
-     }
-  }
-}
+physics.producers.SBNShowerGausCryoW.ShowerFinderTools[3].ApplyCorrectionsInNorm:    @local::applyNorm
+physics.producers.SBNShowerGausCryoW.ShowerFinderTools[3].NormTools:                 @local::icarus_calonormtools
 

icaruscode/TPC/Calorimetry/NormalizeTPCSQL_tool.cc

@@ -39,6 +39,7 @@ class NormalizeTPCSQL : public INormalizeCharge
   std::string fDBFileName;
   std::string fDBTag;
   bool fVerbose;
+  int fMC;
 
   lariov::DBFolder fDB;
 
@@ -65,11 +66,15 @@ icarus::calo::NormalizeTPCSQL::NormalizeTPCSQL(fhicl::ParameterSet const &pset):
   fDBFileName(pset.get<std::string>("DBFileName")),
   fDBTag(pset.get<std::string>("DBTag")),
   fVerbose(pset.get<bool>("Verbose", false)),
+  fMC(pset.get<int>("MC")),
   fDB(fDBFileName, "", "", fDBTag, true, false) {}
 
 void icarus::calo::NormalizeTPCSQL::configure(const fhicl::ParameterSet& pset) {}
 
 icarus::calo::NormalizeTPCSQL::ScaleInfo icarus::calo::NormalizeTPCSQL::GetScaleInfo(uint64_t run) {
+
+  std::cout << "NormalizeTPCSQL Tool -- Getting scale info for run: " << run << std::endl;
+
   // check the cache
   if (fScaleInfos.count(run)) {
     return fScaleInfos.at(run);
@@ -98,8 +103,33 @@ 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) {
+  
+  std::cout << "NormalizeTPCSQL Tool -- MC Flag: " << fMC << " Run: " << e.id().runID().run() << ", Subrun: " << e.id().subRunID().run() << std::endl;
+
   // Get the info
-  ScaleInfo i = GetScaleInfo(e.id().runID().run());
+  uint64_t runID = -1;
+  switch (fMC) {
+    case 1:
+      runID = 1;
+      break;
+    case 2:
+      runID = 9400;
+      break;
+    case 3:
+      runID = 3;
+      break;
+    case 4:
+      runID = 4;
+      break;
+    case 5:
+      runID = 5;
+      break;
+    default:
+      runID = e.id().runID().run();
+      break;
+  }
+
+  ScaleInfo const& i = GetScaleInfo(runID);
 
   // Lookup the TPC, cryo
   unsigned tpc = hit.WireID().TPC;