Enhance BNBRetriever with new BeamFolder handling

Updated BNBSpillInfo creation to include additional parameters and set epsilon values for new BeamFolder instances.

Author: nathanielerowe

sbncode/BeamSpillInfoRetriever/BNBRetriever/BNBRetriever_module.cc

@@ -26,6 +26,9 @@
 
 #include "sbnobj/Common/POTAccounting/BNBSpillInfo.h"
 
+#include "sbncode/BeamSpillInfoRetriever/POTTools.h"
+#include "sbncode/BeamSpillInfoRetriever/getFOM.h"
+
 #include "ifdh_art/IFBeamService/IFBeam_service.h"
 #include "ifbeam_c.h"
 #include "MWRData.h"
@@ -130,6 +133,8 @@ class sbn::BNBRetriever : public art::EDProducer {
   //
   art::ServiceHandle<ifbeam_ns::IFBeam> ifbeam_handle;
   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;
 
   //
@@ -260,6 +265,8 @@ sbn::BNBRetriever::BNBRetriever(Parameters const& params)
   raw_data_label(params().RawDataLabel()),
   fDeviceUsedForTiming(params().DeviceUsedForTiming()),
   bfp(     ifbeam_handle->getBeamFolder(params().Bundle(), params().URL(), params().TimeWindow())),
+  vp873(     ifbeam_handle->getBeamFolder(params().VP873Bundle(), params().URL(), params().TimeWindow())),
+  offsets(     ifbeam_handle->getBeamFolder(params().OffsetBundle(), params().URL(), params().TimeWindow())),
   bfp_mwr( ifbeam_handle->getBeamFolder(params().MultiWireBundle(), params().URL(), params().MWR_TimeWindow())),
   fTriggerDatabaseFile(params().TriggerDatabaseFile())
 {
@@ -278,7 +285,9 @@ sbn::BNBRetriever::BNBRetriever(Parameters const& params)
   //
   bfp->set_epsilon(0.02); //20 ms, this was tuned by hand and compared to IFBeamDB times  
   bfp_mwr->set_epsilon(0.5);
-
+  vp873->set_epsilon(0.02);
+  offsets->set_epsilon(600);
+	
   //bfp_mwr->setValidWindow(86400);  
   bfp_mwr->setValidWindow(3605);  
   produces< std::vector< sbn::BNBSpillInfo >, art::InSubRun >();
@@ -633,8 +642,9 @@ int sbn::BNBRetriever::matchMultiWireData(
 
     }//end loop over MWR devices
 
-    sbn::BNBSpillInfo spillInfo = makeBNBSpillInfo(eventID, times_temps[i], MWRdata, matched_MWR);
-
+    sbn::BNBSpillInfo spillInfo = sbn::pot::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