Skip to content
Merged
3 changes: 3 additions & 0 deletions sbnanaobj/StandardRecord/SRCRTSpacePoint.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
////////////////////////////////////////////////////////////////////////

#include "sbnanaobj/StandardRecord/SRCRTSpacePoint.h"
#include "sbnanaobj/StandardRecord/SRConstants.h"

#include <climits>

Expand All @@ -12,6 +13,8 @@ namespace caf
pe(std::numeric_limits<float>::signaling_NaN()),
time(std::numeric_limits<float>::signaling_NaN()),
time_err(std::numeric_limits<float>::signaling_NaN()),
nhits(caf::kUninitializedInt),
tagger(caf::kUninitializedInt),
complete(false)
{}
} // end namespace caf
Expand Down
15 changes: 8 additions & 7 deletions sbnanaobj/StandardRecord/SRCRTSpacePoint.h
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 2 additions & 1 deletion sbnanaobj/StandardRecord/SRCRTSpacePointMatch.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
namespace caf
{
SRCRTSpacePointMatch::SRCRTSpacePointMatch():
score(std::numeric_limits<float>::signaling_NaN())
score(std::numeric_limits<float>::signaling_NaN()),
matched(false)
{}
}
////////////////////////////////////////////////////////////////////////
6 changes: 3 additions & 3 deletions sbnanaobj/StandardRecord/SRCRTSpacePointMatch.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
};
}

Expand Down
2 changes: 1 addition & 1 deletion sbnanaobj/StandardRecord/SRCRTTrackMatch.h
Original file line number Diff line number Diff line change
Expand Up @@ -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]
};
Expand Down
15 changes: 6 additions & 9 deletions sbnanaobj/StandardRecord/SRSBNDCRTTrack.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,13 @@ namespace caf
{
public:
SRSBNDCRTTrack();
virtual ~SRSBNDCRTTrack() {}

std::vector<SRVector3D> 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<SBNDCRTTagger_t> taggers; // which taggers were used to create the track
std::vector<SRVector3D> 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<int> taggers; ///< the taggers that were used to create the track (see docDB #46042, section 2)
};
} // end namespace

Expand Down
3 changes: 2 additions & 1 deletion sbnanaobj/StandardRecord/SRSBNDCRTTrackMatch.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
namespace caf
{
SRSBNDCRTTrackMatch::SRSBNDCRTTrackMatch():
score(std::numeric_limits<float>::signaling_NaN())
score(std::numeric_limits<float>::signaling_NaN()),
matched(false)
{}
}
////////////////////////////////////////////////////////////////////////
5 changes: 3 additions & 2 deletions sbnanaobj/StandardRecord/SRSBNDCRTTrackMatch.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@ namespace caf
SRSBNDCRTTrackMatch();
virtual ~SRSBNDCRTTrackMatch() {}
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you please remove the offending line above ([CF-151])? not your responsibility, etc.


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
};
}

Expand Down
12 changes: 8 additions & 4 deletions sbnanaobj/StandardRecord/classes_def.xml
Original file line number Diff line number Diff line change
Expand Up @@ -416,19 +416,23 @@
</class>
<class name="std::vector<caf::SRTPCPMTBarycenterMatch>"/>

<class name="caf::SRCRTSpacePoint" ClassVersion="10">
<class name="caf::SRCRTSpacePoint" ClassVersion="11">
<version ClassVersion="11" checksum="1494823436"/>
<version ClassVersion="10" checksum="3912601582"/>
</class>

<class name="caf::SRCRTSpacePointMatch" ClassVersion="10">
<class name="caf::SRCRTSpacePointMatch" ClassVersion="11">
<version ClassVersion="11" checksum="2257480785"/>
<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="2788704610"/>
<version ClassVersion="10" checksum="2486605052"/>
</class>

Expand Down