Change corrected opflash to reco folder

Author: asanchezcastillo

sbncode/CAFMaker/CAFMaker_module.cc

@@ -118,6 +118,7 @@
 #include "sbnobj/Common/Trigger/ExtraTriggerInfo.h"
 #include "sbnobj/Common/Reco/CRUMBSResult.h"
 #include "sbnobj/Common/Reco/OpT0FinderResult.h"
+#include "sbnobj/Common/Reco/CorrectedOpFlashTiming.h"
 
 // GENIE
 #include "Framework/EventGen/EventRecord.h"
@@ -1829,10 +1830,10 @@ void CAFMaker::produce(art::Event& evt) noexcept {
       = foTPCPMTBarycenterMatch.isValid()? foTPCPMTBarycenterMatch.at(0).get(): nullptr;
 
 
-    art::FindManyP<sbnd::OpFlashTiming::CorrectedOpFlashTiming> fmCorrectedOpFlash =
-      FindManyPStrict<sbnd::OpFlashTiming::CorrectedOpFlashTiming>(sliceList, evt,
+    art::FindManyP<sbn::CorrectedOpFlashTiming> fmCorrectedOpFlash =
+      FindManyPStrict<sbn::CorrectedOpFlashTiming>(sliceList, evt,
           fParams.CorrectedOpFlashLabel() + slice_tag_suff);
-    std::vector<art::Ptr<sbnd::OpFlashTiming::CorrectedOpFlashTiming>> slcCorrectedOpFlash;
+    std::vector<art::Ptr<sbn::CorrectedOpFlashTiming>> slcCorrectedOpFlash;
      if (fmCorrectedOpFlash.isValid())
       slcCorrectedOpFlash = fmCorrectedOpFlash.at(0);
 

sbncode/CAFMaker/CMakeLists.txt

@@ -36,7 +36,6 @@ art_make_library( LIBRARY_NAME sbncode_CAFMaker
                   sbnobj::Common_Reco
                   sbnobj::Common_Analysis
                   sbnobj::SBND_CRT
-                  sbnobj::SBND_OpFlashTiming
                   lardataalg::DetectorInfo
                   art::Framework_Services_System_TriggerNamesService_service
                   sbncode_Metadata_MetadataSBN_service

sbncode/CAFMaker/FillReco.cxx

@@ -264,17 +264,19 @@ namespace caf
   }
 
 
-  void FillCorrectedOpFlashTiming(const std::vector<art::Ptr<sbnd::OpFlashTiming::CorrectedOpFlashTiming>> &slcCorrectedOpFlash,
+  void FillCorrectedOpFlashTiming(const std::vector<art::Ptr<sbn::CorrectedOpFlashTiming>> &slcCorrectedOpFlash,
                            caf::SRSlice& slice)
   { 
     slice.correctedOpFlash.setDefault();
     if ( slcCorrectedOpFlash.empty()==false ) {
-      const sbnd::OpFlashTiming::CorrectedOpFlashTiming &_correctedOpFlash = *slcCorrectedOpFlash[0];
+      const sbn::CorrectedOpFlashTiming &_correctedOpFlash = *slcCorrectedOpFlash[0];
       //TODO: use the score of the match to fill the information accordingly
       slice.correctedOpFlash.OpFlashT0  = _correctedOpFlash.OpFlashT0;
       slice.correctedOpFlash.UpstreamTime_lightonly  = _correctedOpFlash.UpstreamTime_lightonly;
       slice.correctedOpFlash.UpstreamTime_tpczcorr  = _correctedOpFlash.UpstreamTime_tpczcorr;
       slice.correctedOpFlash.UpstreamTime_propcorr_tpczcorr  = _correctedOpFlash.UpstreamTime_propcorr_tpczcorr;
+      slice.correctedOpFlash.FMScore  = _correctedOpFlash.FMScore;
+      slice.correctedOpFlash.SliceNuScore  = _correctedOpFlash.SliceNuScore;
     }
   }
 

sbncode/CAFMaker/FillReco.h

@@ -36,11 +36,11 @@
 #include "sbnobj/Common/Reco/CRUMBSResult.h"
 #include "sbnobj/Common/Reco/OpT0FinderResult.h"
 #include "sbnobj/Common/Reco/TPCPMTBarycenterMatch.h"
+#include "sbnobj/Common/Reco/CorrectedOpFlashTiming.h"
 #include "sbnobj/Common/CRT/CRTHit.hh"
 #include "sbnobj/Common/CRT/CRTTrack.hh"
 #include "sbnobj/SBND/CRT/CRTSpacePoint.hh"
 #include "sbnobj/SBND/CRT/CRTTrack.hh"
-#include "sbnobj/SBND/OpFlashTiming/CorrectedOpFlashTiming.h"
 #include "sbnobj/Common/CRT/CRTPMTMatching.hh"
 #include "sbnobj/Common/CRT/CRTHitT0TaggingInfo.hh"
 #include "nusimdata/SimulationBase/MCParticle.h"
@@ -273,7 +273,7 @@ namespace caf
   void FillTPCPMTBarycenterMatch(const sbn::TPCPMTBarycenterMatch *matchInfo,
                            caf::SRSlice& slice);
 
-  void FillCorrectedOpFlashTiming(const std::vector<art::Ptr<sbnd::OpFlashTiming::CorrectedOpFlashTiming>> &slcCorrectedOpFlash,
+  void FillCorrectedOpFlashTiming(const std::vector<art::Ptr<sbn::CorrectedOpFlashTiming>> &slcCorrectedOpFlash,
                            caf::SRSlice& slice);
 
   void FillCVNScores(const lcvn::Result *cvnResult,