Skip to content

Commit cac5cea

Browse files
committed
minor white space adjustments
[skip ci]
1 parent 8f88112 commit cac5cea

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

StRoot/StEvent/StEpdHit.cxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ StEpdHit::StEpdHit() : StEpdHit(0, 0, 0, 0, 0, 0, false, 0.0, false, 0, 0, 0.0)
3333
// * add arguments for DEPdata and nMIP_DEP
3434
StEpdHit::StEpdHit(int position, int tile,
3535
short EW, int ADC, int TAC,
36-
int TDC, bool hasTAC, float nMIP,
36+
int TDC, bool hasTAC, float nMIP_QT,
3737
bool statusIsGood, int truthId,
3838
unsigned short DEPdata, float nMIP_DEP) :
3939
mId( (100*position + tile)*EW ),
4040
mQTdata( (ADC & 0x0FFF) | (TAC & 0x0FFF) << 12 | (TDC & 0x001F) << 24 | hasTAC << 29 | statusIsGood << 30 ),
41-
mnMIP(nMIP),
41+
mnMIP(nMIP_QT),
4242
mTruthId(truthId),
4343
mDEPdata(DEPdata),
4444
mnMIP_DEP(nMIP_DEP)

StRoot/StEvent/StEpdHit.h

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -174,13 +174,13 @@ class StEpdHit : public StObject
174174
ClassDef(StEpdHit, 2)
175175
};
176176

177-
inline int StEpdHit::qtData() const {return mQTdata;}
178-
inline float StEpdHit::nMIP() const {return (this->qtDataAvailable())?mnMIP:mnMIP_DEP;} // March 2023
179-
inline void StEpdHit::setQTdata(int packedData) {mQTdata=packedData;}
180-
inline void StEpdHit::setnMIP(float nMIP) {mnMIP = nMIP;}
181-
inline void StEpdHit::setIdTruth(int id) {mTruthId = id;}
182-
inline int StEpdHit::idTruth() const {return mTruthId;}
183-
inline short StEpdHit::side() const { return mId < 0 ? -1 : +1;}
177+
inline int StEpdHit::qtData() const {return mQTdata; }
178+
inline float StEpdHit::nMIP() const { return qtDataAvailable() ? mnMIP : mnMIP_DEP; }
179+
inline void StEpdHit::setQTdata(int packedData) { mQTdata = packedData; }
180+
inline void StEpdHit::setnMIP(float nMIP) { mnMIP = nMIP; }
181+
inline void StEpdHit::setIdTruth(int id) { mTruthId = id; }
182+
inline int StEpdHit::idTruth() const { return mTruthId; }
183+
inline short StEpdHit::side() const { return mId < 0 ? -1 : +1; }
184184
inline short StEpdHit::id() const { return mId; }
185185
inline int StEpdHit::position() const { return std::abs(mId / 100); }
186186
inline int StEpdHit::tile() const { return std::abs(mId % 100); }
@@ -189,11 +189,11 @@ inline int StEpdHit::tac() const { return (mQTdata >> 12) & 0x0FFF; }
189189
inline int StEpdHit::tdc() const { return (mQTdata >> 24) & 0x001F; }
190190
inline bool StEpdHit::hasTac() const { return (mQTdata >> 29) & 0x1; }
191191
inline bool StEpdHit::isGood() const { return (mQTdata >> 30) & 0x1; }
192-
inline void StEpdHit::setDEPdata(unsigned short DEPdata) {mDEPdata=DEPdata;}
193-
inline void StEpdHit::setnMIP_DEP(float nMIP_DEP) {mnMIP_DEP=nMIP_DEP;}
194-
inline int StEpdHit::depData() const {return mDEPdata;}
195-
inline float StEpdHit::nMIP_DEP() const {return mnMIP_DEP;}
196-
inline bool StEpdHit::qtDataAvailable() const {return (this->adc()!=0);}
197-
inline float StEpdHit::nMIP_QT() const {return mnMIP;}
198-
inline void StEpdHit::setnMIP_QT(float nMIP_QT){mnMIP=nMIP_QT;}
192+
inline void StEpdHit::setDEPdata(unsigned short DEPdata) { mDEPdata = DEPdata; }
193+
inline void StEpdHit::setnMIP_DEP(float nMIP_DEP) { mnMIP_DEP = nMIP_DEP; }
194+
inline int StEpdHit::depData() const { return mDEPdata; }
195+
inline float StEpdHit::nMIP_DEP() const { return mnMIP_DEP; }
196+
inline bool StEpdHit::qtDataAvailable() const { return adc() != 0; }
197+
inline float StEpdHit::nMIP_QT() const { return mnMIP; }
198+
inline void StEpdHit::setnMIP_QT(float nMIP_QT){ mnMIP = nMIP_QT; }
199199
#endif

0 commit comments

Comments
 (0)