From 4f5f1ae2775f3b8181c6752e93771907817ad53e Mon Sep 17 00:00:00 2001 From: cblume Date: Wed, 28 Oct 2009 09:27:07 +0000 Subject: [PATCH] Fix coding rule violations --- TRD/AliTRDQADataMaker.cxx | 20 +++++++--------- TRD/AliTRDQADataMaker.h | 16 ++++++------- TRD/AliTRDQADataMakerRec.cxx | 33 +++++++++++++------------- TRD/AliTRDQADataMakerRec.h | 18 +++++++------- TRD/AliTRDdigitsManager.cxx | 46 ++++++++++++++++++------------------ 5 files changed, 65 insertions(+), 68 deletions(-) diff --git a/TRD/AliTRDQADataMaker.cxx b/TRD/AliTRDQADataMaker.cxx index 1b0c6baa427..98fb1834dec 100644 --- a/TRD/AliTRDQADataMaker.cxx +++ b/TRD/AliTRDQADataMaker.cxx @@ -27,18 +27,16 @@ // --- ROOT system --- #include -#include #include #include #include #include #include -#include -#include // --- AliRoot header files --- #include "AliESDEvent.h" -#include "AliLog.h" +#include "AliQAChecker.h" + #include "AliTRDdigit.h" #include "AliTRDhit.h" #include "AliTRDcluster.h" @@ -46,8 +44,6 @@ #include "AliTRDdigitsManager.h" #include "AliTRDgeometry.h" #include "AliTRDarrayADC.h" -#include "AliTRDrawStream.h" -#include "AliQAChecker.h" ClassImp(AliTRDQADataMaker) @@ -346,7 +342,7 @@ void AliTRDQADataMaker::InitSDigits() } //____________________________________________________________________________ -void AliTRDQADataMaker::MakeESDs(AliESDEvent * esd) +void AliTRDQADataMaker::MakeESDs(AliESDEvent * const esd) { // // Make QA data from ESDs @@ -486,7 +482,7 @@ Double_t AliTRDQADataMaker::GetExtZ(const AliExternalTrackParam *in) const } //____________________________________________________________________________ -void AliTRDQADataMaker::MakeHits(TClonesArray * hits) +void AliTRDQADataMaker::MakeHits(TClonesArray * const hits) { // // Make QA data from Hits @@ -541,7 +537,7 @@ void AliTRDQADataMaker::MakeHits(TTree * hitTree) } //____________________________________________________________________________ -void AliTRDQADataMaker::MakeDigits(TClonesArray * digits) +void AliTRDQADataMaker::MakeDigits(TClonesArray * const digits) { // // Makes data from Digits @@ -602,7 +598,7 @@ void AliTRDQADataMaker::MakeDigits(TTree * digits) } //____________________________________________________________________________ -void AliTRDQADataMaker::MakeSDigits(TClonesArray * sdigits) +void AliTRDQADataMaker::MakeSDigits(TClonesArray * const sdigits) { // // Makes data from Digits @@ -664,7 +660,7 @@ void AliTRDQADataMaker::MakeSDigits(TTree * digits) } //____________________________________________________________________________ -void AliTRDQADataMaker::MakeRaws(AliRawReader* rawReader) +void AliTRDQADataMaker::MakeRaws(AliRawReader * const rawReader) { // // Makes QA data from raw data @@ -795,7 +791,7 @@ void AliTRDQADataMaker::StartOfDetectorCycle() } //__________________________________________________________________________ -Int_t AliTRDQADataMaker::CheckPointer(TObject *obj, const char *name) +Int_t AliTRDQADataMaker::CheckPointer(TObject * const obj, const char *name) { // // Checks initialization of pointers diff --git a/TRD/AliTRDQADataMaker.h b/TRD/AliTRDQADataMaker.h index 5682004f54c..40b339036aa 100644 --- a/TRD/AliTRDQADataMaker.h +++ b/TRD/AliTRDQADataMaker.h @@ -1,5 +1,5 @@ -#ifndef AliTRDQADATAMAKER_H -#define AliTRDQADATAMAKER_H +#ifndef ALITRDQADATAMAKER_H +#define ALITRDQADATAMAKER_H /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * * See cxx source for full Copyright notice */ @@ -44,20 +44,20 @@ class AliTRDQADataMaker: public AliQADataMaker { virtual void InitSDigits() ; virtual void MakeHits(TTree * hitTree); - virtual void MakeHits(TClonesArray * hits); + virtual void MakeHits(TClonesArray * const hits); virtual void MakeSDigits(TTree *sdigitTree); - virtual void MakeSDigits(TClonesArray * sigits); + virtual void MakeSDigits(TClonesArray * const sigits); virtual void MakeDigits(TTree *digitTree); - virtual void MakeDigits(TClonesArray * digits); + virtual void MakeDigits(TClonesArray * const digits); - virtual void MakeRaws(AliRawReader* rawReader); + virtual void MakeRaws(AliRawReader * const rawReader); virtual void MakeRecPoints(TTree * recpo); - virtual void MakeESDs(AliESDEvent * esd); + virtual void MakeESDs(AliESDEvent * const esd); virtual void StartOfDetectorCycle() ; - Int_t CheckPointer(TObject *obj, const char *name); + Int_t CheckPointer(TObject * const obj, const char *name); // internal methods Int_t GetSector(const Double_t alpha) const; diff --git a/TRD/AliTRDQADataMakerRec.cxx b/TRD/AliTRDQADataMakerRec.cxx index cd6c59b5c1b..855165e30b0 100644 --- a/TRD/AliTRDQADataMakerRec.cxx +++ b/TRD/AliTRDQADataMakerRec.cxx @@ -26,27 +26,21 @@ //////////////////////////////////////////////////////////////////////////// // --- ROOT system --- -#include -#include #include #include #include #include #include -#include // --- AliRoot header files --- #include "AliESDEvent.h" -#include "AliLog.h" #include "AliRawReader.h" +#include "AliQAChecker.h" + #include "AliTRDcluster.h" #include "AliTRDQADataMakerRec.h" -#include "AliTRDgeometry.h" -//#include "AliTRDdataArrayI.h" #include "AliTRDrawStream.h" -#include "AliQAChecker.h" - ClassImp(AliTRDQADataMakerRec) //____________________________________________________________________________ @@ -55,6 +49,8 @@ ClassImp(AliTRDQADataMakerRec) { // // Default constructor + // + } //____________________________________________________________________________ @@ -491,7 +487,7 @@ void AliTRDQADataMakerRec::InitRaws() } //____________________________________________________________________________ -void AliTRDQADataMakerRec::MakeESDs(AliESDEvent * esd) +void AliTRDQADataMakerRec::MakeESDs(AliESDEvent * const esd) { // // Make QA data from ESDs @@ -660,11 +656,11 @@ Int_t AliTRDQADataMakerRec::GetStack(const AliExternalTrackParam *paramOut) cons // calculates the stack the track is in // - const Double_t L = -0.9; - const Double_t W = (2*L)/5; + const Double_t l = -0.9; + const Double_t w = (2*l)/5; Double_t tan = paramOut->GetZ() / paramOut->GetX(); - Double_t pos = (tan - L) / W; + Double_t pos = (tan - l) / w; return (Int_t) pos; } @@ -987,7 +983,7 @@ void AliTRDQADataMakerRec::StartOfDetectorCycle() } //__________________________________________________________________________ -Int_t AliTRDQADataMakerRec::CheckPointer(TObject *obj, const char *name) +Int_t AliTRDQADataMakerRec::CheckPointer(TObject * const obj, const char *name) { // // Checks initialization of pointers @@ -997,7 +993,8 @@ Int_t AliTRDQADataMakerRec::CheckPointer(TObject *obj, const char *name) return !!obj; } //__________________________________________________________________________ -void AliTRDQADataMakerRec::BuildRatio(TH1D *ratio, TH1D *histN, TH1D*histD) { +void AliTRDQADataMakerRec::BuildRatio(TH1D *ratio, TH1D * const histN, TH1D * const histD) +{ // // Calculate the ratio of two histograms // error are calculated assuming the histos have the same counts @@ -1028,9 +1025,13 @@ void AliTRDQADataMakerRec::BuildRatio(TH1D *ratio, TH1D *histN, TH1D*histD) { ratio->SetMaximum(1.1); ratio->SetMarkerStyle(20); } -//__________________________________________________________________________ -Int_t AliTRDQADataMakerRec::FillBits(TH1D *hist, Int_t code, Int_t offset) { +//__________________________________________________________________________ +Int_t AliTRDQADataMakerRec::FillBits(TH1D *hist, Int_t code, Int_t offset) +{ + // + // Fill bits + // Int_t nb = 0; UInt_t test = 1; diff --git a/TRD/AliTRDQADataMakerRec.h b/TRD/AliTRDQADataMakerRec.h index 1ff2745e3f8..8930ced86df 100644 --- a/TRD/AliTRDQADataMakerRec.h +++ b/TRD/AliTRDQADataMakerRec.h @@ -1,5 +1,5 @@ -#ifndef AliTRDQADataMakerRec_H -#define AliTRDQADataMakerRec_H +#ifndef ALITRDQADATAMAKERREC_H +#define ALITRDQADATAMAKERREC_H /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * * See cxx source for full Copyright notice */ @@ -45,18 +45,18 @@ class AliTRDQADataMakerRec: public AliQADataMakerRec { virtual void MakeRaws(AliRawReader* rawReader); virtual void MakeRecPoints(TTree * recpo); - virtual void MakeESDs(AliESDEvent * esd); + virtual void MakeESDs(AliESDEvent * const esd); virtual void StartOfDetectorCycle() ; - Int_t CheckPointer(TObject *obj, const char *name); + Int_t CheckPointer(TObject * const obj, const char *name); // internal methods - Int_t GetSector(Double_t alpha) const; - Int_t GetStack(const AliExternalTrackParam *paramOut) const; - Double_t GetExtZ(const AliExternalTrackParam *paramIn) const; - Int_t FillBits(TH1D *hist, Int_t code, Int_t offset); + Int_t GetSector(Double_t alpha) const; + Int_t GetStack(const AliExternalTrackParam *paramOut) const; + Double_t GetExtZ(const AliExternalTrackParam *paramIn) const; + Int_t FillBits(TH1D *hist, Int_t code, Int_t offset); - void BuildRatio(TH1D *ratio, TH1D *histN, TH1D *histD); + void BuildRatio(TH1D *ratio, TH1D * const histN, TH1D * const histD); ClassDef(AliTRDQADataMakerRec,1) // Creates the TRD QA data diff --git a/TRD/AliTRDdigitsManager.cxx b/TRD/AliTRDdigitsManager.cxx index 1d36aedb243..ec0a0ebf6ba 100644 --- a/TRD/AliTRDdigitsManager.cxx +++ b/TRD/AliTRDdigitsManager.cxx @@ -647,7 +647,7 @@ AliTRDarrayADC *AliTRDdigitsManager::GetDigits(Int_t det) const // Returns the digits array for one detector // - Int_t RecoDet = fRawRec ? 0 : det; + Int_t recoDet = fRawRec ? 0 : det; if (!fDigits) { @@ -656,8 +656,8 @@ AliTRDarrayADC *AliTRDdigitsManager::GetDigits(Int_t det) const if (!fHasSDigits) { - ((AliTRDarrayADC *) fDigits->At(RecoDet))->SetNdet(det); - return (AliTRDarrayADC *) fDigits->At(RecoDet); + ((AliTRDarrayADC *) fDigits->At(recoDet))->SetNdet(det); + return (AliTRDarrayADC *) fDigits->At(recoDet); } else { @@ -674,7 +674,7 @@ AliTRDarraySignal *AliTRDdigitsManager::GetSDigits(Int_t det) const // Returns the sdigits array for one detector // - Int_t RecoDet = fRawRec ? 0 : det; + Int_t recoDet = fRawRec ? 0 : det; if (!fDigits) { @@ -684,8 +684,8 @@ AliTRDarraySignal *AliTRDdigitsManager::GetSDigits(Int_t det) const if (fHasSDigits) { - ((AliTRDarraySignal *) fDigits->At(RecoDet))->SetNdet(det); - return (AliTRDarraySignal *) fDigits->At(RecoDet); + ((AliTRDarraySignal *) fDigits->At(recoDet))->SetNdet(det); + return (AliTRDarraySignal *) fDigits->At(recoDet); } else { @@ -703,15 +703,15 @@ AliTRDarrayDictionary *AliTRDdigitsManager::GetDictionary(Int_t det // Returns the dictionary for one detector // - Int_t RecoDet = fRawRec ? 0 : det; + Int_t recoDet = fRawRec ? 0 : det; if (fUseDictionaries == kFALSE) { return 0x0; } - ((AliTRDarrayDictionary *) fDigits->At(RecoDet))->SetNdet(det); - return (AliTRDarrayDictionary *) fDict[i]->At(RecoDet); + ((AliTRDarrayDictionary *) fDigits->At(recoDet))->SetNdet(det); + return (AliTRDarrayDictionary *) fDict[i]->At(recoDet); } @@ -738,9 +738,9 @@ AliTRDSignalIndex *AliTRDdigitsManager::GetIndexes(Int_t det) // Returns indexes of active pads // - Int_t RecoDet = fRawRec ? 0 : det; + Int_t recoDet = fRawRec ? 0 : det; - return (AliTRDSignalIndex *) fSignalIndexes->At(RecoDet); + return (AliTRDSignalIndex *) fSignalIndexes->At(recoDet); } @@ -751,18 +751,18 @@ void AliTRDdigitsManager::RemoveDigits(Int_t det) // Clear memory at det for Digits // - Int_t RecoDet = fRawRec ? 0 : det; + Int_t recoDet = fRawRec ? 0 : det; - if (fDigits->At(RecoDet)) + if (fDigits->At(recoDet)) { if (fHasSDigits) { - AliTRDarraySignal *arr = (AliTRDarraySignal *) fDigits->RemoveAt(RecoDet); + AliTRDarraySignal *arr = (AliTRDarraySignal *) fDigits->RemoveAt(recoDet); delete arr; } else { - AliTRDarrayADC *arr = (AliTRDarrayADC *) fDigits->RemoveAt(RecoDet); + AliTRDarrayADC *arr = (AliTRDarrayADC *) fDigits->RemoveAt(recoDet); delete arr; } } @@ -776,7 +776,7 @@ void AliTRDdigitsManager::RemoveDictionaries(Int_t det) // Clear memory // - Int_t RecoDet = fRawRec ? 0 : det; + Int_t recoDet = fRawRec ? 0 : det; if (fUseDictionaries == kFALSE) { @@ -785,9 +785,9 @@ void AliTRDdigitsManager::RemoveDictionaries(Int_t det) for (Int_t i = 0; i < kNDict; i++) { - if (fDict[i]->At(RecoDet)) + if (fDict[i]->At(recoDet)) { - AliTRDarrayDictionary *arr = (AliTRDarrayDictionary *) fDict[i]->RemoveAt(RecoDet); + AliTRDarrayDictionary *arr = (AliTRDarrayDictionary *) fDict[i]->RemoveAt(recoDet); delete arr; } } @@ -801,11 +801,11 @@ void AliTRDdigitsManager::RemoveIndexes(Int_t det) // Clear memory // - Int_t RecoDet = fRawRec ? 0 : det; + Int_t recoDet = fRawRec ? 0 : det; - if (fSignalIndexes->At(RecoDet)) + if (fSignalIndexes->At(recoDet)) { - AliTRDSignalIndex *arr = (AliTRDSignalIndex *) fSignalIndexes->RemoveAt(RecoDet); + AliTRDSignalIndex *arr = (AliTRDSignalIndex *) fSignalIndexes->RemoveAt(recoDet); delete arr; } @@ -818,9 +818,9 @@ void AliTRDdigitsManager::ClearIndexes(Int_t det) // Clear memory // - Int_t RecoDet = fRawRec ? 0 : det; + Int_t recoDet = fRawRec ? 0 : det; - ((AliTRDSignalIndex *) fSignalIndexes->At(RecoDet))->ClearAll(); + ((AliTRDSignalIndex *) fSignalIndexes->At(recoDet))->ClearAll(); } -- 2.43.0