move products from sbndcode to sbnobj

Author: VCLanNguyen

sbncode/CAFMaker/CAFMaker_module.cc

@@ -118,6 +118,8 @@
 #include "sbnobj/Common/Trigger/ExtraTriggerInfo.h"
 #include "sbnobj/Common/Reco/CRUMBSResult.h"
 #include "sbnobj/Common/Reco/OpT0FinderResult.h"
+#include "sbnobj/SBND/Timing/TimingInfo.hh"
+#include "sbnobj/SBND/Timing/FrameShiftInfo.hh"
 
 // GENIE
 #include "Framework/EventGen/EventRecord.h"
@@ -1692,19 +1694,19 @@ void CAFMaker::produce(art::Event& evt) noexcept {
         }
       }
 
-      art::Handle<raw::FrameShiftInfo> sbndframeshiftinfo_handle;
+      art::Handle<sbnd::timing::FrameShiftInfo> sbndframeshiftinfo_handle;
       GetByLabelStrict(evt, fParams.SBNDFrameShiftInfoLabel(), sbndframeshiftinfo_handle);
       // fill into event
       if (sbndframeshiftinfo_handle.isValid()) {
-        raw::FrameShiftInfo const& sbndframeshiftinfo(*sbndframeshiftinfo_handle);
+        sbnd::timing::FrameShiftInfo const& sbndframeshiftinfo(*sbndframeshiftinfo_handle);
         FillSBNDFrameShiftInfo(sbndframeshiftinfo, srsbndframeshiftinfo);
       }
 
-      art::Handle<raw::TimingInfo> sbndtiminginfo_handle;
+      art::Handle<sbnd::timing::TimingInfo> sbndtiminginfo_handle;
       GetByLabelStrict(evt, fParams.SBNDTimingInfoLabel(), sbndtiminginfo_handle);
       // fill into event
       if (sbndtiminginfo_handle.isValid()) {
-        raw::TimingInfo const& sbndtiminginfo(*sbndtiminginfo_handle);
+        sbnd::timing::TimingInfo const& sbndtiminginfo(*sbndtiminginfo_handle);
         FillSBNDTimingInfo(sbndtiminginfo, srsbndtiminginfo);
       }
     }

sbncode/CAFMaker/CMakeLists.txt

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

sbncode/CAFMaker/FillReco.cxx

@@ -141,31 +141,31 @@ namespace caf
     srsbndcrttrack.tof      = track.ToF();
   }
 
-  void FillSBNDFrameShiftInfo(const raw::FrameShiftInfo &frame,
+  void FillSBNDFrameShiftInfo(const sbnd::timing::FrameShiftInfo &frame,
                         caf::SRSBNDFrameShiftInfo &srsbndframe,
                         bool allowEmpty)
   {
-    srsbndframe.timingType = frame.timingType;
-    srsbndframe.frameTdcCrtt1 = frame.frameTdcCrtt1;
-    srsbndframe.frameTdcBes = frame.frameTdcBes;
-    srsbndframe.frameTdcRwm = frame.frameTdcRwm;
-    srsbndframe.frameHltCrtt1 = frame.frameHltCrtt1;
-    srsbndframe.frameHltBeamGate = frame.frameHltBeamGate;
-    srsbndframe.frameApplyAtCaf = frame.frameApplyAtCaf;
+    srsbndframe.timingType = frame.TimingType();
+    srsbndframe.frameTdcCrtt1 = frame.FrameTdcCrtt1();
+    srsbndframe.frameTdcBes = frame.FrameTdcBes();
+    srsbndframe.frameTdcRwm = frame.FrameTdcRwm();
+    srsbndframe.frameHltCrtt1 = frame.FrameHltCrtt1();
+    srsbndframe.frameHltBeamGate = frame.FrameHltBeamGate();
+    srsbndframe.frameApplyAtCaf = frame.FrameApplyAtCaf();
   }
 
-  void FillSBNDTimingInfo(const raw::TimingInfo &timing,
+  void FillSBNDTimingInfo(const sbnd::timing::TimingInfo &timing,
                         caf::SRSBNDTimingInfo &srsbndtiming,
                         bool allowEmpty)
   {
-    srsbndtiming.rawDAQHeaderTimestamp = timing.rawDAQHeaderTimestamp;
-    srsbndtiming.tdcCrtt1 = timing.tdcCrtt1;
-    srsbndtiming.tdcBes = timing.tdcBes;
-    srsbndtiming.tdcRwm = timing.tdcRwm;
-    srsbndtiming.tdcEtrig = timing.tdcEtrig;
-    srsbndtiming.hltCrtt1 = timing.hltCrtt1;
-    srsbndtiming.hltEtrig = timing.hltEtrig;
-    srsbndtiming.hltBeamGate = timing.hltBeamGate;
+    srsbndtiming.rawDAQHeaderTimestamp = timing.RawDAQHeaderTimestamp();
+    srsbndtiming.tdcCrtt1 = timing.TdcCrtt1();
+    srsbndtiming.tdcBes = timing.TdcBes();
+    srsbndtiming.tdcRwm = timing.TdcRwm();
+    srsbndtiming.tdcEtrig = timing.TdcEtrig();
+    srsbndtiming.hltCrtt1 = timing.HltCrtt1();
+    srsbndtiming.hltEtrig = timing.HltEtrig();
+    srsbndtiming.hltBeamGate = timing.HltBeamGate();
   }
 
   void FillCRTPMTMatch(const sbn::crt::CRTPMTMatching &match,

sbncode/CAFMaker/FillReco.h

@@ -42,9 +42,11 @@
 #include "sbnobj/SBND/CRT/CRTTrack.hh"
 #include "sbnobj/Common/CRT/CRTPMTMatching.hh"
 #include "sbnobj/Common/CRT/CRTHitT0TaggingInfo.hh"
+#include "sbnobj/SBND/Timing/TimingInfo.hh"
+#include "sbnobj/SBND/Timing/FrameShiftInfo.hh"
+
 #include "nusimdata/SimulationBase/MCParticle.h"
 #include "nusimdata/SimulationBase/MCTruth.h"
-#include "sbndcode/Timing/SBNDRawTimingObj.h"
 
 #include "sbnanaobj/StandardRecord/SRSlice.h"
 #include "sbnanaobj/StandardRecord/StandardRecord.h"
@@ -280,11 +282,11 @@ namespace caf
                       caf::SRPFP& srpfp,
                       bool allowEmpty = false);
 
-  void FillSBNDFrameShiftInfo(const raw::FrameShiftInfo &frame,
+  void FillSBNDFrameShiftInfo(const sbnd::timing::FrameShiftInfo &frame,
                         caf::SRSBNDFrameShiftInfo &srsbndframe,
                         bool allowEmpty = false);
 
-  void FillSBNDTimingInfo(const raw::TimingInfo &timing,
+  void FillSBNDTimingInfo(const sbnd::timing::TimingInfo &timing,
                         caf::SRSBNDTimingInfo &srsbndtiming,
                         bool allowEmpty = false);