From 537e541dd0aa4e751b5b0c529057c653ea34122c Mon Sep 17 00:00:00 2001 From: dsilverm Date: Sun, 10 Apr 2011 14:56:26 +0000 Subject: [PATCH] addressing some minor rulechecker coding violations --- PWG4/totEt/AliAnalysisEt.cxx | 2 +- PWG4/totEt/AliAnalysisEtCuts.cxx | 3 --- PWG4/totEt/AliAnalysisEtCuts.h | 8 ++++---- PWG4/totEt/AliAnalysisEtMonteCarlo.cxx | 2 +- PWG4/totEt/AliAnalysisEtSelectionContainer.h | 4 ++-- PWG4/totEt/AliAnalysisTaskTotEt.h | 4 ++-- 6 files changed, 10 insertions(+), 13 deletions(-) diff --git a/PWG4/totEt/AliAnalysisEt.cxx b/PWG4/totEt/AliAnalysisEt.cxx index 03d283fd1bc..81a2500e2a8 100644 --- a/PWG4/totEt/AliAnalysisEt.cxx +++ b/PWG4/totEt/AliAnalysisEt.cxx @@ -570,7 +570,7 @@ void AliAnalysisEt::ResetEventValues() } Double_t AliAnalysisEt::CalculateTransverseEnergy(AliESDCaloCluster* cluster) -{ +{ // based on cluster energy and cluster pos Float_t pos[3]; cluster->GetPosition(pos); diff --git a/PWG4/totEt/AliAnalysisEtCuts.cxx b/PWG4/totEt/AliAnalysisEtCuts.cxx index 853b851188d..4ce2a719297 100644 --- a/PWG4/totEt/AliAnalysisEtCuts.cxx +++ b/PWG4/totEt/AliAnalysisEtCuts.cxx @@ -81,9 +81,6 @@ AliAnalysisEtCuts::AliAnalysisEtCuts() : ,fHistNbinsParticlePt(200) ,fHistMinParticlePt(0) ,fHistMaxParticlePt(20) - - ,fDetectorPhos(-1) - ,fDetectorEmcal(1) { // ctor } diff --git a/PWG4/totEt/AliAnalysisEtCuts.h b/PWG4/totEt/AliAnalysisEtCuts.h index 32efac82ffe..bb00ebf605b 100644 --- a/PWG4/totEt/AliAnalysisEtCuts.h +++ b/PWG4/totEt/AliAnalysisEtCuts.h @@ -83,8 +83,8 @@ class AliAnalysisEtCuts : public TNamed Double_t GetHistMinParticlePt() const { return fHistMinParticlePt; } Double_t GetHistMaxParticlePt() const { return fHistMaxParticlePt; } - Short_t GetDetectorPhos() const { return fDetectorPhos; } - Short_t GetDetectorEmcal() const { return fDetectorEmcal; } + Short_t GetDetectorPhos() const { return fgkDetectorPhos; } + Short_t GetDetectorEmcal() const { return fgkDetectorEmcal; } // Setters // Common @@ -226,8 +226,8 @@ class AliAnalysisEtCuts : public TNamed Double_t fHistMaxParticlePt; // maximum value in particle Pt histograms // Detector definition - const Short_t fDetectorPhos; // PHOS - const Short_t fDetectorEmcal; // PHOS + static const Short_t fgkDetectorPhos = -1; // PHOS + static const Short_t fgkDetectorEmcal = 1; // EMCAL private: //Declare private to avoid compilation warning diff --git a/PWG4/totEt/AliAnalysisEtMonteCarlo.cxx b/PWG4/totEt/AliAnalysisEtMonteCarlo.cxx index 1fb6865a822..7e4d0b90ce6 100644 --- a/PWG4/totEt/AliAnalysisEtMonteCarlo.cxx +++ b/PWG4/totEt/AliAnalysisEtMonteCarlo.cxx @@ -1370,7 +1370,7 @@ bool AliAnalysisEtMonteCarlo::TrackHitsCalorimeter(TParticle* part, Double_t mag } void AliAnalysisEtMonteCarlo::FillHistograms() -{ +{ // let base class fill its histograms, and us fill the local ones AliAnalysisEt::FillHistograms(); //std::cout << fEtNonRemovedPiPlus << " " << fCentClass << std::endl; diff --git a/PWG4/totEt/AliAnalysisEtSelectionContainer.h b/PWG4/totEt/AliAnalysisEtSelectionContainer.h index cb7e3ec104b..086889faf48 100644 --- a/PWG4/totEt/AliAnalysisEtSelectionContainer.h +++ b/PWG4/totEt/AliAnalysisEtSelectionContainer.h @@ -29,10 +29,10 @@ public: virtual ~AliAnalysisEtSelectionContainer(); /** Return the physics selection for the current run */ - AliPhysicsSelection* GetPhysicsSelection(Int_t runNumber){ return fPhysicsSelectionMap[runNumber]; } + AliPhysicsSelection* GetPhysicsSelection(Int_t runNumber) { return fPhysicsSelectionMap[runNumber]; } /** Return the physics selection for the current run */ - AliPhysicsSelection* GetDefaultPhysicsSelection(){ return fPhysicsSelectionMap[0]; } + AliPhysicsSelection* GetDefaultPhysicsSelection() { return fPhysicsSelectionMap[0]; } /** Get the map */ std::map GetPhysicsSelectionMap() const { return fPhysicsSelectionMap; } diff --git a/PWG4/totEt/AliAnalysisTaskTotEt.h b/PWG4/totEt/AliAnalysisTaskTotEt.h index 2e8c4e7fde4..456c0d436d1 100644 --- a/PWG4/totEt/AliAnalysisTaskTotEt.h +++ b/PWG4/totEt/AliAnalysisTaskTotEt.h @@ -36,8 +36,8 @@ private: AliAnalysisEtReconstructed *fRecAnalysis; // Rec AliAnalysisEtMonteCarlo *fMCAnalysis; // MC - THnSparseD *fSparseHistRecVsMc; - Double_t *fSparseRecVsMc; + THnSparseD *fSparseHistRecVsMc; // Hist Rec vs Mc + Double_t *fSparseRecVsMc; // Rec vs Mc ClassDef(AliAnalysisTaskTotEt, 2) }; -- 2.39.3