Merge branch 'develop' into feature/pgreen_g4rw

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.03 LANGUAGES CXX)
+project(sbncode VERSION 10.09.00 LANGUAGES CXX)
 
 message(STATUS "\n\n  ==========================   ${PROJECT_NAME}   ==========================")
 
@@ -40,6 +40,7 @@ cet_report_compiler_flags(REPORT_THRESHOLD VERBOSE)
 
 # these are minimum required versions, not the actual product versions
 find_package( art REQUIRED )
+find_package( Eigen3 REQUIRED)
 find_package( messagefacility REQUIRED )
 find_package( art_root_io REQUIRED )
 find_package( nusimdata REQUIRED )

sbncode/BeamSpillInfoRetriever/CMakeLists.txt

@@ -15,6 +15,7 @@ art_make_library(LIBRARIES Boost::system
         SOURCE MWRData.cpp
 )
 
+
 art_make_library(
     LIBRARIES
         art::Persistency_Common
@@ -26,11 +27,23 @@ art_make_library(
         sbnobj::Common_POTAccounting
         sbn_MWRData
         larcorealg::CoreUtils
-
-        LIBRARY_NAME sbn_SBNDPOTTools
+	
+	LIBRARY_NAME sbn_SBNDPOTTools
         SOURCE SBNDPOTTools.cpp
 )
 
+art_make_library(
+	LIBRARIES
+	   
+	ROOT::Hist
+	ROOT::MathCore
+	sbnobj::Common_POTAccounting
+
+
+	LIBRARY_NAME sbn_getFOM
+	SOURCE getFOM.cpp        
+)
+
 install_headers()
 install_fhicl()
 install_source()

sbncode/BeamSpillInfoRetriever/SBNDBNBRetriever/CMakeLists.txt

@@ -4,6 +4,7 @@ find_package(ifdh_art)
 cet_build_plugin(SBNDBNBRetriever art::module
     LIBRARIES
         sbn_SBNDPOTTools
+	sbn_getFOM
 )
 
 install_headers()

sbncode/BeamSpillInfoRetriever/SBNDBNBRetriever/SBNDBNBRetriever_module.cc

@@ -9,6 +9,8 @@
 #include "messagefacility/MessageLogger/MessageLogger.h"
 #include "sbnobj/Common/POTAccounting/BNBSpillInfo.h"
 #include "sbncode/BeamSpillInfoRetriever/SBNDPOTTools.h"
+#include "sbncode/BeamSpillInfoRetriever/getFOM.h"
+
 
 namespace sbn {
   class SBNDBNBRetriever;
@@ -35,7 +37,10 @@ class sbn::SBNDBNBRetriever : public art::EDProducer {
   double fBESOffset;
   std::string fDeviceUsedForTiming;
   std::unique_ptr<ifbeam_ns::BeamFolder> bfp;
+  std::unique_ptr<ifbeam_ns::BeamFolder> offsets;
+  std::unique_ptr<ifbeam_ns::BeamFolder> vp873;
   std::unique_ptr<ifbeam_ns::BeamFolder> bfp_mwr;
+
   sbn::MWRData mwrdata;
   art::ServiceHandle<ifbeam_ns::IFBeam> ifbeam_handle;
   static constexpr double MWRtoroidDelay = -0.035; ///< the same time point is measured _t_ by MWR and _t + MWRtoroidDelay`_ by the toroid [ms]
@@ -56,12 +61,19 @@ sbn::SBNDBNBRetriever::SBNDBNBRetriever(fhicl::ParameterSet const & params)
   fTimePad = params.get<double>("TimePadding");
   fBESOffset = params.get<double>("BESOffset");
   fDeviceUsedForTiming = params.get<std::string>("DeviceUsedForTiming");
-  bfp = ifbeam_handle->getBeamFolder(params.get<std::string>("Bundle"), params.get<std::string>("URL"), std::stod(params.get<std::string>("TimeWindow")));
+  double const timeWindow = std::stod(params.get<std::string>("TimeWindow"));
+  bfp = ifbeam_handle->getBeamFolder(params.get<std::string>("Bundle"), params.get<std::string>("URL"), timeWindow);
   bfp->set_epsilon(0.02);
   bfp_mwr = ifbeam_handle->getBeamFolder(params.get<std::string>("MultiWireBundle"), params.get<std::string>("URL"), std::stod(params.get<std::string>("MWR_TimeWindow")));
   bfp_mwr->set_epsilon(0.5);
   bfp_mwr->setValidWindow(3605);
   TotalBeamSpills = 0;
+  vp873 = ifbeam_handle->getBeamFolder(params.get<std::string>("VP873Bundle"), params.get<std::string>("URL"), timeWindow);
+  vp873->set_epsilon(0.02);
+ 
+  offsets = ifbeam_handle->getBeamFolder(params.get<std::string>("OffsetBundle"), params.get<std::string>("URL"), timeWindow);
+  offsets->set_epsilon(600);
+
 }
 
 void sbn::SBNDBNBRetriever::produce(art::Event & e)
@@ -210,8 +222,11 @@ int sbn::SBNDBNBRetriever::matchMultiWireData(
 
     }//end loop over MWR devices
 
-    sbn::BNBSpillInfo spillInfo = makeBNBSpillInfo(eventID, times_temps[i], MWRdata, matched_MWR, bfp);
+    sbn::BNBSpillInfo spillInfo = makeBNBSpillInfo(eventID, times_temps[i], MWRdata, matched_MWR, bfp, offsets, vp873);
 
+	double const spillFOM = sbn::getBNBqualityFOM(spillInfo);
+    spillInfo.FOM = spillFOM;
+    
     beamInfos.push_back(std::move(spillInfo));
 
     // We do not write these to the art::Events because 

sbncode/BeamSpillInfoRetriever/SBNDBNBZEROBIASRetriever/CMakeLists.txt

@@ -4,6 +4,7 @@ find_package(ifdh_art)
 cet_build_plugin(SBNDBNBZEROBIASRetriever art::module
     LIBRARIES
         sbn_SBNDPOTTools
+	sbn_getFOM
 )
 
 install_headers()

sbncode/BeamSpillInfoRetriever/SBNDBNBZEROBIASRetriever/SBNDBNBZEROBIASRetriever_module.cc

@@ -9,6 +9,7 @@
 #include "messagefacility/MessageLogger/MessageLogger.h"
 #include "sbnobj/Common/POTAccounting/BNBSpillInfo.h"
 #include "sbncode/BeamSpillInfoRetriever/SBNDPOTTools.h"
+#include "sbncode/BeamSpillInfoRetriever/getFOM.h"
 
 namespace sbn {
   class SBNDBNBZEROBIASRetriever;
@@ -34,6 +35,8 @@ class sbn::SBNDBNBZEROBIASRetriever : public art::EDProducer {
   double fBESOffset;
   std::string fDeviceUsedForTiming;
   std::unique_ptr<ifbeam_ns::BeamFolder> bfp;
+  std::unique_ptr<ifbeam_ns::BeamFolder> offsets;
+  std::unique_ptr<ifbeam_ns::BeamFolder> vp873;
   std::unique_ptr<ifbeam_ns::BeamFolder> bfp_mwr;
   sbn::MWRData mwrdata;
   art::ServiceHandle<ifbeam_ns::IFBeam> ifbeam_handle;
@@ -56,11 +59,18 @@ sbn::SBNDBNBZEROBIASRetriever::SBNDBNBZEROBIASRetriever(fhicl::ParameterSet cons
   fTimePad = params.get<double>("TimePadding");
   fDeviceUsedForTiming = params.get<std::string>("DeviceUsedForTiming");
   fBESOffset = params.get<double>("BESOffset");
-  bfp = ifbeam_handle->getBeamFolder(params.get<std::string>("Bundle"), params.get<std::string>("URL"), std::stod(params.get<std::string>("TimeWindow")));
+  const double timeWindow = std::stod(params.get<std::string>("TimeWindow"));
+  bfp = ifbeam_handle->getBeamFolder(params.get<std::string>("Bundle"), params.get<std::string>("URL"), timeWindow);
   bfp->set_epsilon(0.02);
   bfp_mwr = ifbeam_handle->getBeamFolder(params.get<std::string>("MultiWireBundle"), params.get<std::string>("URL"), std::stod(params.get<std::string>("MWR_TimeWindow")));
   bfp_mwr->set_epsilon(0.5);
   bfp_mwr->setValidWindow(3605);
+  vp873 = ifbeam_handle->getBeamFolder(params.get<std::string>("VP873Bundle"), params.get<std::string>("URL"), timeWindow);
+  vp873->set_epsilon(0.02);
+ 
+  offsets = ifbeam_handle->getBeamFolder(params.get<std::string>("OffsetBundle"), params.get<std::string>("URL"), timeWindow);
+  offsets->set_epsilon(600);
+
   TotalBeamSpills = 0;
   produces< std::vector< sbn::BNBSpillInfo >, art::InEvent >();
   produces< std::vector< sbn::BNBSpillInfo >, art::InSubRun >();
@@ -217,7 +227,10 @@ void sbn::SBNDBNBZEROBIASRetriever::matchMultiWireData(
     }//end loop over MWR times 
   }//end loop over MWR devices
 
-  sbn::BNBSpillInfo spillInfo = makeBNBSpillInfo(eventID, times_temps[i], MWRdata, matched_MWR, bfp);
+  sbn::BNBSpillInfo spillInfo = makeBNBSpillInfo(eventID, times_temps[i], MWRdata, matched_MWR, bfp, offsets, vp873);
+  double spillFOM = sbn::getBNBqualityFOM(spillInfo);
+  spillInfo.FOM = spillFOM;
+  
   beamInfos.push_back(std::move(spillInfo));
 
   // We do not write these to the art::Events because 

sbncode/BeamSpillInfoRetriever/SBNDPOTTools.cpp

@@ -65,7 +65,7 @@ namespace sbn{
   // Collect device information to make BNBSpillInfo object. Used in
   // ICARUS and SBND modules.
   sbn::BNBSpillInfo makeBNBSpillInfo
-    (art::EventID const& eventID, double time, MWRdata_t const& MWRdata, std::vector<int> const& matched_MWR, std::unique_ptr<ifbeam_ns::BeamFolder> const& bfp)
+  (art::EventID const& eventID, double time, MWRdata_t const& MWRdata, std::vector<int> const& matched_MWR, std::unique_ptr<ifbeam_ns::BeamFolder> const& bfp,  const std::unique_ptr<ifbeam_ns::BeamFolder> & offsets,const  std::unique_ptr<ifbeam_ns::BeamFolder> & vp873)
   {
 
     auto const& [ MWR_times, unpacked_MWR ] = MWRdata; // alias
@@ -87,8 +87,20 @@ namespace sbn{
     double BTJT2 = 0; // units Deg C
     double THCURR = 0; // 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 TOR860_time = 0; // units s
-    
+
+    double FOM =0; 
+
     // Here we request all the devices
     // since sometimes devices fail to report we'll
     // allow each to throw an exception but still move forward
@@ -107,6 +119,21 @@ namespace sbn{
     try{bfp->GetNamedData(time, "E:VPTG2",&VPTG2);}catch (WebAPIException &we) {mf::LogDebug("SBNDBNBRetriever")<< "At time : " << time << " " << "got exception: " << we.what() << "\n";}
     try{bfp->GetNamedData(time, "E:BTJT2",&BTJT2);}catch (WebAPIException &we) {mf::LogDebug("SBNDBNBRetriever")<< "At time : " << time << " " << "got exception: " << we.what() << "\n";}
     try{bfp->GetNamedData(time, "E:THCURR",&THCURR);}catch (WebAPIException &we) {mf::LogDebug("SBNDBNBRetriever")<< "At time : " << time << " " << "got exception: " << we.what() << "\n";}
+
+
+    
+    try{bfp->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";}
+    try{offsets->GetNamedData(time, "E_VP875S",&VP875Offset);}catch (WebAPIException &we) {mf::LogDebug("SBNDBNBRetriever")<< "At time : " << time << " " << "got exception: " << we.what() << "\n";}
+    try{offsets->GetNamedData(time, "E_HPTG1S",&HPTG1Offset);}catch (WebAPIException &we) {mf::LogDebug("SBNDBNBRetriever")<< "At time : " << time << " " << "got exception: " << we.what() << "\n";}
+    try{offsets->GetNamedData(time, "E_HPTG2S",&HPTG2Offset);}catch (WebAPIException &we) {mf::LogDebug("SBNDBNBRetriever")<< "At time : " << time << " " << "got exception: " << we.what() << "\n";}
+    try{offsets->GetNamedData(time, "E_VPTG1S",&VPTG1Offset);}catch (WebAPIException &we) {mf::LogDebug("SBNDBNBRetriever")<< "At time : " << time << " " << "got exception: " << we.what() << "\n";}
+    try{offsets->GetNamedData(time, "E_VPTG2S",&VPTG2Offset);}catch (WebAPIException &we) {mf::LogDebug("SBNDBNBRetriever")<< "At time : " << time << " " << "got exception: " << we.what() << "\n";}
+
+
+
 
     //crunch the times 
     unsigned long int time_closest_int = (int) TOR860_time;
@@ -129,6 +156,17 @@ namespace sbn{
     beamInfo.THCURR = THCURR;
     beamInfo.spill_time_s = time_closest_int;
     beamInfo.spill_time_ns = time_closest_ns;    
+    beamInfo.VP873 = VP873;
+    beamInfo.VP873Offset = VP873Offset;
+    beamInfo.HP875Offset = HP875Offset;
+    beamInfo.VP875Offset = VP875Offset;
+    beamInfo.HPTG1Offset = HPTG1Offset;
+    beamInfo.HPTG2Offset = HPTG2Offset;
+    beamInfo.VPTG1Offset = VPTG1Offset;
+    beamInfo.VPTG2Offset = VPTG2Offset;
+    beamInfo.FOM = FOM;
+
+       
 
     for(auto const& MWRdata: unpacked_MWR){
       std::ignore = MWRdata;
@@ -166,7 +204,11 @@ namespace sbn{
     // information, so we'll write it to the SubRun
 
     beamInfo.event = eventID.event(); // the rest of ID is known by art::SubRun
-   
+    
+    //for(size_t m=0; m< beamInfo.M875BB.size(); m++){
+    //std::cout << "M875BB:  " <<beamInfo.M875BB[m] << " | M876BB: " << beamInfo.M876BB[m] << " | MMTBB: " << beamInfo.MMBTBB[m] <<std::endl;
+    //}
+    
     return beamInfo;
   }
 
@@ -331,4 +373,8 @@ namespace sbn{
 
     return { std::move(MWR_times), std::move(unpacked_MWR) };
   }
+
 }
+
+
+

sbncode/BeamSpillInfoRetriever/SBNDPOTTools.h

@@ -36,7 +36,7 @@ namespace sbn{
   double extractTDCTimeStamp(art::Handle<std::vector<artdaq::Fragment> > cont_frags);
   bool BrokenClock(double time, std::unique_ptr<ifbeam_ns::BeamFolder> const& bfp);
   MWRdata_t extractSpillTimes(TriggerInfo_t const& triggerInfo, std::unique_ptr<ifbeam_ns::BeamFolder> const& bfp, std::unique_ptr<ifbeam_ns::BeamFolder> const& bfp_mwr, double fTimePad, double MWRtoroidDelay, sbn::MWRData mwrdata );
-  sbn::BNBSpillInfo makeBNBSpillInfo(art::EventID const& eventID, double time, MWRdata_t const& MWRdata, std::vector<int> const& matched_MWR, std::unique_ptr<ifbeam_ns::BeamFolder> const& bfp);
+  sbn::BNBSpillInfo makeBNBSpillInfo(art::EventID const& eventID, double time, MWRdata_t const& MWRdata, std::vector<int> const& matched_MWR, std::unique_ptr<ifbeam_ns::BeamFolder> const& bfp, std::unique_ptr<ifbeam_ns::BeamFolder> const& offsets, std::unique_ptr<ifbeam_ns::BeamFolder> const& vp873);
 }
 
 #endif