Merge branch 'develop' into bugfix/kplows_synchronise_ReweightType

Author: kjplows

CMakeLists.txt

@@ -16,7 +16,7 @@
 cmake_minimum_required(VERSION 3.20 FATAL_ERROR)
 
 find_package(cetmodules 3.20.00 REQUIRED)
-project(sbncode VERSION 10.04.07 LANGUAGES CXX)
+project(sbncode VERSION 10.06.00.04 LANGUAGES CXX)
 
 message(STATUS "\n\n  ==========================   ${PROJECT_NAME}   ==========================")
 

sbncode/BeamSpillInfoRetriever/BNBEXTRetriever/BNBEXTRetriever_module.cc

@@ -173,7 +173,7 @@ void sbn::BNBEXTRetriever::endSubRun(art::SubRun& sr)
     std::cout << "FAILED! " << std::endl;
   // probably want to throw an exception here
 
-  for(auto ExtInfo : fOutExtInfos){
+  for(auto &ExtInfo : fOutExtInfos){
 
     ExtInfo.gates_since_last_trigger *= scale_factor;
 

sbncode/BeamSpillInfoRetriever/BNBRetriever/BNBRetriever_module.cc

@@ -663,6 +663,8 @@ sbn::BNBSpillInfo sbn::BNBRetriever::makeBNBSpillInfo
   double LM875A = 0; // units R/s
   double LM875B = 0; // units R/s
   double LM875C = 0; // units R/s
+  double HP873 = 0; // units mm
+  double VP873 = 0; // units mm
   double HP875 = 0; // units mm
   double VP875 = 0; // units mm
   double HPTG1 = 0; // units mm
@@ -671,6 +673,14 @@ sbn::BNBSpillInfo sbn::BNBRetriever::makeBNBSpillInfo
   double VPTG2 = 0; // units mm
   double BTJT2 = 0; // units Deg C
   double THCURR = 0; // units kiloAmps
+  double M875HS = 0; // units mm
+  double M875VS = 0; // units mm
+  double M875HM = 0; // units mm
+  double M875VM = 0; // units mm
+  double M876HS = 0; // units mm
+  double M876VS = 0; // units mm
+  double M876HM = 0; // units mm
+  double M876VM = 0; // units mm
 
   double TOR860_time = 0; // units s
 
@@ -683,6 +693,8 @@ sbn::BNBSpillInfo sbn::BNBRetriever::makeBNBSpillInfo
   try{bfp->GetNamedData(time, "E:LM875A",&LM875A);}catch (WebAPIException &we) {mf::LogDebug("BNBRetriever")<< "At time : " << time << " " << "got exception: " << we.what() << "\n";}
   try{bfp->GetNamedData(time, "E:LM875B",&LM875B);}catch (WebAPIException &we) {mf::LogDebug("BNBRetriever")<< "At time : " << time << " " << "got exception: " << we.what() << "\n";}
   try{bfp->GetNamedData(time, "E:LM875C",&LM875C);}catch (WebAPIException &we) {mf::LogDebug("BNBRetriever")<< "At time : " << time << " " << "got exception: " << we.what() << "\n";}
+  try{bfp->GetNamedData(time, "E:HP873",&HP873);}catch (WebAPIException &we) {mf::LogDebug("BNBRetriever")<< "At time : " << time << " " << "got exception: " << we.what() << "\n";}
+  try{bfp->GetNamedData(time, "E:VP873",&VP873);}catch (WebAPIException &we) {mf::LogDebug("BNBRetriever")<< "At time : " << time << " " << "got exception: " << we.what() << "\n";}
   try{bfp->GetNamedData(time, "E:HP875",&HP875);}catch (WebAPIException &we) {mf::LogDebug("BNBRetriever")<< "At time : " << time << " " << "got exception: " << we.what() << "\n";}
   try{bfp->GetNamedData(time, "E:VP875",&VP875);}catch (WebAPIException &we) {mf::LogDebug("BNBRetriever")<< "At time : " << time << " " << "got exception: " << we.what() << "\n";}
   try{bfp->GetNamedData(time, "E:HPTG1",&HPTG1);}catch (WebAPIException &we) {mf::LogDebug("BNBRetriever")<< "At time : " << time << " " << "got exception: " << we.what() << "\n";}
@@ -691,6 +703,14 @@ sbn::BNBSpillInfo sbn::BNBRetriever::makeBNBSpillInfo
   try{bfp->GetNamedData(time, "E:VPTG2",&VPTG2);}catch (WebAPIException &we) {mf::LogDebug("BNBRetriever")<< "At time : " << time << " " << "got exception: " << we.what() << "\n";}
   try{bfp->GetNamedData(time, "E:BTJT2",&BTJT2);}catch (WebAPIException &we) {mf::LogDebug("BNBRetriever")<< "At time : " << time << " " << "got exception: " << we.what() << "\n";}
   try{bfp->GetNamedData(time, "E:THCURR",&THCURR);}catch (WebAPIException &we) {mf::LogDebug("BNBRetriever")<< "At time : " << time << " " << "got exception: " << we.what() << "\n";}
+  try{bfp->GetNamedData(time, "E:M875HS",&M875HS);}catch (WebAPIException &we) {mf::LogDebug("BNBRetriever")<< "At time : " << time << " " << "got exception: " << we.what() << "\n";}
+  try{bfp->GetNamedData(time, "E:M875VS",&M875VS);}catch (WebAPIException &we) {mf::LogDebug("BNBRetriever")<< "At time : " << time << " " << "got exception: " << we.what() << "\n";}
+  try{bfp->GetNamedData(time, "E:M875HM",&M875HM);}catch (WebAPIException &we) {mf::LogDebug("BNBRetriever")<< "At time : " << time << " " << "got exception: " << we.what() << "\n";}
+  try{bfp->GetNamedData(time, "E:M875VM",&M875VM);}catch (WebAPIException &we) {mf::LogDebug("BNBRetriever")<< "At time : " << time << " " << "got exception: " << we.what() << "\n";}
+  try{bfp->GetNamedData(time, "E:M876HS",&M876HS);}catch (WebAPIException &we) {mf::LogDebug("BNBRetriever")<< "At time : " << time << " " << "got exception: " << we.what() << "\n";}
+  try{bfp->GetNamedData(time, "E:M876VS",&M876VS);}catch (WebAPIException &we) {mf::LogDebug("BNBRetriever")<< "At time : " << time << " " << "got exception: " << we.what() << "\n";}
+  try{bfp->GetNamedData(time, "E:M876HM",&M876HM);}catch (WebAPIException &we) {mf::LogDebug("BNBRetriever")<< "At time : " << time << " " << "got exception: " << we.what() << "\n";}
+  try{bfp->GetNamedData(time, "E:M876VM",&M876VM);}catch (WebAPIException &we) {mf::LogDebug("BNBRetriever")<< "At time : " << time << " " << "got exception: " << we.what() << "\n";}
 
   //crunch the times 
   unsigned long int time_closest_int = (int) TOR860_time;
@@ -703,6 +723,8 @@ sbn::BNBSpillInfo sbn::BNBRetriever::makeBNBSpillInfo
   beamInfo.LM875A = LM875A;
   beamInfo.LM875B = LM875B;
   beamInfo.LM875C = LM875C;
+  beamInfo.HP873 = HP873;
+  beamInfo.VP873 = VP873;
   beamInfo.HP875 = HP875;
   beamInfo.VP875 = VP875;
   beamInfo.HPTG1 = HPTG1;
@@ -711,6 +733,14 @@ sbn::BNBSpillInfo sbn::BNBRetriever::makeBNBSpillInfo
   beamInfo.VPTG2 = VPTG2;
   beamInfo.BTJT2 = BTJT2;
   beamInfo.THCURR = THCURR;
+  beamInfo.M875HS = M875HS;
+  beamInfo.M875VS = M875VS;
+  beamInfo.M875HM = M875HM;
+  beamInfo.M875VM = M875VM;
+  beamInfo.M876HS = M876HS;
+  beamInfo.M876VS = M876VS;
+  beamInfo.M876HM = M876HM;
+  beamInfo.M876VM = M876VM;
   beamInfo.spill_time_s = time_closest_int;
   beamInfo.spill_time_ns = time_closest_ns;    
 

sbncode/CAFMaker/CAFMakerParams.h

@@ -44,6 +44,10 @@ namespace caf
     Atom<bool> SaveGENIEEventRecord { Name("SaveGENIEEventRecord"),
       Comment("Whether to produce GENIE event record to the output file"), false
     };
+    
+    Atom<bool> OverrideRealData { Name("OverrideRealData"),
+	      Comment("when true, some algorithms (e.g. PoT count) treat events as MC rather than real data -- e.g. set it if the event is an overlay"), false
+    };
 
     Atom<float> PrescaleFactor { Name("PrescaleFactor"),
 	Comment("Factor by which to prescale unblind events"), 10
@@ -274,6 +278,12 @@ namespace caf
       "pandoraTrackCRTHit"
     };
 
+    Atom<string> CRTHitMatchInfoLabel {
+      Name("CRTHitMatchInfoLabel"),
+      Comment("Base label of additional information on track to CRT hit matching producer."),
+      "CRTT0Tagging"
+    };
+
     Atom<string> CRTTrackMatchLabel {
       Name("CRTTrackMatchLabel"),
       Comment("Base label of track to CRT track matching producer."),
@@ -340,12 +350,36 @@ namespace caf
       "" //Empty by default, configured in icaruscode cafmaker_defs
     };
 
+    Atom<art::InputTag> NuGraphSliceHitLabel {
+      Name("NuGraphSliceHitLabel"),
+      Comment("Label of NuGraph slice hit map."),
+      "" //Empty by default, please set to e.g. art::InputTag("nuslhits")
+    };
+
+    Atom<art::InputTag> NuGraphFilterLabel {
+      Name("NuGraphFilterLabel"),
+      Comment("Label of NuGraph filter."),
+      "" //Empty by default, please set to e.g. art::InputTag("NuGraph","filter")
+    };
+
+    Atom<art::InputTag> NuGraphSemanticLabel {
+      Name("NuGraphSemanticLabel"),
+      Comment("Label of NuGraph semantic."),
+      "" //Empty by default, please set to e.g. art::InputTag("NuGraph","semantic")
+    };
+
     Atom<string> OpFlashLabel {
       Name("OpFlashLabel"),
       Comment("Label of PMT flash."),
       "OpFlash"
     };
 
+    Atom<string> PMTBeamSignalLabel {
+      Name("PMTBeamSignalLabel"),
+      Comment("Label for special PMT beam timing signals used to build the beam bunch structure"),
+      "beamTiming:RWM"
+    };
+
     Atom<long long> CRTSimT0Offset {
       Name("CRTSimT0Offset"),
       Comment("start of beam gate/simulation time in the simulated CRT clock"),