From 74e11085b641c62ba17e2238e1f875b63b952452 Mon Sep 17 00:00:00 2001 From: morsch Date: Mon, 2 Jan 2012 14:21:09 +0000 Subject: [PATCH] Coding rule violations corrected. --- STEER/AOD/AliAODHandler.cxx | 2 +- STEER/AOD/AliAODJetEventBackground.h | 4 ++-- STEER/AOD/AliAODZDC.cxx | 13 ++++++------- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/STEER/AOD/AliAODHandler.cxx b/STEER/AOD/AliAODHandler.cxx index 04c17d32176..1b519dc5a2c 100644 --- a/STEER/AOD/AliAODHandler.cxx +++ b/STEER/AOD/AliAODHandler.cxx @@ -125,8 +125,8 @@ AliAODHandler::~AliAODHandler() // is already handled in TerminateIO fFileA->Close(); delete fFileA; - fTreeA = 0; } + delete fTreeA; delete fExtensions; delete fFilters; diff --git a/STEER/AOD/AliAODJetEventBackground.h b/STEER/AOD/AliAODJetEventBackground.h index eeb4c48a288..7247fb20cba 100644 --- a/STEER/AOD/AliAODJetEventBackground.h +++ b/STEER/AOD/AliAODJetEventBackground.h @@ -58,8 +58,8 @@ class AliAODJetEventBackground : public TNamed { static TString fgkStdBranchName; // Standard branch name Double32_t fBackground[kMaxBackground]; // Background from different schemes, normalized to area - Double32_t fSigma[kMaxBackground]; - Double32_t fMeanArea[kMaxBackground]; + Double32_t fSigma[kMaxBackground]; // Sigma + Double32_t fMeanArea[kMaxBackground]; // Mean area ClassDef(AliAODJetEventBackground,3); }; diff --git a/STEER/AOD/AliAODZDC.cxx b/STEER/AOD/AliAODZDC.cxx index 5338548d5ad..670e5d4cfd4 100644 --- a/STEER/AOD/AliAODZDC.cxx +++ b/STEER/AOD/AliAODZDC.cxx @@ -41,14 +41,12 @@ AliAODZDC::AliAODZDC() : fZDCTDCSum(0), fZDCTDCDifference(0) { +// Default constructor for(Int_t i=0; i<5; i++){ fZNCTowerEnergy[i] = fZNATowerEnergy[i] = 0.; fZPCTowerEnergy[i] = fZPATowerEnergy[i] = 0.; fZNCTowerEnergyLR[i] = fZNATowerEnergyLR[i] = 0.; } - //for(Int_t i=0; i<2; i++){ - // fZNACentrCoord[i] = fZNCCentrCoord[i] = 0.; - //} } //__________________________________________________________________________ @@ -69,6 +67,7 @@ AliAODZDC::AliAODZDC(const AliAODZDC &zdcAOD) : fZDCTDCSum(zdcAOD.fZDCTDCSum), fZDCTDCDifference(zdcAOD.fZDCTDCDifference) { +// Constructor for(Int_t i=0; i<5; i++){ fZNCTowerEnergy[i] = zdcAOD.fZNCTowerEnergy[i]; fZNATowerEnergy[i] = zdcAOD.fZNATowerEnergy[i]; @@ -77,10 +76,6 @@ AliAODZDC::AliAODZDC(const AliAODZDC &zdcAOD) : fZNCTowerEnergyLR[i] = zdcAOD.fZNCTowerEnergyLR[i]; fZNATowerEnergyLR[i] = zdcAOD.fZNATowerEnergyLR[i]; } - //for(Int_t i=0; i<2; i++){ - // fZNACentrCoord[i] = zdcAOD.fZNACentrCoord[i]; - // fZNCCentrCoord[i] = zdcAOD.fZNCCentrCoord[i]; - //} } //__________________________________________________________________________ @@ -126,6 +121,7 @@ AliAODZDC& AliAODZDC::operator=(const AliAODZDC& zdcAOD) //______________________________________________________________________________ Double_t AliAODZDC::GetZNCEnergy() const { +// Return ZNC energy if (fZNCEnergy < 0.) { fZNCEnergy = 0.; for(Int_t i=0; i<5; i++) fZNCEnergy += fZNCTowerEnergy[i]; @@ -136,6 +132,7 @@ Double_t AliAODZDC::GetZNCEnergy() const //______________________________________________________________________________ Double_t AliAODZDC::GetZNAEnergy() const { +// Return ZNA Energy if (fZNAEnergy < 0.) { fZNAEnergy = 0.; for(Int_t i=0; i<5; i++) fZNAEnergy += fZNATowerEnergy[i]; @@ -146,6 +143,7 @@ Double_t AliAODZDC::GetZNAEnergy() const //______________________________________________________________________________ Double_t AliAODZDC::GetZPCEnergy() const { +// Return ZPC Energy if (fZPCEnergy < 0.) { fZPCEnergy = 0.; for(Int_t i=0; i<5; i++) fZPCEnergy += fZPCTowerEnergy[i]; @@ -156,6 +154,7 @@ Double_t AliAODZDC::GetZPCEnergy() const //______________________________________________________________________________ Double_t AliAODZDC::GetZPAEnergy() const { +// Return ZPA Energy if (fZPAEnergy < 0.) { fZPAEnergy = 0.; for(Int_t i=0; i<5; i++) fZPAEnergy += fZPATowerEnergy[i]; -- 2.43.0