Merge branch 'release/v10_04_08'

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

sbncode/CAFMaker/FillReco.cxx

@@ -122,8 +122,8 @@ namespace caf
     srspacepoint.position     = SRVector3D(spacepoint.X(), spacepoint.Y(), spacepoint.Z());
     srspacepoint.position_err = SRVector3D(spacepoint.XErr(), spacepoint.YErr(), spacepoint.ZErr());
     srspacepoint.pe           = spacepoint.PE();
-    srspacepoint.time         = spacepoint.Ts1();
-    srspacepoint.time_err     = spacepoint.Ts1Err();
+    srspacepoint.time         = spacepoint.Ts0();
+    srspacepoint.time_err     = spacepoint.Ts0Err();
     srspacepoint.complete     = spacepoint.Complete();
   }
 
@@ -134,8 +134,8 @@ namespace caf
     for(auto const& point : track.Points())
       srsbndcrttrack.points.emplace_back(point.X(), point.Y(), point.Z());
 
-    srsbndcrttrack.time     = track.Ts1();
-    srsbndcrttrack.time_err = track.Ts1Err();
+    srsbndcrttrack.time     = track.Ts0();
+    srsbndcrttrack.time_err = track.Ts0Err();
     srsbndcrttrack.pe       = track.PE();
     srsbndcrttrack.tof      = track.ToF();
   }

sbncode/Calibration/TrackCaloSkimmer.h

@@ -61,6 +61,9 @@
 #include "larsim/MCCheater/ParticleInventoryService.h"
 
 #include "sbnobj/Common/Calibration/TrackCaloSkimmerObj.h"
+#include "sbnobj/Common/CRT/CRTHitT0TaggingInfo.cc"
+#include "sbnobj/Common/CRT/CRTHitT0TaggingTruthInfo.cc"
+
 #include "ITCSSelectionTool.h"
 
 namespace sbn {
@@ -90,6 +93,16 @@ class sbn::TrackCaloSkimmer : public art::EDAnalyzer {
   }
 
 private:
+
+  struct T0TimingInfo {
+    double  t0Pandora;
+    double  t0CRTTrack;
+    double  t0CRTHit;
+    bool    hasT0Pandora;
+    bool    hasT0CRTTrack;
+    bool    hasT0CRTHit;
+  };
+
   // Internal data struct
   struct GlobalTrackInfo {
     geo::Point_t start;
@@ -117,13 +130,14 @@ class sbn::TrackCaloSkimmer : public art::EDAnalyzer {
 
   // Fill vars
   void FillTrack(const recob::Track &track, 
-    const recob::PFParticle &pfp, float t0, float t0CRT,
+    const recob::PFParticle &pfp, const T0TimingInfo &t0Info,
     const std::vector<art::Ptr<recob::Hit>> &hits,
     const std::vector<const recob::TrackHitMeta*> &thms,
     const std::vector<art::Ptr<recob::SpacePoint>> &sps,
     const std::vector<art::Ptr<anab::Calorimetry>> &calo,
     const std::map<geo::WireID, art::Ptr<raw::RawDigit>> &rawdigits,
     const std::vector<GlobalTrackInfo> &tracks,
+    const geo::GeometryCore *geo,
     const geo::WireReadoutGeom *wireReadout,
     const detinfo::DetectorClocksData &clock_data,
     const cheat::BackTrackerService *bt_serv,
@@ -157,19 +171,27 @@ class sbn::TrackCaloSkimmer : public art::EDAnalyzer {
     unsigned hkey,
     const recob::TrackHitMeta &thm,
     const recob::Track &trk,
+    const T0TimingInfo &t0Info,
     const art::Ptr<recob::SpacePoint> &sp,
     const std::vector<art::Ptr<anab::Calorimetry>> &calo,
+    const geo::GeometryCore *geo,
     const geo::WireReadoutGeom *wireReadout,
     const detinfo::DetectorClocksData &dclock,
-    const cheat::BackTrackerService *bt_serv);
+    const cheat::BackTrackerService *bt_serv,
+    const detinfo::DetectorPropertiesData &dprop);
+  void FillTrackCRTHitInfo(const std::vector<art::Ptr<sbn::crt::CRTHitT0TaggingInfo>> &tag);
 
+  // helpers
   void DoTailFit();
+  bool PointIsContained(const std::vector<geo::BoxBoundedGeo> &vols, geo::Point_t p);
 
   // config
 
   // tags
   art::InputTag fPFPproducer;
-  std::vector<art::InputTag> fT0producers;
+  art::InputTag fPFPT0producer;
+  art::InputTag fCRTTrackT0producer;
+  art::InputTag fCRTHitT0producer;
   art::InputTag fCALOproducer;
   art::InputTag fTRKproducer;
   art::InputTag fTRKHMproducer;
@@ -187,7 +209,14 @@ class sbn::TrackCaloSkimmer : public art::EDAnalyzer {
   bool fFillTrackEndHits;
   float fTrackEndHitWireBox;
   float fTrackEndHitTimeBox;
-
+  bool fIncludeCRTHitTagging;
+  bool fIncludeTopCRT;
+  bool fIncludeSideCRT;
+  double fTopCRTDistanceCutStopping;
+  double fTopCRTDistanceCutPassing;
+  double fSideCRTDistanceCutStopping;
+  double fSideCRTDistanceCutPassing;  
+  
   // tools
   std::vector<std::unique_ptr<sbn::ITCSSelectionTool>> fSelectionTools;