From 9b94f9772eca8dd0ef26b3abf2d5a3d574251349 Mon Sep 17 00:00:00 2001 From: masera Date: Fri, 11 Mar 2011 16:27:49 +0000 Subject: [PATCH] Coding conventions (Melinda) --- ITS/AliITSQAChecker.cxx | 9 +++++--- ITS/AliITSQAChecker.h | 24 +++++++++---------- ITS/AliITSQADataMakerSim.cxx | 45 +++++++++++++++++++----------------- ITS/AliITSQADataMakerSim.h | 8 +++---- ITS/AliITSQASDDChecker.h | 2 +- 5 files changed, 47 insertions(+), 41 deletions(-) diff --git a/ITS/AliITSQAChecker.cxx b/ITS/AliITSQAChecker.cxx index daec1eab7d4..056eb37596f 100644 --- a/ITS/AliITSQAChecker.cxx +++ b/ITS/AliITSQAChecker.cxx @@ -359,6 +359,7 @@ void AliITSQAChecker::SetHisto(Int_t SPDhisto, Int_t SDDhisto, Int_t SSDhisto) //____________________________________________________________________________ void AliITSQAChecker::SetDetTaskOffset(Int_t subdet,Int_t offset) { + //returns the offset for each task and for each subdetector switch(subdet){ case 1: SetSPDTaskOffset(offset); @@ -379,6 +380,7 @@ void AliITSQAChecker::SetHisto(Int_t SPDhisto, Int_t SDDhisto, Int_t SSDhisto) //____________________________________________________________________________ void AliITSQAChecker::SetDetHisto(Int_t subdet,Int_t histo) { + //set the number od histograms for the subdetector switch(subdet){ case 1: SetSPDHisto(histo); @@ -400,7 +402,7 @@ void AliITSQAChecker::SetHisto(Int_t SPDhisto, Int_t SDDhisto, Int_t SSDhisto) void AliITSQAChecker::InitQACheckerLimits() { - + //init the tolerance range for each QA bit AliInfo("Setting of tolerance values\n"); Float_t lowtolerancevalue[AliQAv1::kNBIT]; @@ -433,6 +435,7 @@ void AliITSQAChecker::InitQACheckerLimits() void AliITSQAChecker::CreateStepForBit(Double_t histonumb,Double_t *steprange) { + //creation of the step bit for each QA bit for(Int_t bit=0;bit < AliQAv1::kNBIT; bit++) { //printf("%i\t %f \t %f \t %f \n",bit, fUpTestValue[bit],fLowTestValue[AliQAv1::kINFO],histonumb); @@ -446,7 +449,7 @@ void AliITSQAChecker::CreateStepForBit(Double_t histonumb,Double_t *steprange) //_____________________________________________________________________________ void AliITSQAChecker::SetQA(AliQAv1::ALITASK_t index, Double_t * value) const { - + //Setting of the QA tolerance values AliQAv1 * qa = AliQAv1::Instance(index) ; @@ -476,7 +479,7 @@ void AliITSQAChecker::SetQA(AliQAv1::ALITASK_t index, Double_t * value) const //__________________________________________________________________ void AliITSQAChecker::MakeImage( TObjArray ** list, AliQAv1::TASKINDEX_t task, AliQAv1::MODE_t mode) { - + //make a summary image //gStyle->SetPalette(1); //Int_t nImages = 0 ; diff --git a/ITS/AliITSQAChecker.h b/ITS/AliITSQAChecker.h index 002843c023b..4a7e4fe0582 100644 --- a/ITS/AliITSQAChecker.h +++ b/ITS/AliITSQAChecker.h @@ -37,9 +37,9 @@ public: void SetMode(Bool_t kMode) { fkOnline = kMode; } void SetSubDet(Short_t subdet) { fDet = subdet; } void SetLDC(Short_t ldc) { fLDC = ldc; } - Bool_t GetMode() { return fkOnline; } - Short_t GetSubDet() { return fDet; } - Short_t GetLDC() { return fLDC; } + Bool_t GetMode() const { return fkOnline; }; + Short_t GetSubDet() const { return fDet; } ; + Short_t GetLDC() const { return fLDC; } ; virtual void SetTaskOffset(Int_t SPDOffset, Int_t SDDOffset, Int_t SSDOffset); virtual void SetHisto(Int_t SPDhisto, Int_t SDDhisto, Int_t SSDhisto); virtual void SetDetTaskOffset(Int_t subdet=0,Int_t offset=0); @@ -67,17 +67,17 @@ protected: private: - Bool_t fkOnline; - Short_t fDet; - Short_t fLDC; + Bool_t fkOnline; //online=kTRUE offline=kFALSE + Short_t fDet; //0=all 1=SPD 2=SDD 3=SSD + Short_t fLDC; //LDC number - Int_t fSPDOffset; //starting point for the QACheck list - Int_t fSDDOffset; - Int_t fSSDOffset; + Int_t fSPDOffset; //starting point for the QACheck list SPD + Int_t fSDDOffset; //starting point for the QACheck list SDD + Int_t fSSDOffset; //starting point for the QACheck list SSD - Int_t fSPDHisto; - Int_t fSDDHisto; - Int_t fSSDHisto; + Int_t fSPDHisto; //number of histograms for SPD + Int_t fSDDHisto; //number of histograms for SDD + Int_t fSSDHisto; //number of histograms for SSD AliITSQASPDChecker *fSPDChecker; // SPD Checker AliITSQASDDChecker *fSDDChecker; // SDD Checker diff --git a/ITS/AliITSQADataMakerSim.cxx b/ITS/AliITSQADataMakerSim.cxx index faef0a88f9e..57ba4e83aba 100644 --- a/ITS/AliITSQADataMakerSim.cxx +++ b/ITS/AliITSQADataMakerSim.cxx @@ -163,25 +163,25 @@ void AliITSQADataMakerSim::EndOfDetectorCycle(AliQAv1::TASKINDEX_t task, TObjArr void AliITSQADataMakerSim::InitDigits() { + // Initialization for Digits data fDigitsQAList[AliRecoParam::AConvert(fEventSpecie)]->SetUniqueID(60); - // Initialization for Digits data - if(fSubDetector == 0 || fSubDetector == 1) { - AliDebug(AliQAv1::GetQADebugLevel(),"AliITSQADM:: SPD InitDigits\n"); - - fSPDDataMaker->InitDigits(); - } - if(fSubDetector == 0 || fSubDetector == 2) { - AliDebug(AliQAv1::GetQADebugLevel(),"AliITSQADM:: SDD InitDigits\n"); - - fSDDDataMaker->SetOffset(AliQAv1::kDIGITS, fDigitsQAList[AliRecoParam::AConvert(fEventSpecie)]->GetEntries(),AliRecoParam::AConvert(fEventSpecie)); - fSDDDataMaker->InitDigits(); - } - if(fSubDetector == 0 || fSubDetector == 3) { - AliDebug(AliQAv1::GetQADebugLevel(),"AliITSQADM:: SSD InitDigits\n"); - - fSSDDataMaker->SetOffset(AliQAv1::kDIGITS, fDigitsQAList[AliRecoParam::AConvert(fEventSpecie)]->GetEntries(),AliRecoParam::AConvert(fEventSpecie)); - fSSDDataMaker->InitDigits(); - } + if(fSubDetector == 0 || fSubDetector == 1) { + AliDebug(AliQAv1::GetQADebugLevel(),"AliITSQADM:: SPD InitDigits\n"); + + fSPDDataMaker->InitDigits(); + } + if(fSubDetector == 0 || fSubDetector == 2) { + AliDebug(AliQAv1::GetQADebugLevel(),"AliITSQADM:: SDD InitDigits\n"); + + fSDDDataMaker->SetOffset(AliQAv1::kDIGITS, fDigitsQAList[AliRecoParam::AConvert(fEventSpecie)]->GetEntries(),AliRecoParam::AConvert(fEventSpecie)); + fSDDDataMaker->InitDigits(); + } + if(fSubDetector == 0 || fSubDetector == 3) { + AliDebug(AliQAv1::GetQADebugLevel(),"AliITSQADM:: SSD InitDigits\n"); + + fSSDDataMaker->SetOffset(AliQAv1::kDIGITS, fDigitsQAList[AliRecoParam::AConvert(fEventSpecie)]->GetEntries(),AliRecoParam::AConvert(fEventSpecie)); + fSSDDataMaker->InitDigits(); + } } //____________________________________________________________________________ @@ -214,8 +214,8 @@ void AliITSQADataMakerSim::MakeDigits(TTree * digits) //____________________________________________________________________________ void AliITSQADataMakerSim::InitSDigits() { + // Initialization for SDigits fSDigitsQAList[AliRecoParam::AConvert(fEventSpecie)]->SetUniqueID(70); - // Initialization for RECPOINTS if(fSubDetector == 0 || fSubDetector == 1) { AliDebug(AliQAv1::GetQADebugLevel(),"AliITSQADM:: SPD InitSDigits\n"); @@ -238,7 +238,7 @@ void AliITSQADataMakerSim::InitSDigits() //____________________________________________________________________________ void AliITSQADataMakerSim::MakeSDigits() { - // Fill QA for recpoints + // Fill QA for sdigits if(fSubDetector == 0 || fSubDetector == 1) fSPDDataMaker->MakeSDigits() ; @@ -268,8 +268,8 @@ void AliITSQADataMakerSim::MakeSDigits(TTree * sdigits) //____________________________________________________________________________ void AliITSQADataMakerSim::InitHits() { - fHitsQAList[AliRecoParam::AConvert(fEventSpecie)]->SetUniqueID(50); // Initialization for hits + fHitsQAList[AliRecoParam::AConvert(fEventSpecie)]->SetUniqueID(50); if(fSubDetector == 0 || fSubDetector == 1) { AliDebug(AliQAv1::GetQADebugLevel(),"AliITSQADM:: SPD InitHits\n"); fSPDDataMaker->InitHits(); @@ -320,6 +320,8 @@ void AliITSQADataMakerSim::MakeHits(TTree * hits) //_________________________________________________________________ Int_t AliITSQADataMakerSim::GetDetTaskOffset(Int_t subdet,AliQAv1::TASKINDEX_t task) { + + //return the offset for each subdetector switch(subdet) { @@ -348,6 +350,7 @@ Int_t AliITSQADataMakerSim::GetDetTaskOffset(Int_t subdet,AliQAv1::TASKINDEX_t t //_________________________________________________________________ Int_t AliITSQADataMakerSim::GetDetTaskHisto(Int_t subdet,AliQAv1::TASKINDEX_t task) { + //return of the number of histograms for each task and for each sub detector switch(subdet) { diff --git a/ITS/AliITSQADataMakerSim.h b/ITS/AliITSQADataMakerSim.h index 7a0dc9840de..cb837cf61e2 100644 --- a/ITS/AliITSQADataMakerSim.h +++ b/ITS/AliITSQADataMakerSim.h @@ -22,9 +22,9 @@ class AliRawReader; class AliITSQADataMakerSim: public AliQADataMakerSim { -friend class AliITSQASPDDataMakerSim; -friend class AliITSQASDDDataMakerSim; -friend class AliITSQASSDDataMakerSim; +friend class AliITSQASPDDataMakerSim; //friend class +friend class AliITSQASDDDataMakerSim; //friend class +friend class AliITSQASSDDataMakerSim; //friend class public: AliITSQADataMakerSim(Short_t subDet = 0); // subDet = 0 (ALL), 1 (SPD), 2 (SDD), 3 (SSD) @@ -42,7 +42,7 @@ public: virtual void MakeSDigits(TTree * sdigits); virtual void MakeHits(TTree * hits); virtual ~AliITSQADataMakerSim(); // dtor - Short_t GetSubDet(){return fSubDetector;}; + Short_t GetSubDet() const {return fSubDetector;}; Int_t GetDetTaskOffset(Int_t subdet,AliQAv1::TASKINDEX_t task); virtual Int_t GetEventSpecie() const { return AliRecoParam::AConvert(fEventSpecie); } Int_t GetDetTaskHisto(Int_t subdet,AliQAv1::TASKINDEX_t task); diff --git a/ITS/AliITSQASDDChecker.h b/ITS/AliITSQASDDChecker.h index 66b91a7e296..39dc2b8c028 100644 --- a/ITS/AliITSQASDDChecker.h +++ b/ITS/AliITSQASDDChecker.h @@ -14,7 +14,7 @@ // #include "AliQAv1.h" -#include "TPad.h" +//#include "TPad.h" // --- ROOT system --- class TFile; class TH2F; -- 2.43.0