Coding rule violations corrected

diff --git a/STEER/AliAODHandler.cxx b/STEER/AliAODHandler.cxx
index e2f26a4324d599c67fc91c8d2388e2bd8b738269..639f0fb5c7cadeb612991e21b4b4563b0e6216b3 100644 (file)
--- a/STEER/AliAODHandler.cxx
+++ b/STEER/AliAODHandler.cxx
@@ -31,6 +31,7 @@
 #include "AliLog.h"
 #include "AliAODHandler.h"
 #include "AliAODEvent.h"
+#include "AliAODExtension.h"
 #include "AliAODTracklets.h"
 #include "AliStack.h"
 #include "AliAODMCParticle.h"

diff --git a/STEER/AliAODHandler.h b/STEER/AliAODHandler.h
index e8416fbced62c89d244177b01741bb1ca04a75af..007b521b1b50aab04817d43711285143bbb0bc09 100644 (file)
--- a/STEER/AliAODHandler.h
+++ b/STEER/AliAODHandler.h
@@ -18,9 +18,9 @@ class TTree;
 class TObjArray;
 class AliMCEventHandler;
 class AliAODMCHeader;
-#include "AliAODExtension.h" // should be a forward declaration : class AliAODExtension;
 class AliGenEventHeader;
 class TMap;
+class AliAODExtension;
 class AliAnalysisFilter;
 
 class AliAODHandler : public AliVEventHandler {

diff --git a/STEER/AliAODJetEventBackground.cxx b/STEER/AliAODJetEventBackground.cxx
index 8b4cb66f245187b3f10e436ff296afbb0463ea7b..be3a7631aa675dd6965ef0530e1e1eb1dfffbf4a 100644 (file)
--- a/STEER/AliAODJetEventBackground.cxx
+++ b/STEER/AliAODJetEventBackground.cxx
@@ -33,6 +33,7 @@ TString AliAODJetEventBackground::fgkStdBranchName("jeteventbackground");
 AliAODJetEventBackground::AliAODJetEventBackground() :
     TNamed()
 {
+    // Constructor
   for(int i = 0;i < kMaxBackground;++i){
     fBackground[i] = 0;
     fSigma[i] = 0;

diff --git a/STEER/AliCentrality.cxx b/STEER/AliCentrality.cxx
index eea60c5e2015839088738454495484ee44dab03c..41e805164bc07b5d02822fee5b7e63e18bae3829 100644 (file)
--- a/STEER/AliCentrality.cxx
+++ b/STEER/AliCentrality.cxx
@@ -79,13 +79,14 @@ AliCentrality::~AliCentrality()
   /// destructor
 }
 
-Int_t AliCentrality::GetQuality()
+Int_t AliCentrality::GetQuality() const
 {
   return fQuality;
 }
 
-Float_t AliCentrality::GetCentralityPercentile(const char *x)
+Float_t AliCentrality::GetCentralityPercentile(const char *x) const
 {
+// Return the centrality percentile
   if (fQuality == 0) {
     TString method = x;
     if(method.CompareTo("V0M")==0)      return fCentralityV0M;
@@ -103,8 +104,9 @@ Float_t AliCentrality::GetCentralityPercentile(const char *x)
   }
 }
 
-Int_t AliCentrality::GetCentralityClass10(const char *x)
+Int_t AliCentrality::GetCentralityClass10(const char *x) const
 {
+// Return the centrality class
   if (fQuality == 0) {
     TString method = x;
     if(method.CompareTo("V0M")==0)      return (Int_t) (fCentralityV0M / 10.0);
@@ -122,8 +124,9 @@ Int_t AliCentrality::GetCentralityClass10(const char *x)
   }
 }
 
-Int_t AliCentrality::GetCentralityClass5(const char *x)
+Int_t AliCentrality::GetCentralityClass5(const char *x) const
 {
+// Return the centrality class
   if (fQuality == 0) {
     TString method = x;
     if(method.CompareTo("V0M")==0)      return (Int_t) (fCentralityV0M / 5.0);
@@ -142,8 +145,9 @@ Int_t AliCentrality::GetCentralityClass5(const char *x)
 }
 
 
-Bool_t AliCentrality::IsEventInCentralityClass(Float_t a, Float_t b, const char *x)
+Bool_t AliCentrality::IsEventInCentralityClass(Float_t a, Float_t b, const char *x) const
 {
+// True if event is inside a given class
   if (fQuality == 0) {
     TString method = x;
     if ((method.CompareTo("V0M")==0) && (fCentralityV0M >=a && fCentralityV0M < b)) return kTRUE;
@@ -161,8 +165,9 @@ Bool_t AliCentrality::IsEventInCentralityClass(Float_t a, Float_t b, const char
   }
 }
 
-Float_t AliCentrality::GetCentralityPercentileUnchecked(const char *x)
+Float_t AliCentrality::GetCentralityPercentileUnchecked(const char *x) const
 {
+// Return the centrality percentile
   TString method = x;
   if(method.CompareTo("V0M")==0)      return fCentralityV0M;
   if(method.CompareTo("FMD")==0)      return fCentralityFMD;
@@ -176,8 +181,9 @@ Float_t AliCentrality::GetCentralityPercentileUnchecked(const char *x)
   return -1;
 }
 
-Int_t AliCentrality::GetCentralityClass10Unchecked(const char *x)
+Int_t AliCentrality::GetCentralityClass10Unchecked(const char *x) const
 {
+// Return the centrality class
   TString method = x;
   if(method.CompareTo("V0M")==0)      return (Int_t) (fCentralityV0M / 10.0);
   if(method.CompareTo("FMD")==0)      return (Int_t) (fCentralityFMD / 10.0);
@@ -191,8 +197,9 @@ Int_t AliCentrality::GetCentralityClass10Unchecked(const char *x)
   return -1;
 }
 
-Int_t AliCentrality::GetCentralityClass5Unchecked(const char *x)
+Int_t AliCentrality::GetCentralityClass5Unchecked(const char *x) const
 {
+// Return the centrality class
   TString method = x;
   if(method.CompareTo("V0M")==0)      return (Int_t) (fCentralityV0M / 5.0);
   if(method.CompareTo("FMD")==0)      return (Int_t) (fCentralityFMD / 5.0);
@@ -206,8 +213,9 @@ Int_t AliCentrality::GetCentralityClass5Unchecked(const char *x)
   return -1;
 } 
 
-Bool_t AliCentrality::IsEventInCentralityClassUnchecked(Float_t a, Float_t b, const char *x)
+Bool_t AliCentrality::IsEventInCentralityClassUnchecked(Float_t a, Float_t b, const char *x) const
 {
+// True if event inside given centrality class
   TString method = x;
   if ((method.CompareTo("V0M")==0) && (fCentralityV0M >=a && fCentralityV0M < b)) return kTRUE;
   if ((method.CompareTo("FMD")==0) && (fCentralityFMD >=a && fCentralityFMD < b)) return kTRUE;

diff --git a/STEER/AliCentrality.h b/STEER/AliCentrality.h
index fd48a5ffada2198c3f1a9998f4c7c5ea3882c9da..218368cb2458e8da75f36dbac55bd53b33c6ef89 100644 (file)
--- a/STEER/AliCentrality.h
+++ b/STEER/AliCentrality.h
@@ -34,17 +34,17 @@ class AliCentrality : public TNamed
   void SetCentralityZEMvsZDC(Float_t cent) {fCentralityZEMvsZDC = cent;}
 
   /// get centrality result
-  Float_t GetCentralityPercentile(const char *method);
-  Int_t   GetCentralityClass10(const char *method);
-  Int_t   GetCentralityClass5(const char *method);
-  Bool_t  IsEventInCentralityClass(Float_t a, Float_t b, const char *method);
+  Float_t GetCentralityPercentile(const char *method) const;
+  Int_t   GetCentralityClass10(const char *method) const;
+  Int_t   GetCentralityClass5(const char *method) const;
+  Bool_t  IsEventInCentralityClass(Float_t a, Float_t b, const char *method) const;
 
-  Float_t GetCentralityPercentileUnchecked(const char *method);
-  Int_t   GetCentralityClass10Unchecked(const char *method);
-  Int_t   GetCentralityClass5Unchecked(const char *method);
-  Bool_t  IsEventInCentralityClassUnchecked(Float_t a, Float_t b, const char *method);
+  Float_t GetCentralityPercentileUnchecked(const char *method) const;
+  Int_t   GetCentralityClass10Unchecked(const char *method) const;
+  Int_t   GetCentralityClass5Unchecked(const char *method) const;
+  Bool_t  IsEventInCentralityClassUnchecked(Float_t a, Float_t b, const char *method) const;
 
-  Int_t GetQuality();
+  Int_t GetQuality() const;
 
  private:
   Int_t   fQuality; // Quality of centrality determination

diff --git a/STEER/AliMCEventHandler.cxx b/STEER/AliMCEventHandler.cxx
index 8c2a21b55b43cba2e267457a34b7bd231ae5506b..866b5c6750dc0ca06cbd08899fd53ec3bace754f 100644 (file)
--- a/STEER/AliMCEventHandler.cxx
+++ b/STEER/AliMCEventHandler.cxx
@@ -267,6 +267,7 @@ Bool_t AliMCEventHandler::OpenFile(Int_t i)
 
 Bool_t AliMCEventHandler::BeginEvent(Long64_t entry)
 { 
+    // Begin event
     fParticleSelected.Delete();
     fLabelMap.Delete();
     // Read the next event

diff --git a/STEER/AliMCEventHandler.h b/STEER/AliMCEventHandler.h
index 3dce300a90150e7e99406e7301a4ef8dfe1bfe65..0b6a10cd25c88b94d46ad4cec18cecbe5ba28444 100644 (file)
--- a/STEER/AliMCEventHandler.h
+++ b/STEER/AliMCEventHandler.h
@@ -69,7 +69,7 @@ public:
     virtual TTree*      GetTree() const {return fTreeE;}
     Int_t       GetParticleAndTR(Int_t i, TParticle*& particle, TClonesArray*& trefs);
     void        DrawCheck(Int_t i, Int_t search=0);
-    Bool_t      InitOk() {return fInitOk;}
+    Bool_t      InitOk() const {return fInitOk;}
     // Label manipulation
     void   SelectParticle(Int_t i);
     Bool_t IsParticleSelected(Int_t i);

diff --git a/STEER/AliMixedEvent.cxx b/STEER/AliMixedEvent.cxx
index aec05f6f7ec4b2a8406f15cb2718a3c97b4556e4..1ab0ecd843bd6471580f36e2186796805a6fd854 100644 (file)
--- a/STEER/AliMixedEvent.cxx
+++ b/STEER/AliMixedEvent.cxx
@@ -75,9 +75,11 @@ AliMixedEvent::AliMixedEvent(const AliMixedEvent& Evnt) :
 { } // Copy constructor
 
 AliMixedEvent& AliMixedEvent::operator=(const AliMixedEvent& vEvnt)
-{ if (this!=&vEvnt) { 
+{ 
+// Assignment operator
+    if (this!=&vEvnt) { 
     AliVEvent::operator=(vEvnt); 
-  }
+}
   
   return *this; 
 }
@@ -279,7 +281,7 @@ Int_t AliMixedEvent::EventIndexForEMCALCell(Int_t icell) const
   return  TMath::BinarySearch(fNEvents, fNEMCALCellsCumul, icell);
 }
 
-Bool_t AliMixedEvent::ComputeVtx(TObjArray *vertices, Double_t *pos,Double_t *sig,Int_t *nContributors){
+Bool_t AliMixedEvent::ComputeVtx(const TObjArray *vertices, Double_t *pos,Double_t *sig,Int_t *nContributors)  {
 //
 // Calculate the mean vertex psoitions from events in the buffer
  

diff --git a/STEER/AliMixedEvent.h b/STEER/AliMixedEvent.h
index d1a7bcc2c4325d1f0e6da82122ab08a05d15cd24..a138ca0a6502f1ee69c25d27cc9af73596fbd8e5 100644 (file)
--- a/STEER/AliMixedEvent.h
+++ b/STEER/AliMixedEvent.h
@@ -15,10 +15,10 @@
 //-------------------------------------------------------------------------
 
 #include "AliVEvent.h"
-#include "AliVVertex.h"
 #include <TList.h>
 #include <TObjArray.h>
 class AliCentrality;
+class AliVVertex;
 
 class AliMixedEvent : public AliVEvent {
 
@@ -112,7 +112,7 @@ public:
   virtual AliCentrality* GetCentrality() {return 0;}
   // Primary vertex
     virtual const AliVVertex   *GetPrimaryVertex() const {return fMeanVertex;}
-    virtual Bool_t ComputeVtx(TObjArray *vertices, Double_t *pos,Double_t *sig,Int_t *nContributors);
+    virtual Bool_t ComputeVtx(const TObjArray *vertices, Double_t *pos,Double_t *sig,Int_t *nContributors);
   // VZERO
   virtual AliVVZERO *GetVZEROData() const {return 0;}
 private: