From 776c19a3da2faaa5db85dbdfc0c8374046f3d764 Mon Sep 17 00:00:00 2001 From: prino Date: Tue, 8 Mar 2011 11:58:15 +0000 Subject: [PATCH] Fix coding convention violations --- ITS/AliITSDCSDataSDD.cxx | 20 ++++++++++++++++ ITS/AliITSOnlineSDDBase.cxx | 14 ++++++++---- ITS/AliITSOnlineSDDBase.h | 16 ++++++++----- ITS/AliITSOnlineSDDCMN.cxx | 35 ++++++++++++++++------------ ITS/AliITSOnlineSDDTP.cxx | 28 ++++++++++++----------- ITS/AliITSOnlineSDDTP.h | 2 +- ITS/AliITSresponseSDD.h | 43 +++++++++++------------------------ ITS/AliITSsegmentationSDD.cxx | 3 +++ 8 files changed, 91 insertions(+), 70 deletions(-) diff --git a/ITS/AliITSDCSDataSDD.cxx b/ITS/AliITSDCSDataSDD.cxx index 14b91624e8f..30d34b5e1d1 100644 --- a/ITS/AliITSDCSDataSDD.cxx +++ b/ITS/AliITSDCSDataSDD.cxx @@ -61,7 +61,9 @@ fStatusSetPoints(0) void AliITSDCSDataSDD::SetNPointsTempLeft( Int_t npts ) { + // dimension arrays with left side temperatures // + if( npts < fTempLeftSetPoints) { // Cannot resize arrays - some elements would be lost AliWarning("Attemp to reduce size of full array (SDD DCS _TEMP_L)"); @@ -80,7 +82,9 @@ void AliITSDCSDataSDD::SetNPointsTempLeft( Int_t npts ) void AliITSDCSDataSDD::SetNPointsTempRight( Int_t npts ) { + // dimension arrays with right side temperatures // + if( npts < fTempRightSetPoints) { // Cannot resize arrays - some elements would be lost AliWarning("Attemp to reduce size of full array (SDD DCS _TEMP_R)"); @@ -99,7 +103,9 @@ void AliITSDCSDataSDD::SetNPointsTempRight( Int_t npts ) void AliITSDCSDataSDD::SetNPointsHV( Int_t npts ) { + // dimension arrays with HV values // + if( npts < fHVSetPoints) { // Cannot resize arrays - some elements would be lost AliWarning("Attemp to reduce size of full array (SDD DCS _HV)"); @@ -118,7 +124,9 @@ void AliITSDCSDataSDD::SetNPointsHV( Int_t npts ) void AliITSDCSDataSDD::SetNPointsMV( Int_t npts ) { + // dimension arrays with MV values // + if( npts < fMVSetPoints) { // Cannot resize arrays - some elements would be lost AliWarning("Attemp to reduce size of full array (SDD DCS _MV)"); @@ -137,7 +145,9 @@ void AliITSDCSDataSDD::SetNPointsMV( Int_t npts ) void AliITSDCSDataSDD::SetNPointsStatus( Int_t npts ) { + // dimension arrays withn DCS channel status // + if( npts < fStatusSetPoints) { // Cannot resize arrays - some elements would be lost AliWarning("Attemp to reduce size of full array (SDD DCS Status)"); @@ -156,7 +166,9 @@ void AliITSDCSDataSDD::SetNPointsStatus( Int_t npts ) //--------------------------------------------------------------------------- void AliITSDCSDataSDD::SetValueTempLeft(Int_t time, Float_t temperature ) { + // insert a value for left temperature data point // + if( fTempLeftMaxPoints == fTempLeftSetPoints ) SetNPointsTempLeft( fTempLeftMaxPoints + AUTORESIZE ); // Enlarges arrays if necessary @@ -199,7 +211,9 @@ void AliITSDCSDataSDD::SetValueTempLeft(Int_t time, Float_t temperature ) void AliITSDCSDataSDD::SetValueTempRight(Int_t time, Float_t temperature ) { + // insert a value for right temperature data point // + if( fTempRightMaxPoints == fTempRightSetPoints ) SetNPointsTempRight( fTempRightMaxPoints + AUTORESIZE ); // Enlarges arrays if necessary @@ -242,7 +256,9 @@ void AliITSDCSDataSDD::SetValueTempRight(Int_t time, Float_t temperature ) void AliITSDCSDataSDD::SetValueHV(Int_t time, Float_t voltage ) { + // insert a value for HV data point // + if( fHVMaxPoints == fHVSetPoints ) SetNPointsHV( fHVMaxPoints + AUTORESIZE ); // Enlarges arrays if necessary @@ -282,7 +298,9 @@ void AliITSDCSDataSDD::SetValueHV(Int_t time, Float_t voltage ) void AliITSDCSDataSDD::SetValueMV(Int_t time, Float_t voltage ) { + // insert a value for MV data point // + if( fMVMaxPoints == fMVSetPoints ) SetNPointsMV( fMVMaxPoints + AUTORESIZE ); // Enlarges arrays if necessary @@ -325,7 +343,9 @@ void AliITSDCSDataSDD::SetValueMV(Int_t time, Float_t voltage ) void AliITSDCSDataSDD::SetValueStatus(Int_t time, Char_t status ) { + // insert a value for channel status // + if( fStatusMaxPoints == fStatusSetPoints ) SetNPointsStatus( fStatusMaxPoints + AUTORESIZE ); // Enlarges arrays if necessary diff --git a/ITS/AliITSOnlineSDDBase.cxx b/ITS/AliITSOnlineSDDBase.cxx index 25865ba6045..4dfdf52c421 100644 --- a/ITS/AliITSOnlineSDDBase.cxx +++ b/ITS/AliITSOnlineSDDBase.cxx @@ -62,7 +62,7 @@ AliITSOnlineSDDBase::~AliITSOnlineSDDBase(){ } //______________________________________________________________________ void AliITSOnlineSDDBase::Reset(){ - // + // reset all counters fNEvents=0; for(Int_t i=0;i0) noise2=fSumRawNoise[iAnode]/fNEvents-fSumBaseline[iAnode]*fSumBaseline[iAnode]/fNEvents/fNEvents; - if(noise2>0.) return TMath::Sqrt(noise2); - else return 0; - } + Float_t GetAnodeRawNoise(Int_t iAnode) const; Int_t CountGoodAnodes() const{ Int_t nGdAn=0; @@ -81,4 +76,13 @@ class AliITSOnlineSDDBase : public AliITSOnlineSDD { ClassDef(AliITSOnlineSDDBase,2); }; + +inline Float_t AliITSOnlineSDDBase::GetAnodeRawNoise(Int_t iAnode) const{ + // compute raw noise for given anode + Float_t noise2=0.; + if(fNEvents>0) noise2=fSumRawNoise[iAnode]/fNEvents-fSumBaseline[iAnode]*fSumBaseline[iAnode]/fNEvents/fNEvents; + if(noise2>0.) return TMath::Sqrt(noise2); + else return 0; +} + #endif diff --git a/ITS/AliITSOnlineSDDCMN.cxx b/ITS/AliITSOnlineSDDCMN.cxx index f31cce3c8c7..982843df153 100644 --- a/ITS/AliITSOnlineSDDCMN.cxx +++ b/ITS/AliITSOnlineSDDCMN.cxx @@ -53,7 +53,7 @@ AliITSOnlineSDDCMN::~AliITSOnlineSDDCMN(){ } //______________________________________________________________________ void AliITSOnlineSDDCMN::Reset(){ - // + // Reset counters fNEvents=0; for(Int_t i=0;ifMaxCorrNoise || GetAnodeCorrNoise(ian)GetNbinsX(),hrawd->GetXaxis()->GetXmin(),hrawd->GetXaxis()->GetXmax(),hrawd->GetNbinsY(),hrawd->GetYaxis()->GetXmin(),hrawd->GetYaxis()->GetXmax()); for(Int_t itb=fFirstGoodTB;itb<=fLastGoodTB;itb++){ Float_t sumEven=0., sumOdd=0.; @@ -135,7 +136,8 @@ TH2F* AliITSOnlineSDDCMN::GetCleanEvent(TH2F* hrawd) const { } //______________________________________________________________________ void AliITSOnlineSDDCMN::AddEvent(TH2F* hrawd){ - // + // analyzes one event and adds its ontribution to the various counters + fNEvents++; TH2F* hcorrd=GetCleanEvent(hrawd); @@ -154,7 +156,8 @@ void AliITSOnlineSDDCMN::AddEvent(TH2F* hrawd){ } //______________________________________________________________________ Float_t AliITSOnlineSDDCMN::CalcMeanNoise() const{ - // + // compute average noise + Float_t meanns=0.; Int_t cnt=0; for(Int_t ian=0;ian0) return fSumTPPeak[iAnode]/fNEvents[iAnode]/fDAC; else return 0; } - void StatGain(Float_t &mean, Float_t &rms); + void StatGain(Float_t &mean, Float_t &rms) const; void WriteToASCII(); Bool_t WriteToROOT(TFile *fil); diff --git a/ITS/AliITSresponseSDD.h b/ITS/AliITSresponseSDD.h index 40f5f8296a4..187a1592e26 100644 --- a/ITS/AliITSresponseSDD.h +++ b/ITS/AliITSresponseSDD.h @@ -46,11 +46,7 @@ class AliITSresponseSDD : public TObject { virtual void SetHalfLadderATimeZero(Int_t lay, Int_t lad, Float_t tzero); virtual void SetHalfLadderCTimeZero(Int_t lay, Int_t lad, Float_t tzero); virtual void SetModuleTimeZero(Int_t modIndex, Float_t tzero){ - if(modIndex=kNSPDmods+kNSDDmods){ - AliError(Form("SDD module number %d out of range",modIndex)); - return; - } - fTimeZero[modIndex-kNSPDmods]=tzero; + if(CheckModuleIndex(modIndex)) fTimeZero[modIndex-kNSPDmods]=tzero; } virtual void SetDeltaVDrift(Int_t modIndex, Float_t dv, Bool_t rightSide=kFALSE) { @@ -72,46 +68,29 @@ class AliITSresponseSDD : public TObject { virtual void SetTimeOffset(Float_t to){fTimeOffset = to;} virtual Float_t GetTimeOffset()const {return fTimeOffset;} virtual Float_t GetTimeZero(Int_t modIndex) const { - if(modIndex=kNSPDmods+kNSDDmods){ - AliError(Form("SDD module number %d out of range",modIndex)); - return 0.; - } - return fTimeZero[modIndex-kNSPDmods]; + if(CheckModuleIndex(modIndex)) return fTimeZero[modIndex-kNSPDmods]; + else return 0.; } virtual void SetADC2keV(Float_t conv){fADC2keV=conv;} virtual Float_t GetADC2keV()const {return fADC2keV;} virtual void SetADCtokeV(Int_t modIndex, Float_t conv){ - if(modIndex=kNSPDmods+kNSDDmods){ - AliError(Form("SDD module number %d out of range",modIndex)); - return; - } - fADCtokeV[modIndex-kNSPDmods]=conv; + if(CheckModuleIndex(modIndex)) fADCtokeV[modIndex-kNSPDmods]=conv; } virtual Float_t GetADCtokeV(Int_t modIndex) const { - if(modIndex=kNSPDmods+kNSDDmods){ - AliError(Form("SDD module number %d out of range",modIndex)); - return 0.; - } - return fADCtokeV[modIndex-kNSPDmods]; + if(CheckModuleIndex(modIndex)) return fADCtokeV[modIndex-kNSPDmods]; + else return 0.; } virtual void SetChargevsTime(Float_t slope){fChargevsTime=slope;} virtual Float_t GetChargevsTime()const {return fChargevsTime;} virtual void SetADCvsDriftTime(Int_t modIndex, Float_t slope){ - if(modIndex=kNSPDmods+kNSDDmods){ - AliError(Form("SDD module number %d out of range",modIndex)); - return; - } - fADCvsDriftTime[modIndex-kNSPDmods]=slope; + if(CheckModuleIndex(modIndex)) fADCvsDriftTime[modIndex-kNSPDmods]=slope; } virtual Float_t GetADCvsDriftTime(Int_t modIndex) const { - if(modIndex=kNSPDmods+kNSDDmods){ - AliError(Form("SDD module number %d out of range",modIndex)); - return 0.; - } - return fADCvsDriftTime[modIndex-kNSPDmods]; + if(CheckModuleIndex(modIndex)) return fADCvsDriftTime[modIndex-kNSPDmods]; + else return 0.; } static Float_t DefaultADC2keV() {return fgkADC2keVDefault;} @@ -132,6 +111,10 @@ class AliITSresponseSDD : public TObject { return (rightSide && IsVDCorr2Side()) ? ind + kNSDDmods : ind; } + virtual Bool_t CheckModuleIndex(Int_t modIndex) const { + if(modIndex=kNSPDmods+kNSDDmods){ AliError(Form("SDD module number %d out of range",modIndex)); return kFALSE;} + return kTRUE; + } protected: diff --git a/ITS/AliITSsegmentationSDD.cxx b/ITS/AliITSsegmentationSDD.cxx index b870e79854b..f50fa6fae68 100644 --- a/ITS/AliITSsegmentationSDD.cxx +++ b/ITS/AliITSsegmentationSDD.cxx @@ -213,6 +213,9 @@ Int_t AliITSsegmentationSDD::GetChipFromLocal(Float_t xloc, Float_t zloc) const } //---------------------------------------------------------------------- Int_t AliITSsegmentationSDD::GetChipsInLocalWindow(Int_t* array, Float_t zmin, Float_t zmax, Float_t xmin, Float_t xmax) const { + // returns the numbers of the chips that read channels in a given region + // of the module defined in local coordinates by zmin-zmax, xmin-max + Int_t nChipInW = 0; Float_t zminDet=-fDz*fgkMicron2Cm/2.; Float_t zmaxDet=fDz*fgkMicron2Cm/2.; -- 2.43.0