diff --git a/sbnanaobj/StandardRecord/SRCRTSpacePoint.cxx b/sbnanaobj/StandardRecord/SRCRTSpacePoint.cxx index fe72e18..ff44273 100644 --- a/sbnanaobj/StandardRecord/SRCRTSpacePoint.cxx +++ b/sbnanaobj/StandardRecord/SRCRTSpacePoint.cxx @@ -3,6 +3,7 @@ //////////////////////////////////////////////////////////////////////// #include "sbnanaobj/StandardRecord/SRCRTSpacePoint.h" +#include "sbnanaobj/StandardRecord/SRConstants.h" #include @@ -12,6 +13,8 @@ namespace caf pe(std::numeric_limits::signaling_NaN()), time(std::numeric_limits::signaling_NaN()), time_err(std::numeric_limits::signaling_NaN()), + nhits(caf::kUninitializedInt), + tagger(caf::kUninitializedInt), complete(false) {} } // end namespace caf diff --git a/sbnanaobj/StandardRecord/SRCRTSpacePoint.h b/sbnanaobj/StandardRecord/SRCRTSpacePoint.h index e17175c..c0f15b4 100644 --- a/sbnanaobj/StandardRecord/SRCRTSpacePoint.h +++ b/sbnanaobj/StandardRecord/SRCRTSpacePoint.h @@ -12,14 +12,15 @@ namespace caf { public: SRCRTSpacePoint(); - virtual ~SRCRTSpacePoint() {} - SRVector3D position; // position [cm] - SRVector3D position_err; // positional spread [cm] - float pe; // total PE - float time; // time [ns] - float time_err; // time_err [ns] - bool complete; // was cluster made from perpendicular & overlapping strips? + SRVector3D position; ///< position [cm] + SRVector3D position_err; ///< positional spread [cm] + float pe; ///< total PE + float time; ///< time [ns] + float time_err; ///< time_err [ns] + int nhits; ///< the number of strip hits contributing to the space point + int tagger; ///< the tagger the space point is on + bool complete; ///< was cluster made from perpendicular & overlapping strips? }; } // end namespace diff --git a/sbnanaobj/StandardRecord/SRCRTSpacePointMatch.cxx b/sbnanaobj/StandardRecord/SRCRTSpacePointMatch.cxx index 3b9b671..0df6663 100644 --- a/sbnanaobj/StandardRecord/SRCRTSpacePointMatch.cxx +++ b/sbnanaobj/StandardRecord/SRCRTSpacePointMatch.cxx @@ -7,7 +7,8 @@ namespace caf { SRCRTSpacePointMatch::SRCRTSpacePointMatch(): - score(std::numeric_limits::signaling_NaN()) + score(std::numeric_limits::signaling_NaN()), + matched(false) {} } //////////////////////////////////////////////////////////////////////// diff --git a/sbnanaobj/StandardRecord/SRCRTSpacePointMatch.h b/sbnanaobj/StandardRecord/SRCRTSpacePointMatch.h index d3300ce..b7d6945 100644 --- a/sbnanaobj/StandardRecord/SRCRTSpacePointMatch.h +++ b/sbnanaobj/StandardRecord/SRCRTSpacePointMatch.h @@ -12,10 +12,10 @@ namespace caf { public: SRCRTSpacePointMatch(); - virtual ~SRCRTSpacePointMatch() {} - SRCRTSpacePoint spacepoint; // the spacepoint - float score; // assessment of quality of matching (depends on alg configuration) + SRCRTSpacePoint spacepoint; ///< the spacepoint + float score; ///< assessment of quality of matching (depends on alg configuration) + bool matched; ///< whether or not a match was made }; } diff --git a/sbnanaobj/StandardRecord/SRCRTTrackMatch.h b/sbnanaobj/StandardRecord/SRCRTTrackMatch.h index 3f933a8..5e66998 100644 --- a/sbnanaobj/StandardRecord/SRCRTTrackMatch.h +++ b/sbnanaobj/StandardRecord/SRCRTTrackMatch.h @@ -12,7 +12,7 @@ namespace caf public: SRCRTTrackMatch(); - virtual ~SRCRTTrackMatch() {} + float time; ///< Time of the CRT Track [us] float angle; ///< Relative angle between the TPC track and CRT track [rad] }; diff --git a/sbnanaobj/StandardRecord/SRSBNDCRTTrack.h b/sbnanaobj/StandardRecord/SRSBNDCRTTrack.h index 2a2e4d4..dbc850b 100644 --- a/sbnanaobj/StandardRecord/SRSBNDCRTTrack.h +++ b/sbnanaobj/StandardRecord/SRSBNDCRTTrack.h @@ -15,16 +15,13 @@ namespace caf { public: SRSBNDCRTTrack(); - virtual ~SRSBNDCRTTrack() {} - std::vector points; // fitted track points at each tagger [cm] - float time; // average time [ns] - 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 taggers; // which taggers were used to create the track + std::vector points; ///< fitted track points at each tagger [cm] + float time; ///< average time [ns] + float time_err; ///< error in average time [ns] + float pe; ///< total PE; + float tof; ///< time from first space point to last [ns] + std::vector taggers; ///< the taggers that were used to create the track (see docDB #46042, section 2) }; } // end namespace diff --git a/sbnanaobj/StandardRecord/SRSBNDCRTTrackMatch.cxx b/sbnanaobj/StandardRecord/SRSBNDCRTTrackMatch.cxx index 0121643..44051cc 100644 --- a/sbnanaobj/StandardRecord/SRSBNDCRTTrackMatch.cxx +++ b/sbnanaobj/StandardRecord/SRSBNDCRTTrackMatch.cxx @@ -7,7 +7,8 @@ namespace caf { SRSBNDCRTTrackMatch::SRSBNDCRTTrackMatch(): - score(std::numeric_limits::signaling_NaN()) + score(std::numeric_limits::signaling_NaN()), + matched(false) {} } //////////////////////////////////////////////////////////////////////// diff --git a/sbnanaobj/StandardRecord/SRSBNDCRTTrackMatch.h b/sbnanaobj/StandardRecord/SRSBNDCRTTrackMatch.h index cb789a8..65db6d2 100644 --- a/sbnanaobj/StandardRecord/SRSBNDCRTTrackMatch.h +++ b/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) + SRSBNDCRTTrack track; ///< the track + float score; ///< assessment of quality of matching (depends on alg configuration) + bool matched; ///< whether or not a match was made }; } diff --git a/sbnanaobj/StandardRecord/classes_def.xml b/sbnanaobj/StandardRecord/classes_def.xml index 007cbb3..9160758 100644 --- a/sbnanaobj/StandardRecord/classes_def.xml +++ b/sbnanaobj/StandardRecord/classes_def.xml @@ -416,19 +416,23 @@ - + + - + + - + + - + +