Merge branch 'feature/hlay_crt_taggers' into master173+186

Author: hgreenlee

sbnanaobj/StandardRecord/SRCRTSpacePoint.cxx

@@ -12,7 +12,9 @@ namespace caf
     pe(std::numeric_limits<float>::signaling_NaN()),
     time(std::numeric_limits<float>::signaling_NaN()),
     time_err(std::numeric_limits<float>::signaling_NaN()),
-    complete(false)
+    complete(false),
+    nhits(std::numeric_limits<int>::lowest()),
+    tagger(std::numeric_limits<int>::lowest())
   {}
 } // end namespace caf
 ////////////////////////////////////////////////////////////////////////

sbnanaobj/StandardRecord/SRCRTSpacePoint.h

@@ -20,6 +20,8 @@ namespace caf
       float      time;         // time [ns]
       float      time_err;     // time_err [ns]
       bool       complete;     // was cluster made from perpendicular & overlapping strips?
+      int        nhits;        // the number of strip hits contributing to the space point
+      int        tagger;       // the tagger the space point is on
     };
 } // end namespace
 

sbnanaobj/StandardRecord/SRCRTSpacePointMatch.cxx

@@ -7,6 +7,7 @@
 namespace caf
 {
   SRCRTSpacePointMatch::SRCRTSpacePointMatch():
+    matched(false),
     score(std::numeric_limits<float>::signaling_NaN())
   {}
 }

sbnanaobj/StandardRecord/SRCRTSpacePointMatch.h

@@ -14,6 +14,7 @@ namespace caf
       SRCRTSpacePointMatch();
       virtual ~SRCRTSpacePointMatch() {}
 
+      bool            matched;    // whether or not a match was made
       SRCRTSpacePoint spacepoint; // the spacepoint
       float           score;      // assessment of quality of matching (depends on alg configuration)
     };

sbnanaobj/StandardRecord/SRSBNDCRTTrack.h

@@ -22,9 +22,7 @@ namespace caf
       float                     time_err; // error in average time [ns]
       float                     pe;       // total PE;
       float                     tof;      // time from first space point to last [ns]
-
-      // TODO: Find way of adding taggers field
-      //      std::set<SBNDCRTTagger_t> taggers;  // which taggers were used to create the track
+      std::vector<int>          taggers;  // the taggers that were used to create the track
     };
 } // end namespace
 

sbnanaobj/StandardRecord/SRSBNDCRTTrackMatch.cxx

@@ -7,6 +7,7 @@
 namespace caf
 {
   SRSBNDCRTTrackMatch::SRSBNDCRTTrackMatch():
+    matched(false),
     score(std::numeric_limits<float>::signaling_NaN())
   {}
 }

sbnanaobj/StandardRecord/SRSBNDCRTTrackMatch.h

@@ -14,8 +14,9 @@ namespace caf
       SRSBNDCRTTrackMatch();
       virtual ~SRSBNDCRTTrackMatch() {}
 
-      SRSBNDCRTTrack track; // the track
-      float          score; // assessment of quality of matching (depends on alg configuration)
+      bool           matched; // whether or not a match was made
+      SRSBNDCRTTrack track;   // the track
+      float          score;   // assessment of quality of matching (depends on alg configuration)
     };
 }
 

sbnanaobj/StandardRecord/classes_def.xml

@@ -433,19 +433,23 @@
   </class>
   <class name="std::vector<caf::SRTPCPMTBarycenterMatch>"/>
 
-  <class name="caf::SRCRTSpacePoint" ClassVersion="10">
+  <class name="caf::SRCRTSpacePoint" ClassVersion="11">
+   <version ClassVersion="11" checksum="2928297658"/>
    <version ClassVersion="10" checksum="3912601582"/>
   </class>
 
-  <class name="caf::SRCRTSpacePointMatch" ClassVersion="10">
+  <class name="caf::SRCRTSpacePointMatch" ClassVersion="11">
+   <version ClassVersion="11" checksum="414814289"/>
    <version ClassVersion="10" checksum="382456729"/>
   </class>
 
-  <class name="caf::SRSBNDCRTTrack" ClassVersion="10">
+  <class name="caf::SRSBNDCRTTrack" ClassVersion="11">
+   <version ClassVersion="11" checksum="1038334522"/>
    <version ClassVersion="10" checksum="1967800431"/>
   </class>
 
-  <class name="caf::SRSBNDCRTTrackMatch" ClassVersion="10">
+  <class name="caf::SRSBNDCRTTrackMatch" ClassVersion="11">
+   <version ClassVersion="11" checksum="3360963232"/>
    <version ClassVersion="10" checksum="2486605052"/>
   </class>