Merge branch 'release/SBN2025A' into feature/sungbino_debug_same_start_end_v10_06_00_05

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.06.00.05 LANGUAGES CXX)
+project(sbncode VERSION 10.06.00.07 LANGUAGES CXX)
 
 message(STATUS "\n\n  ==========================   ${PROJECT_NAME}   ==========================")
 

sbncode/BeamSpillInfoRetriever/SBNDBNBRetriever/SBNDBNBRetriever_module.cc

@@ -72,7 +72,7 @@ sbn::SBNDBNBRetriever::SBNDBNBRetriever(fhicl::ParameterSet const & params)
   vp873->set_epsilon(0.02);
 
   offsets = ifbeam_handle->getBeamFolder(params.get<std::string>("OffsetBundle"), params.get<std::string>("URL"), timeWindow);
-  offsets->set_epsilon(600);
+  offsets->set_epsilon(1000);
 
 }
 

sbncode/BeamSpillInfoRetriever/SBNDPOTTools.cpp

@@ -73,33 +73,33 @@ namespace sbn{
     // initializing all of our device carriers
     // device definitions can be found in BNBSpillInfo.h
 
-    double TOR860 = 0; // units e12 protons
-    double TOR875 = 0; // units e12 protons
-    double LM875A = 0; // units R/s
-    double LM875B = 0; // units R/s
-    double LM875C = 0; // units R/s
-    double HP875 = 0; // units mm
-    double VP875 = 0; // units mm
-    double HPTG1 = 0; // units mm
-    double VPTG1 = 0; // units mm
-    double HPTG2 = 0; // units mm
-    double VPTG2 = 0; // units mm
-    double BTJT2 = 0; // units Deg C
-    double THCURR = 0; // units kiloAmps
+    double TOR860 = -999; // units e12 protons
+    double TOR875 = -999; // units e12 protons
+    double LM875A = -999; // units R/s
+    double LM875B = -999; // units R/s
+    double LM875C = -999; // units R/s
+    double HP875 = -999; // units mm
+    double VP875 = -999; // units mm
+    double HPTG1 = -999; // units mm
+    double VPTG1 = -999; // units mm
+    double HPTG2 = -999; // units mm
+    double VPTG2 = -999; // units mm
+    double BTJT2 = -999; // units Deg C
+    double THCURR = -999; // units kiloAmps
 
 
-    double VP873 = 0; //units mm; not in the first IFBeam query bunch
-    double HP875Offset =0;//units mm; make a another separate IFBeam query bunch for offsets
-    double VP875Offset =0;//units mm
-    double VP873Offset =0;//units mm
-    double HPTG1Offset =0;//units mm
-    double HPTG2Offset =0;//units mm
-    double VPTG1Offset =0;//units mm
-    double VPTG2Offset =0;//units mm
+    double VP873 = -999; //units mm; not in the first IFBeam query bunch
+    double HP875Offset = -999;//units mm; make a another separate IFBeam query bunch for offsets
+    double VP875Offset = -999;//units mm
+    double VP873Offset = -999;//units mm
+    double HPTG1Offset = -999;//units mm
+    double HPTG2Offset = -999;//units mm
+    double VPTG1Offset = -999;//units mm
+    double VPTG2Offset = -999;//units mm
 
-    double TOR860_time = 0; // units s
+    double TOR860_time = -999; // units s
 
-    double FOM =0; 
+    double FOM = -999; 
 
     // Here we request all the devices
     // since sometimes devices fail to report we'll
@@ -122,7 +122,7 @@ namespace sbn{
 
 
 
-    try{bfp->GetNamedData(time, "E:VP873",&VP873);}catch (WebAPIException &we) {mf::LogDebug("SBNDBNBRetriever")<< "At time : " << time << " " << "got exception: " << we.what() << "\n";}
+    try{vp873->GetNamedData(time, "E:VP873",&VP873);}catch (WebAPIException &we) {mf::LogDebug("SBNDBNBRetriever")<< "At time : " << time << " " << "got exception: " << we.what() << "\n";}
 
     try{offsets->GetNamedData(time, "E_VP873S",&VP873Offset);}catch (WebAPIException &we) {mf::LogDebug("SBNDBNBRetriever")<< "At time : " << time << " " << "got exception: " << we.what() << "\n";}
     try{offsets->GetNamedData(time, "E_HP875S",&HP875Offset);}catch (WebAPIException &we) {mf::LogDebug("SBNDBNBRetriever")<< "At time : " << time << " " << "got exception: " << we.what() << "\n";}
@@ -217,21 +217,21 @@ namespace sbn{
   // if time is just a single outlier.
   bool BrokenClock(double time, std::unique_ptr<ifbeam_ns::BeamFolder> const& bfp)
   {
-    double TOR860 = 0; // units e12 protons
-    double TOR875 = 0; // units e12 protons
-    double LM875A = 0; // units R/s
-    double LM875B = 0; // units R/s
-    double LM875C = 0; // units R/s
-    double HP875 = 0; // units mm
-    double VP875 = 0; // units mm
-    double HPTG1 = 0; // units mm
-    double VPTG1 = 0; // units mm
-    double HPTG2 = 0; // units mm
-    double VPTG2 = 0; // units mm
-    double BTJT2 = 0; // units Deg C
-    double THCURR = 0; // units kiloAmps
+    double TOR860 = -999; // units e12 protons
+    double TOR875 = -999; // units e12 protons
+    double LM875A = -999; // units R/s
+    double LM875B = -999; // units R/s
+    double LM875C = -999; // units R/s
+    double HP875 = -999; // units mm
+    double VP875 = -999; // units mm
+    double HPTG1 = -999; // units mm
+    double VPTG1 = -999; // units mm
+    double HPTG2 = -999; // units mm
+    double VPTG2 = -999; // units mm
+    double BTJT2 = -999; // units Deg C
+    double THCURR = -999; // units kiloAmps
 
-    double TOR860_time = 0; // units s
+    double TOR860_time = -999; // units s
 
     // Here we request all the devices
     // since sometimes devices fail to report we'll

sbncode/BeamSpillInfoRetriever/job/run_sbndbnbextinfo_sbn.fcl

@@ -1,6 +1,6 @@
 #include "sbndbnbdefaults.fcl"
 
-process_name: SBNDBNBEXTInfoGen
+process_name: SBNDBNBEXTInfoGenRerunning
 
 services:{
 
@@ -23,6 +23,7 @@ services:{
 
 
 source: {
+  inputCommands: [ "keep *_*_*_*", "drop *_*_*_SBNDBNBEXTInfoGen" ]
 }
 
 physics: {

sbncode/BeamSpillInfoRetriever/job/sbndbnbdefaults.fcl

@@ -12,7 +12,7 @@ sbndbnbspillinfo: {
     OffsetBundle: "BNB_BPM_settings"
 
     TimeWindow: "700" #seconds
-    MWR_TimeWindow: "3601" #seconds
+    MWR_TimeWindow: "700" #seconds
     DeviceUsedForTiming: "E:TOR860"
 }
 

sbncode/BeamSpillInfoRetriever/job/sbndbnbspillinfo.fcl

@@ -320,6 +320,12 @@ namespace caf
       "crthit" // icarus
     };
 
+    Atom<string> CRTSimChanLabel {
+      Name("CRTSimChanLabel"),
+      Comment("Label of AuxDetSimChannels."),
+      "genericcrt" // icarus
+    };
+
     Atom<string> CRTTrackLabel {
       Name("CRTTrackLabel"),
       Comment("Label of sbn CRT tracks."),