From e7295a3aaaa268675239b77c29c9e7fbb8119785 Mon Sep 17 00:00:00 2001 From: cblume Date: Wed, 5 Aug 2009 07:57:01 +0000 Subject: [PATCH] Coding rules --- TRD/AliTRDclusterizer.cxx | 16 ++++------------ TRD/AliTRDclusterizer.h | 14 +++++++------- 2 files changed, 11 insertions(+), 19 deletions(-) diff --git a/TRD/AliTRDclusterizer.cxx b/TRD/AliTRDclusterizer.cxx index 21d121a48ce..14630361de0 100644 --- a/TRD/AliTRDclusterizer.cxx +++ b/TRD/AliTRDclusterizer.cxx @@ -21,17 +21,11 @@ // // /////////////////////////////////////////////////////////////////////////////// -#include -#include -#include -#include #include #include #include "AliRunLoader.h" #include "AliLoader.h" -#include "AliRawReader.h" -#include "AliLog.h" #include "AliAlignObj.h" #include "AliTRDclusterizer.h" @@ -43,8 +37,6 @@ #include "AliTRDdigitsManager.h" #include "AliTRDrawData.h" #include "AliTRDcalibDB.h" -#include "AliTRDrecoParam.h" -#include "AliTRDCommonParam.h" #include "AliTRDtransform.h" #include "AliTRDSignalIndex.h" #include "AliTRDrawStreamBase.h" @@ -348,7 +340,7 @@ Bool_t AliTRDclusterizer::OpenOutput() } //_____________________________________________________________________________ -Bool_t AliTRDclusterizer::OpenOutput(TTree *clusterTree) +Bool_t AliTRDclusterizer::OpenOutput(TTree *const clusterTree) { // // Connect the output tree @@ -705,7 +697,7 @@ UChar_t AliTRDclusterizer::GetStatus(Short_t &signal) } //_____________________________________________________________________________ -void AliTRDclusterizer::SetPadStatus(const UChar_t status, UChar_t &out){ +void AliTRDclusterizer::SetPadStatus(const UChar_t status, UChar_t &out) const { // // Set the pad status into out // First three bits are needed for the position encoding @@ -1028,7 +1020,7 @@ void AliTRDclusterizer::CalcAdditionalInfo(const MaxStruct &Max, Short_t *const } //_____________________________________________________________________________ -void AliTRDclusterizer::AddClusterToArray(AliTRDcluster *cluster) +void AliTRDclusterizer::AddClusterToArray(AliTRDcluster* cluster) { // // Add a cluster to the array @@ -1129,7 +1121,7 @@ Bool_t AliTRDclusterizer::AddLabels() } //_____________________________________________________________________________ -Float_t AliTRDclusterizer::Unfold(Double_t eps, Int_t layer, Double_t *padSignal) const +Float_t AliTRDclusterizer::Unfold(Double_t eps, Int_t layer, const Double_t *const padSignal) const { // // Method to unfold neighbouring maxima. diff --git a/TRD/AliTRDclusterizer.h b/TRD/AliTRDclusterizer.h index 0db02de592b..c6206f1980a 100644 --- a/TRD/AliTRDclusterizer.h +++ b/TRD/AliTRDclusterizer.h @@ -73,7 +73,7 @@ class AliTRDclusterizer : public TNamed Bool_t Open(const Char_t *name, Int_t nEvent = 0); Bool_t OpenInput(Int_t nEvent = 0); Bool_t OpenOutput(); - Bool_t OpenOutput(TTree *clusterTree); + Bool_t OpenOutput(TTree *const clusterTree); Bool_t OpenTrackletOutput(); Bool_t ReadDigits(); @@ -83,7 +83,7 @@ class AliTRDclusterizer : public TNamed Bool_t WriteClusters(Int_t det); void ResetRecPoints(); virtual TClonesArray *RecPoints(); - TClonesArray *TrackletsArray(); + virtual TClonesArray *TrackletsArray(); Bool_t WriteTracklets(Int_t det); Bool_t Raw2Clusters(AliRawReader *rawReader); @@ -97,7 +97,7 @@ class AliTRDclusterizer : public TNamed void SetRawVersion(const Int_t iver) { fRawVersion = iver; } // set the expected raw data version void SetReconstructor(const AliTRDReconstructor *rec) {fReconstructor = rec;} static UChar_t GetStatus(Short_t &signal); - Int_t GetAddedClusters() {return fNoOfClusters;} + Int_t GetAddedClusters() const {return fNoOfClusters;} Bool_t IsClustersOwner() const {return TestBit(kClOwner);} virtual void SetClustersOwner(Bool_t own=kTRUE) {SetBit(kClOwner, own); if(!own) {fRecPoints = 0x0; fNoOfClusters=0;} } @@ -109,9 +109,9 @@ protected: ,const Int_t nTimeTotal, const Int_t nexp); void TailCancelation(); - Float_t Unfold(Double_t eps, Int_t layer, Double_t *padSignal) const; + Float_t Unfold(Double_t eps, Int_t layer, const Double_t *const padSignal) const; - void SetPadStatus(const UChar_t status, UChar_t &encoding); + void SetPadStatus(const UChar_t status, UChar_t &encoding) const; UChar_t GetPadStatus(UChar_t encoding) const; Int_t GetCorruption(UChar_t encoding) const; @@ -119,8 +119,8 @@ protected: Bool_t FivePadCluster(MaxStruct &ThisMax, MaxStruct &NeighbourMax); void CreateCluster(const MaxStruct &Max); inline void CalcAdditionalInfo(const MaxStruct &Max, Short_t *const signals, Int_t &nPadCount); - virtual void AddClusterToArray(AliTRDcluster *cluster); - inline void AddTrackletsToArray(); + virtual void AddClusterToArray(AliTRDcluster* cluster); + virtual void AddTrackletsToArray(); const AliTRDReconstructor *fReconstructor; //! reconstructor AliRunLoader *fRunLoader; //! Run Loader -- 2.43.0