Skip to content

Commit a47798f

Browse files
henrylay97henrylay97
committed
Better naming
1 parent 91a5ab4 commit a47798f

5 files changed

Lines changed: 68 additions & 64 deletions

File tree

‎sbnobj/SBND/CRT/CRTSpacePoint.cxx‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,34 +11,34 @@ namespace sbnd {
1111
: fPos ({0., 0., 0.})
1212
, fPosErr ({0., 0., 0.})
1313
, fPE (0.)
14-
, fT0 (0.)
15-
, fT0Err (0.)
16-
, fT1 (0.)
17-
, fT1Err (0.)
14+
, fTs0 (0.)
15+
, fTs0Err (0.)
16+
, fTs1 (0.)
17+
, fTs1Err (0.)
1818
, fComplete (false)
1919
{}
2020

2121
CRTSpacePoint::CRTSpacePoint(double _x, double _ex, double _y, double _ey, double _z, double _ez,
22-
double _pe, double _t0, double _et0, double _t1, double _et1, bool _complete)
22+
double _pe, double _ts0, double _ets0, double _ts1, double _ets1, bool _complete)
2323
: fPos ({_x, _y, _z})
2424
, fPosErr ({_ex, _ey, _ez})
2525
, fPE (_pe)
26-
, fT0 (_t0)
27-
, fT0Err (_et0)
28-
, fT1 (_t1)
29-
, fT1Err (_et1)
26+
, fTs0 (_ts0)
27+
, fTs0Err (_ets0)
28+
, fTs1 (_ts1)
29+
, fTs1Err (_ets1)
3030
, fComplete (_complete)
3131
{}
3232

33-
CRTSpacePoint::CRTSpacePoint(geo::Point_t _pos, geo::Point_t _err, double _pe, double _t0, double _et0,
34-
double _t1, double _et1, bool _complete)
33+
CRTSpacePoint::CRTSpacePoint(geo::Point_t _pos, geo::Point_t _err, double _pe, double _ts0, double _ets0,
34+
double _ts1, double _ets1, bool _complete)
3535
: fPos (_pos)
3636
, fPosErr (_err)
3737
, fPE (_pe)
38-
, fT0 (_t0)
39-
, fT0Err (_et0)
40-
, fT1 (_t1)
41-
, fT1Err (_et1)
38+
, fTs0 (_ts0)
39+
, fTs0Err (_ets0)
40+
, fTs1 (_ts1)
41+
, fTs1Err (_ets1)
4242
, fComplete (_complete)
4343
{}
4444

@@ -53,10 +53,10 @@ namespace sbnd {
5353
geo::Point_t CRTSpacePoint::Pos() const { return fPos; }
5454
geo::Point_t CRTSpacePoint::Err() const { return fPosErr; }
5555
double CRTSpacePoint::PE() const { return fPE; }
56-
double CRTSpacePoint::T0() const { return fT0; }
57-
double CRTSpacePoint::T0Err() const { return fT0Err; }
58-
double CRTSpacePoint::T1() const { return fT1; }
59-
double CRTSpacePoint::T1Err() const { return fT1Err; }
56+
double CRTSpacePoint::Ts0() const { return fTs0; }
57+
double CRTSpacePoint::Ts0Err() const { return fTs0Err; }
58+
double CRTSpacePoint::Ts1() const { return fTs1; }
59+
double CRTSpacePoint::Ts1Err() const { return fTs1Err; }
6060
bool CRTSpacePoint::Complete() const { return fComplete; }
6161
}
6262
}

‎sbnobj/SBND/CRT/CRTSpacePoint.hh‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,21 @@ namespace sbnd::crt {
1919
geo::Point_t fPos; // position [cm]
2020
geo::Point_t fPosErr; // positional error [cm]
2121
double fPE; // total PE
22-
double fT0; // time according to T0 clock [ns]
23-
double fT0Err; // error on time according to T0 clock [ns]
24-
double fT1; // time according to T1 clock [ns]
25-
double fT1Err; // error on time according to T1 clock [ns]
22+
double fTs0; // time according to T0 clock [ns]
23+
double fTs0Err; // error on time according to T0 clock [ns]
24+
double fTs1; // time according to T1 clock [ns]
25+
double fTs1Err; // error on time according to T1 clock [ns]
2626
bool fComplete; // whether or not the cluster was 3D and contained overlaps
2727

2828
public:
2929

3030
CRTSpacePoint();
3131

3232
CRTSpacePoint(double _x, double _ex, double _y, double _ey, double _z, double _ez, double _pe,
33-
double _t0, double _et0, double _t1, double _et1, bool _complete);
33+
double _ts0, double _ets0, double _ts1, double _ets1, bool _complete);
3434

35-
CRTSpacePoint(geo::Point_t _pos, geo::Point_t _err, double _pe, double _t0, double _et0,
36-
double _t1, double _et1, bool _complete);
35+
CRTSpacePoint(geo::Point_t _pos, geo::Point_t _err, double _pe, double _ts0, double _ets0,
36+
double _ts1, double _ets1, bool _complete);
3737

3838
virtual ~CRTSpacePoint();
3939

@@ -46,10 +46,10 @@ namespace sbnd::crt {
4646
geo::Point_t Pos() const;
4747
geo::Point_t Err() const;
4848
double PE() const;
49-
double T0() const;
50-
double T0Err() const;
51-
double T1() const;
52-
double T1Err() const;
49+
double Ts0() const;
50+
double Ts0Err() const;
51+
double Ts1() const;
52+
double Ts1Err() const;
5353
bool Complete() const;
5454

5555
CRTSpacePoint& operator= (CRTSpacePoint const&) = default;

‎sbnobj/SBND/CRT/CRTTrack.cxx‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -9,36 +9,36 @@ namespace sbnd {
99

1010
CRTTrack::CRTTrack()
1111
: fPoints ({})
12-
, fT0 (0.)
13-
, fT0Err (0.)
14-
, fT1 (0.)
15-
, fT1Err (0.)
12+
, fTs0 (0.)
13+
, fTs0Err (0.)
14+
, fTs1 (0.)
15+
, fTs1Err (0.)
1616
, fPE (0.)
1717
, fToF (0.)
1818
, fTaggers ({})
1919
{}
2020

21-
CRTTrack::CRTTrack(const geo::Point_t &_start, const geo::Point_t &_end, const double &_t0, const double &_et0,
22-
const double &_t1, const double &_et1, const double &_pe, const double &_tof,
21+
CRTTrack::CRTTrack(const geo::Point_t &_start, const geo::Point_t &_end, const double &_ts0, const double &_ets0,
22+
const double &_ts1, const double &_ets1, const double &_pe, const double &_tof,
2323
const std::set<CRTTagger> &_taggers)
2424
: fPoints ({_start, _end})
25-
, fT0 (_t0)
26-
, fT0Err (_et0)
27-
, fT1 (_t1)
28-
, fT1Err (_et1)
25+
, fTs0 (_ts0)
26+
, fTs0Err (_ets0)
27+
, fTs1 (_ts1)
28+
, fTs1Err (_ets1)
2929
, fPE (_pe)
3030
, fToF (_tof)
3131
, fTaggers (_taggers)
3232
{}
3333

34-
CRTTrack::CRTTrack(const std::vector<geo::Point_t> &_points, const double &_t0, const double &_et0,
35-
const double &_t1, const double &_et1, const double &_pe, const double &_tof,
34+
CRTTrack::CRTTrack(const std::vector<geo::Point_t> &_points, const double &_ts0, const double &_ets0,
35+
const double &_ts1, const double &_ets1, const double &_pe, const double &_tof,
3636
const std::set<CRTTagger> &_taggers)
3737
: fPoints (_points)
38-
, fT0 (_t0)
39-
, fT0Err (_et0)
40-
, fT1 (_t1)
41-
, fT1Err (_et1)
38+
, fTs0 (_ts0)
39+
, fTs0Err (_ets0)
40+
, fTs1 (_ts1)
41+
, fTs1Err (_ets1)
4242
, fPE (_pe)
4343
, fToF (_tof)
4444
, fTaggers (_taggers)
@@ -47,10 +47,10 @@ namespace sbnd {
4747
CRTTrack::~CRTTrack() {}
4848

4949
std::vector<geo::Point_t> CRTTrack::Points() const { return fPoints; }
50-
double CRTTrack::T0() const {return fT0; }
51-
double CRTTrack::T0Err() const { return fT0Err; }
52-
double CRTTrack::T1() const {return fT1; }
53-
double CRTTrack::T1Err() const { return fT1Err; }
50+
double CRTTrack::Ts0() const {return fTs0; }
51+
double CRTTrack::Ts0Err() const { return fTs0Err; }
52+
double CRTTrack::Ts1() const {return fTs1; }
53+
double CRTTrack::Ts1Err() const { return fTs1Err; }
5454
double CRTTrack::PE() const { return fPE; }
5555
double CRTTrack::ToF() const { return fToF; }
5656
std::set<CRTTagger> CRTTrack::Taggers() const { return fTaggers; }

‎sbnobj/SBND/CRT/CRTTrack.hh‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ namespace sbnd::crt {
2121
class CRTTrack {
2222

2323
std::vector<geo::Point_t> fPoints; // the fitted track points at each tagger [cm]
24-
double fT0; // average time according to T0 clock [ns]
25-
double fT0Err; // average time error according to T0 clock [ns]
26-
double fT1; // average time according to T1 clock [ns]
27-
double fT1Err; // average time error according to T1 clock [ns]
24+
double fTs0; // average time according to T0 clock [ns]
25+
double fTs0Err; // average time error according to T0 clock [ns]
26+
double fTs1; // average time according to T1 clock [ns]
27+
double fTs1Err; // average time error according to T1 clock [ns]
2828
double fPE; // total PE
2929
double fToF; // time from first space point to last [ns]
3030
std::set<CRTTagger> fTaggers; // which taggers were used to create the track
@@ -33,21 +33,21 @@ namespace sbnd::crt {
3333

3434
CRTTrack();
3535

36-
CRTTrack(const geo::Point_t &_start, const geo::Point_t &_end, const double &_t0, const double &_et0,
37-
const double &_t1, const double &_et1, const double &_pe, const double &_tof,
36+
CRTTrack(const geo::Point_t &_start, const geo::Point_t &_end, const double &_ts0, const double &_ets0,
37+
const double &_ts1, const double &_ets1, const double &_pe, const double &_tof,
3838
const std::set<CRTTagger> &_taggers);
3939

40-
CRTTrack(const std::vector<geo::Point_t> &_points, const double &_t0, const double &_et0,
41-
const double &_t1, const double &_et1, const double &_pe, const double &_tof,
40+
CRTTrack(const std::vector<geo::Point_t> &_points, const double &_ts0, const double &_ets0,
41+
const double &_ts1, const double &_ets1, const double &_pe, const double &_tof,
4242
const std::set<CRTTagger> &_taggers);
4343

4444
virtual ~CRTTrack();
4545

4646
std::vector<geo::Point_t> Points() const;
47-
double T0() const;
48-
double T0Err() const;
49-
double T1() const;
50-
double T1Err() const;
47+
double Ts0() const;
48+
double Ts0Err() const;
49+
double Ts1() const;
50+
double Ts1Err() const;
5151
double PE() const;
5252
double ToF() const;
5353
std::set<CRTTagger> Taggers() const;

‎sbnobj/SBND/CRT/classes_def.xml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,9 @@
106106

107107
<!-- CRTSpacePoint -->
108108

109-
<class name="sbnd::crt::CRTSpacePoint" ClassVersion="10">
109+
<class name="sbnd::crt::CRTSpacePoint" ClassVersion="12">
110+
<version ClassVersion="12" checksum="602472377"/>
111+
<version ClassVersion="11" checksum="2707433915"/>
110112
<version ClassVersion="10" checksum="3948858368"/>
111113
</class>
112114
<class name="std::vector<sbnd::crt::CRTSpacePoint>"/>
@@ -132,7 +134,9 @@
132134

133135
<!-- CRTTrack -->
134136

135-
<class name="sbnd::crt::CRTTrack" ClassVersion="10">
137+
<class name="sbnd::crt::CRTTrack" ClassVersion="12">
138+
<version ClassVersion="12" checksum="2489926563"/>
139+
<version ClassVersion="11" checksum="2340166153"/>
136140
<version ClassVersion="10" checksum="1691600150"/>
137141
</class>
138142
<class name="std::vector<sbnd::crt::CRTTrack>"/>

0 commit comments

Comments
 (0)