diff --git a/core/data/trd/CbmTrdCluster.h b/core/data/trd/CbmTrdCluster.h
index d3a6ca7564a2bcf8d65c29c04e80e2d93aeb3e2f..127bd67a1b27b852b1e85bf60cae0f483a58a749 100644
--- a/core/data/trd/CbmTrdCluster.h
+++ b/core/data/trd/CbmTrdCluster.h
@@ -107,10 +107,10 @@ public:
virtual std::string ToString() const;
protected:
- uint8_t fNCols(0); //! number of columns with charge above threshold
- uint8_t fNRows(0x1f); //! cluster row info plus extra meta data. Use dedicated getters for the correct value
- uint16_t fStartCh(0xffff); //! channel address of first channel
- uint32_t fStartTime(0xffffffff); //! start time of cluster in clk units wrt buffer start
+ uint8_t fNCols = 0; //! number of columns with charge above threshold
+ uint8_t fNRows = 0x1f; //! cluster row info plus extra meta data. Use dedicated getters for the correct value
+ uint16_t fStartCh = 0xffff; //! channel address of first channel
+ uint32_t fStartTime = 0xffffffff; //! start time of cluster in clk units wrt buffer start
ClassDef(CbmTrdCluster, 5) // cluster of digi for the TRD detector
};
diff --git a/reco/detectors/trd/CbmTrdModuleRec2D.cxx b/reco/detectors/trd/CbmTrdModuleRec2D.cxx
index 0e08403038c7ccfa7565c87140f96e85200c1611..de121eed68fa518d1f1c0269bad6cf24bfd5ecf1 100644
--- a/reco/detectors/trd/CbmTrdModuleRec2D.cxx
+++ b/reco/detectors/trd/CbmTrdModuleRec2D.cxx
@@ -687,7 +687,7 @@ Bool_t CbmTrdModuleRec2D::BuildHit(CbmTrdHit* h)
fgPRF->SetParameter(2, 0.65);
fgPRF->SetParLimits(2, 0.45, 10.5);
fgEdep->Fit(fgPRF, "QBN", "goff", xlo - 0.5, xhi + 0.5);
- if (!fgPRF->GetNDF()) return nullptr;
+ if (!fgPRF->GetNDF()) return false;
//chi = fgPRF->GetChisquare()/fgPRF->GetNDF();
e = fgPRF->Integral(xlo - 0.5, xhi + 0.5);
@@ -1678,7 +1678,6 @@ Bool_t CbmTrdModuleRec2D::MergeDigis(vector<const CbmTrdDigi*>* digis, vector<Cb
return kTRUE;
}
-
Float_t CbmTrdModuleRec2D::fgCorrXdx = 0.01;
Float_t CbmTrdModuleRec2D::fgCorrXval[3][NBINSCORRX] = {
{-0.001, -0.001, -0.002, -0.002, -0.003, -0.003, -0.003, -0.004, -0.004, -0.006, -0.006, -0.006, -0.007,
diff --git a/reco/detectors/trd/CbmTrdModuleRec2D.h b/reco/detectors/trd/CbmTrdModuleRec2D.h
index f1c5e3dac9384e01e4a94974fd4305ae62581144..c058c545329669bdb14aa6e1f9c6d58e71fe7dba 100644
--- a/reco/detectors/trd/CbmTrdModuleRec2D.h
+++ b/reco/detectors/trd/CbmTrdModuleRec2D.h
@@ -55,7 +55,7 @@ public:
* \param[in] v verbosity toggle
* \param[in] d drawing toggle
*/
- virtual inline void Config(Bool_t v, Bool_t d);
+ virtual inline void Config(Bool_t vb, Bool_t dw);
virtual void DrawHit(CbmTrdHit*) const { ; }
/** \brief Count RO channels (R or T) with data**/
virtual Int_t GetOverThreshold() const;
@@ -185,21 +185,21 @@ private:
void SetMaxTilt(Bool_t set = 1) { set ? SETBIT(vyM, 0) : CLRBIT(vyM, 0); }
void SetOvf(Bool_t set = 1) { set ? SETBIT(vyM, 12) : CLRBIT(vyM, 12); }
- UChar_t fConfigMap(0); // task configuration settings
- ULong64_t fT0(0); //! start time of event/time slice [clk]
- std::map<Int_t, std::list<CbmTrdCluster*>> fBuffer(); //row-wise organized clusters
- std::map<Int_t, vector<CbmTrdDigiRec*>> fDigis(); //!cluster-wise organized calibrated digi
+ UChar_t fConfigMap = 0; //! task configuration settings
+ ULong64_t fT0 = 0; //! start time of event/time slice [clk]
+ std::map<Int_t, std::list<CbmTrdCluster*>> fBuffer; //row-wise organized clusters
+ std::map<Int_t, vector<CbmTrdDigiRec*>> fDigis; //!cluster-wise organized calibrated digi
// working representation of a hit on which the reconstruction is performed
- ULong64_t vt0(0); //! start time of current hit [clk]
- UChar_t vcM(0); //! maximum col
- UChar_t vrM(0); //! maximum row
- UChar_t viM(0); //! index of maximum signal in the projection
- UShort_t vyM(0); //! bit map for cluster topology classification
- std::vector<Double_t> vs(); //! working copy of signals from cluster
- std::vector<Double_t> vse(); //! working copy of signal errors from cluster
- std::vector<Char_t> vt(); //! working copy of signal relative timing
- std::vector<Double_t> vx(); //! working copy of signal relative positions
- std::vector<Double_t> vxe(); //! working copy of signal relative position errors
+ ULong64_t vt0 = 0; //! start time of current hit [clk]
+ UChar_t vcM = 0; //! maximum col
+ UChar_t vrM = 0; //! maximum row
+ UChar_t viM = 0; //! index of maximum signal in the projection
+ UShort_t vyM = 0; //! bit map for cluster topology classification
+ std::vector<Double_t> vs; //! working copy of signals from cluster
+ std::vector<Double_t> vse; //! working copy of signal errors from cluster
+ std::vector<Char_t> vt; //! working copy of signal relative timing
+ std::vector<Double_t> vx; //! working copy of signal relative positions
+ std::vector<Double_t> vxe; //! working copy of signal relative position errors
static Float_t fgCorrXdx; //! step of the discretized correction LUT
static Float_t fgCorrXval[3][NBINSCORRX]; //! discretized correction LUT
@@ -215,13 +215,13 @@ private:
2) // Triangular pad module; Cluster finding and hit reconstruction algorithms
};
-void CbmTrdModuleRec2D::Config(Bool_t v, Bool_t d)
+void CbmTrdModuleRec2D::Config(Bool_t vb, Bool_t dw)
{
- if (v) SETBIT(fConfigMap, kVerbose);
+ if (vb) SETBIT(fConfigMap, kVerbose);
else
CLRBIT(fConfigMap, kVerbose);
printf("CbmTrdModuleRec2D::Verbose[%c]\n", CWRITE() ? 'y' : 'n');
- if (d) SETBIT(fConfigMap, kDraw);
+ if (dw) SETBIT(fConfigMap, kDraw);
else
CLRBIT(fConfigMap, kDraw);
printf("CbmTrdModuleRec2D::Draw[%c]\n", CDRAW() ? 'y' : 'n');