From c5d477f881db20dddb3f9a02a4eb14183dfede24 Mon Sep 17 00:00:00 2001 From: policheh Date: Mon, 3 Mar 2008 17:41:16 +0000 Subject: [PATCH] Coding violations fixed. --- PHOS/AliPHOSRawDecoder.cxx | 7 ++++--- PHOS/AliPHOSRawDecoder.h | 22 +++++++++++----------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/PHOS/AliPHOSRawDecoder.cxx b/PHOS/AliPHOSRawDecoder.cxx index 9d7ee4570a1..fe222350206 100644 --- a/PHOS/AliPHOSRawDecoder.cxx +++ b/PHOS/AliPHOSRawDecoder.cxx @@ -42,7 +42,8 @@ // --- AliRoot header files --- #include "AliPHOSRawDecoder.h" -#include +#include "AliRawReader.h" + ClassImp(AliPHOSRawDecoder) //----------------------------------------------------------------------------- @@ -149,7 +150,7 @@ Bool_t AliPHOSRawDecoder::NextDigit() Float_t pedMean = 0; Int_t nPed = 0; Float_t baseLine = 1.0; - const Int_t nPreSamples = 10; + const Int_t kPreSamples = 10; fSamples->Reset(); while ( in->Next() ) { @@ -202,7 +203,7 @@ Bool_t AliPHOSRawDecoder::NextDigit() } //Calculate pedestal if necessary - if(fPedSubtract && in->GetTime() < nPreSamples) { + if(fPedSubtract && in->GetTime() < kPreSamples) { pedMean += in->GetSignal(); nPed++; } diff --git a/PHOS/AliPHOSRawDecoder.h b/PHOS/AliPHOSRawDecoder.h index ad0d9526850..41568375a21 100644 --- a/PHOS/AliPHOSRawDecoder.h +++ b/PHOS/AliPHOSRawDecoder.h @@ -9,10 +9,10 @@ // (amplitude,time, position,gain) from the raw stream // provided by AliRawReader. See cxx source for use case. -#include "AliRawReader.h" #include "AliCaloRawStream.h" class TArrayI; +class AliRawReader; class AliPHOSRawDecoder { @@ -29,14 +29,14 @@ public: void SetOldRCUFormat(Bool_t isOldRCU) {fCaloStream->SetOldRCUFormat(isOldRCU);} void SubtractPedestals(Bool_t subtract) {fPedSubtract=subtract;} - Double_t GetEnergy() { return fEnergy; } - Double_t GetTime() { return fTime; } - Double_t GetSampleQuality(){return fQuality ;} - Int_t GetModule() { return fModule; } - Int_t GetColumn() { return fColumn; } - Int_t GetRow() { return fRow; } - Bool_t IsLowGain() { return fLowGainFlag; } - Bool_t IsOverflow(){ return fOverflow ;} + const Double_t GetEnergy() const { return fEnergy; } + const Double_t GetTime() const { return fTime; } + const Double_t GetSampleQuality() const {return fQuality ;} + const Int_t GetModule() const { return fModule; } + const Int_t GetColumn() const { return fColumn; } + const Int_t GetRow() const { return fRow; } + const Bool_t IsLowGain() const { return fLowGainFlag; } + const Bool_t IsOverflow() const { return fOverflow ;} const AliRawReader* GetRawReader() const { return fRawReader; } @@ -58,8 +58,8 @@ protected: Int_t fNewRow; // row of keeped sample Int_t fNewAmp ; //Keeped amp Int_t fNewTime ; //Time of keeped sample - Bool_t fLowGainFlag; - Bool_t fNewLowGainFlag; + Bool_t fLowGainFlag; //True if sample read from Low Gain + Bool_t fNewLowGainFlag; // fLowGainFlag of keeped sample Bool_t fOverflow ; //Wether there was overflow TArrayI* fSamples; // array of samples TArrayI* fTimes ; // array of times corresponding to samples -- 2.39.3