@@ -23,11 +23,17 @@ class FairTimeStamp : public FairMultiLinkedData_Interface
2323{
2424 public:
2525 /* * Default constructor **/
26- FairTimeStamp ();
26+ FairTimeStamp () = default ;
27+
2728 /* * Constructor with time **/
28- FairTimeStamp (Double_t time);
29+ FairTimeStamp (Double_t time)
30+ : fTimeStamp (time)
31+ {}
2932 /* * Constructor with time and time error **/
30- FairTimeStamp (Double_t time, Double_t timeerror);
33+ FairTimeStamp (Double_t time, Double_t timeerror)
34+ : fTimeStamp (time)
35+ , fTimeStampError (timeerror)
36+ {}
3137
3238 /* * Destructor **/
3339 ~FairTimeStamp () override = default ;
@@ -42,12 +48,10 @@ class FairTimeStamp : public FairMultiLinkedData_Interface
4248 if (this == obj) {
4349 return 0 ;
4450 }
45- FairTimeStamp* tsobj = static_cast <FairTimeStamp*>(const_cast <TObject*>( obj) );
51+ auto tsobj = static_cast <FairTimeStamp const *>(obj);
4652 Double_t ts = tsobj->GetTimeStamp ();
4753 Double_t tserror = tsobj->GetTimeStampError ();
48- if (fTimeStamp < ts) {
49- return -1 ;
50- } else if (fTimeStamp == ts && fTimeStampError < tserror) {
54+ if ((fTimeStamp < ts) || (fTimeStamp == ts && fTimeStampError < tserror)) {
5155 return -1 ;
5256 } else if (fTimeStamp == ts && fTimeStampError == tserror) {
5357 return 0 ;
@@ -73,30 +77,10 @@ class FairTimeStamp : public FairMultiLinkedData_Interface
7377 virtual bool operator <(const FairTimeStamp* rValue) const { return GetTimeStamp () < rValue->GetTimeStamp (); }
7478
7579 protected:
76- Double_t fTimeStamp ; /* * Time of digit or Hit [ns] */
77- Double_t fTimeStampError ; /* * Error on time stamp */
80+ Double_t fTimeStamp {- 1 } ; // < Time of digit or Hit [ns]
81+ Double_t fTimeStampError {- 1 }; // < Error on time stamp
7882
7983 ClassDefOverride (FairTimeStamp, 4 );
8084};
8185
82- // ----- Default constructor -------------------------------------------
83- inline FairTimeStamp::FairTimeStamp ()
84- : FairMultiLinkedData_Interface()
85- , fTimeStamp(-1 )
86- , fTimeStampError(-1 )
87- {}
88-
89- // ----- Standard constructor ------------------------------------------
90- inline FairTimeStamp::FairTimeStamp (Double_t time)
91- : FairMultiLinkedData_Interface()
92- , fTimeStamp(time)
93- , fTimeStampError(-1 )
94- {}
95-
96- inline FairTimeStamp::FairTimeStamp (Double_t time, Double_t timeerror)
97- : FairMultiLinkedData_Interface()
98- , fTimeStamp(time)
99- , fTimeStampError(timeerror)
100- {}
101-
10286#endif // FAIRTIMESTAMP_H
0 commit comments