Coding rule violations corrected

diff --git a/STEER/AliAODCentrality.h b/STEER/AliAODCentrality.h
index 8e276c8a3cf58241604187eb18f5e678e62bdf41..d0b540bf02a07c17649d74bd53efd601ee4d16d7 100644 (file)
--- a/STEER/AliAODCentrality.h
+++ b/STEER/AliAODCentrality.h
@@ -59,40 +59,22 @@ class AliAODCentrality : public TNamed {
   void SetZEM1Energy     (Float_t  x) {fZEM1Energy = x; }
   void SetZEM2Energy     (Float_t  x) {fZEM2Energy = x; }
   void SetZNCtower          (Float_t x0, Float_t x1, Float_t x2, Float_t x3, Float_t x4) {
-    fZNCtower[0] = x0; 
-    fZNCtower[1] = x1; 
-    fZNCtower[2] = x2; 
-    fZNCtower[3] = x3; 
-    fZNCtower[4] = x4; 
+    fZNCtower[0] = x0; fZNCtower[1] = x1; fZNCtower[2] = x2; fZNCtower[3] = x3; fZNCtower[4] = x4; 
   }   
   void SetZPCtower          (Float_t x0, Float_t x1, Float_t x2, Float_t x3, Float_t x4) {
-    fZPCtower[0] = x0; 
-    fZPCtower[1] = x1; 
-    fZPCtower[2] = x2; 
-    fZPCtower[3] = x3; 
-    fZPCtower[4] = x4; 
+    fZPCtower[0] = x0; fZPCtower[1] = x1; fZPCtower[2] = x2; fZPCtower[3] = x3; fZPCtower[4] = x4; 
   }   
   void SetZNAtower          (Float_t x0, Float_t x1, Float_t x2, Float_t x3, Float_t x4) {
-    fZNAtower[0] = x0; 
-    fZNAtower[1] = x1; 
-    fZNAtower[2] = x2; 
-    fZNAtower[3] = x3; 
-    fZNAtower[4] = x4; 
+    fZNAtower[0] = x0; fZNAtower[1] = x1; fZNAtower[2] = x2; fZNAtower[3] = x3; fZNAtower[4] = x4; 
   }   
   void SetZPAtower          (Float_t x0, Float_t x1, Float_t x2, Float_t x3, Float_t x4) {
-    fZPAtower[0] = x0; 
-    fZPAtower[1] = x1; 
-    fZPAtower[2] = x2; 
-    fZPAtower[3] = x3; 
-    fZPAtower[4] = x4; 
+    fZPAtower[0] = x0; fZPAtower[1] = x1; fZPAtower[2] = x2; fZPAtower[3] = x3; fZPAtower[4] = x4; 
   }   
   void SetCentrZNC          (Float_t x0, Float_t x1) {
-    fCentrZNC[0] = x0; 
-    fCentrZNC[1] = x1; 
+    fCentrZNC[0] = x0; fCentrZNC[1] = x1; 
   }   
   void SetCentrZNA          (Float_t x0, Float_t x1) {
-    fCentrZNA[0] = x0; 
-    fCentrZNA[1] = x1; 
+    fCentrZNA[0] = x0; fCentrZNA[1] = x1; 
   }   
   void SetNTracks           (Int_t    x) {fNTracks = x; }    
   void SetNPmdTracks        (Int_t    x) {fNPmdTracks = x; } 

diff --git a/STEER/AliAODDiJet.h b/STEER/AliAODDiJet.h
index 8bf257625d70043a6cd9354d2ece5c01acfbda79..431a65bc767343f1c12832ce09eab5e0b1469474 100644 (file)
--- a/STEER/AliAODDiJet.h
+++ b/STEER/AliAODDiJet.h
@@ -35,9 +35,9 @@ class AliAODDiJet : public AliAODJet {
     AliAODDiJet& operator=(const AliAODDiJet& jet);
 
  private:
-    TRefArray*  fJetR;
-    TRef        fJet1;
-    TRef        fJet2;
+    TRefArray*  fJetR;  // References to jets
+    TRef        fJet1;  // Reference to Jet 1
+    TRef        fJet2;  // Reference to Jet 2
     ClassDef(AliAODDiJet, 1);
 };
 #endif

diff --git a/STEER/AliAODEvent.cxx b/STEER/AliAODEvent.cxx
index 94208a169f43892686c3e1723fc06930324f1b65..b6dde64f2969640e083854ed7fb6ea6bbf0c0cec 100644 (file)
--- a/STEER/AliAODEvent.cxx
+++ b/STEER/AliAODEvent.cxx
@@ -673,7 +673,7 @@ Int_t  AliAODEvent::GetNumberOfPileupVerticesTracks() const{
 }
 //______________________________________________________________________________
 AliAODVertex* AliAODEvent::GetPrimaryVertexSPD() const{
-  //
+  // Get SPD primary vertex
   Int_t nVertices=GetNumberOfVertices();
   for(Int_t iVert=0; iVert<nVertices; iVert++){
     AliAODVertex *v=GetVertex(iVert);
@@ -683,7 +683,7 @@ AliAODVertex* AliAODEvent::GetPrimaryVertexSPD() const{
 }
 //______________________________________________________________________________
 AliAODVertex* AliAODEvent::GetPileupVertexSPD(Int_t iV) const{
-  //
+  // Get pile-up vertex iV
   Int_t nVertices=GetNumberOfVertices();
   Int_t counter=0;
   for(Int_t iVert=0; iVert<nVertices; iVert++){
@@ -697,7 +697,7 @@ AliAODVertex* AliAODEvent::GetPileupVertexSPD(Int_t iV) const{
 }
 //______________________________________________________________________________
 AliAODVertex* AliAODEvent::GetPileupVertexTracks(Int_t iV) const{
-  //
+  // Get pile-up vertex iV
   Int_t nVertices=GetNumberOfVertices();
   Int_t counter=0;
   for(Int_t iVert=0; iVert<nVertices; iVert++){
@@ -777,7 +777,7 @@ void AliAODEvent::Print(Option_t *) const
   return;
 }
 
-void AliAODEvent::AssignIDtoCollection(TCollection* col)
+void AliAODEvent::AssignIDtoCollection(const TCollection* col)
 {
     // Static method which assigns a ID to each object in a collection
     // In this way the objects are marked as referenced and written with 

diff --git a/STEER/AliAODEvent.h b/STEER/AliAODEvent.h
index 565c9ce81b8a027634f10ae93cbda2ca82a9fcc0..c88e8caa811315d0a25c37b7942f2000327d6eb8 100644 (file)
--- a/STEER/AliAODEvent.h
+++ b/STEER/AliAODEvent.h
@@ -228,7 +228,7 @@ class AliAODEvent : public AliVEvent {
 
   void  Print(Option_t *option="") const;
   void  MakeEntriesReferencable();
-  static void AssignIDtoCollection(TCollection* col);
+  static void AssignIDtoCollection(const TCollection* col);
   
     //Following needed only for mixed event
   virtual Int_t        EventIndex(Int_t)       const {return 0;}

diff --git a/STEER/AliAODHeader.cxx b/STEER/AliAODHeader.cxx
index bc4f2e82d6c40b270297a41d7336c0f09ceb500c..89e9571a2e24f0b254cb07d9623f5f563da91561 100644 (file)
--- a/STEER/AliAODHeader.cxx
+++ b/STEER/AliAODHeader.cxx
@@ -367,6 +367,7 @@ void AliAODHeader::RemoveQTheta()
 
 void AliAODHeader::Clear(Option_t* /*opt*/)
 {
+// Clear memory
   RemoveQTheta();
   if (fCentralityP){
     delete fCentralityP;

diff --git a/STEER/AliAODHeader.h b/STEER/AliAODHeader.h
index b9c877f7c6bef849797742b57bdf0fb5c0750ab9..d7e34dc28c2af72a68530b49d14018fe77895907 100644 (file)
--- a/STEER/AliAODHeader.h
+++ b/STEER/AliAODHeader.h
@@ -104,17 +104,7 @@ class AliAODHeader : public AliVHeader {
   void SetEventType(UInt_t evttype)            { fEventType = evttype; }
   void SetMagneticField(Double_t magFld)       { fMagneticField = magFld; }
   void SetMuonMagFieldScale(Double_t magFldScl){ fMuonMagFieldScale = magFldScl; }
-  
-  void SetCentrality(AliCentrality* cent)      { 
-    if(cent){
-      if(fCentralityP)*fCentralityP = *cent;
-      else fCentralityP = new AliCentrality(*cent);
-      fCentrality = cent->GetCentralityPercentile("V0M");
-    }
-    else{
-      fCentrality = -999;
-    }
-  }
+  void SetCentrality(AliCentrality* cent);
   void SetZDCN1Energy(Double_t n1Energy)       { fZDCN1Energy = n1Energy; }
   void SetZDCP1Energy(Double_t p1Energy)       { fZDCP1Energy = p1Energy; }
   void SetZDCN2Energy(Double_t n2Energy)       { fZDCN2Energy = n2Energy; }
@@ -159,7 +149,7 @@ class AliAODHeader : public AliVHeader {
   
   UInt_t GetOfflineTrigger() { return fOfflineTrigger; }
   void SetOfflineTrigger(UInt_t trigger) { fOfflineTrigger = trigger; }
-  TString GetESDFileName()   {return fESDFileName;}
+  TString GetESDFileName() const  {return fESDFileName;}
   void Clear(Option_t* = "");
   enum {kNPHOSMatrix = 5};
   enum {kNEMCALMatrix = 12};
@@ -204,5 +194,15 @@ class AliAODHeader : public AliVHeader {
   AliCentrality* fCentralityP;      // Pointer to full centrality information
   ClassDef(AliAODHeader, 14);
 };
-
+inline
+void AliAODHeader::SetCentrality(AliCentrality* cent)      { 
+    if(cent){
+       if(fCentralityP)*fCentralityP = *cent;
+       else fCentralityP = new AliCentrality(*cent);
+       fCentrality = cent->GetCentralityPercentile("V0M");
+    }
+    else{
+       fCentrality = -999;
+    }
+}
 #endif

diff --git a/STEER/AliAODInputHandler.cxx b/STEER/AliAODInputHandler.cxx
index ea5739aa6d696be902185121ae136c3f24d2149b..6f082f8a1c442dc827ba5d395d8c8c63788b7265 100644 (file)
--- a/STEER/AliAODInputHandler.cxx
+++ b/STEER/AliAODInputHandler.cxx
@@ -30,6 +30,7 @@
 #include "AliAODInputHandler.h"
 #include "AliAODEvent.h"
 #include "AliVCuts.h"
+#include "AliMCEvent.h"
 
 ClassImp(AliAODInputHandler)
 
@@ -109,7 +110,7 @@ Bool_t AliAODInputHandler::Init(TTree* tree, Option_t* opt)
 //______________________________________________________________________________
 Bool_t AliAODInputHandler::BeginEvent(Long64_t entry)
 {
-    //
+    // Begin event
     TClonesArray* mcParticles = (TClonesArray*) (fEvent->FindListObject("mcparticles"));
     if (mcParticles) fMCEvent->SetParticleArray(mcParticles);
     if (fTreeToMerge) fTreeToMerge->GetEntry(entry + fMergeOffset);

diff --git a/STEER/AliAODInputHandler.h b/STEER/AliAODInputHandler.h
index 7116c97b80674e7e9aa5f436f5857a255f5f70a9..373b747abd33d04c27ae7a9b23d97cc05772fc8d 100644 (file)
--- a/STEER/AliAODInputHandler.h
+++ b/STEER/AliAODInputHandler.h
@@ -12,11 +12,11 @@
 
 #include "AliInputEventHandler.h"
 #include "AliAODEvent.h"
-#include "AliMCEvent.h"
-
 class TList;
 class AliMCEvent;
 class TH2F;
+class AliMCEvent;
+
 
 class AliAODInputHandler : public AliInputEventHandler {
 

diff --git a/STEER/AliAODMCParticle.cxx b/STEER/AliAODMCParticle.cxx
index b9abf7cceed6a27fb4fe640e7eea8b3480ce6acb..dbdd480b590348df2fa00e0505e27062a15ad83b 100644 (file)
--- a/STEER/AliAODMCParticle.cxx
+++ b/STEER/AliAODMCParticle.cxx
@@ -54,7 +54,7 @@ AliVParticle(),
 }
 
     
-AliAODMCParticle::AliAODMCParticle(AliMCParticle* mcpart, Int_t label,Int_t flag):
+AliAODMCParticle::AliAODMCParticle(const AliMCParticle* mcpart, Int_t label,Int_t flag):
     AliVParticle(),
     fPdgCode(mcpart->Particle()->GetPdgCode()),
     fFlag(flag),
@@ -69,6 +69,7 @@ AliAODMCParticle::AliAODMCParticle(AliMCParticle* mcpart, Int_t label,Int_t flag
     fVz(mcpart->Particle()->Vz()),
     fVt(mcpart->Particle()->T())
 {
+    // Constructor
   fDaughter[0] =  mcpart->GetFirstDaughter(); 
   fDaughter[1] =  mcpart->GetLastDaughter();
 }
@@ -141,6 +142,7 @@ Short_t AliAODMCParticle::Charge()     const
 }
 
 void AliAODMCParticle::Print(const Option_t */*opt*/) const {
+// Print particle information
   if(TDatabasePDG::Instance()->GetParticle(fPdgCode)){
     Printf(">>> PDG (%d) : %s",fPdgCode,TDatabasePDG::Instance()->GetParticle(fPdgCode)->GetName());
   }

diff --git a/STEER/AliAODMCParticle.h b/STEER/AliAODMCParticle.h
index 2715db5c237f7f13b41cdb0e290c5c037a56cb56..3e75742fb4275a6b4a6146c8e2e56d4b6715d192 100644 (file)
--- a/STEER/AliAODMCParticle.h
+++ b/STEER/AliAODMCParticle.h
@@ -27,7 +27,7 @@ class TClonesArray;
 class AliAODMCParticle: public AliVParticle {
  public:
   AliAODMCParticle();
-  AliAODMCParticle(AliMCParticle* part, Int_t label=0,Int_t flag = 0);
+  AliAODMCParticle(const AliMCParticle* part, Int_t label=0,Int_t flag = 0);
   virtual ~AliAODMCParticle(){};
   AliAODMCParticle(const AliAODMCParticle& mcPart); 
   AliAODMCParticle& operator=(const AliAODMCParticle& mcPart);

diff --git a/STEER/AliAODPWG4ParticleCorrelation.cxx b/STEER/AliAODPWG4ParticleCorrelation.cxx
index 17df33742f48738927fa2fda113dc2d07cec6918..3133d9731803a2ded817c84b0cacbad9a32501c4 100755 (executable)
--- a/STEER/AliAODPWG4ParticleCorrelation.cxx
+++ b/STEER/AliAODPWG4ParticleCorrelation.cxx
@@ -25,6 +25,7 @@
 
 //-- Analysis system
 #include "AliAODPWG4ParticleCorrelation.h"
+#include "AliAODJet.h"
 
 ClassImp(AliAODPWG4ParticleCorrelation)
 

diff --git a/STEER/AliAODPWG4ParticleCorrelation.h b/STEER/AliAODPWG4ParticleCorrelation.h
index 10a6c4d7008a64a027c7d06ab7c57c273587ddfc..b4fa598dcd69c08c1bab920459ecc6dc76a4399f 100755 (executable)
--- a/STEER/AliAODPWG4ParticleCorrelation.h
+++ b/STEER/AliAODPWG4ParticleCorrelation.h
@@ -13,9 +13,11 @@
 
 //-- ROOT system --
 #include "TList.h"
+#include "AliAODJet.h"
 
 //-- Analysis system
-#include "AliAODJet.h"
+
+
 #include "AliAODPWG4Particle.h"
 
 class AliAODPWG4ParticleCorrelation : public AliAODPWG4Particle {

diff --git a/STEER/AliAODRecoDecay.cxx b/STEER/AliAODRecoDecay.cxx
index 4e20cf8cadc6fb9ac97005d2a229f0323928c12a..1a1f94ed48ecd45887d750d7e58ad114902a3e6e 100644 (file)
--- a/STEER/AliAODRecoDecay.cxx
+++ b/STEER/AliAODRecoDecay.cxx
@@ -531,8 +531,8 @@ Double_t AliAODRecoDecay::InvMass2Prongs(Int_t ip1,Int_t ip2,
   return mass;
 }
 //----------------------------------------------------------------------------
-Int_t AliAODRecoDecay::MatchToMC(Int_t pdgabs,TClonesArray *mcArray,
-                                Int_t ndgCk,Int_t *pdgDg) const
+Int_t AliAODRecoDecay::MatchToMC(Int_t pdgabs, TClonesArray *mcArray,
+                                Int_t ndgCk, const Int_t *pdgDg) const
 {
   //
   // Check if this candidate is matched to a MC signal
@@ -568,7 +568,7 @@ Int_t AliAODRecoDecay::MatchToMC(Int_t pdgabs,TClonesArray *mcArray,
 //----------------------------------------------------------------------------
 Int_t AliAODRecoDecay::MatchToMC(Int_t pdgabs,TClonesArray *mcArray,
                                 Int_t dgLabels[10],Int_t ndg,
-                                Int_t ndgCk,Int_t *pdgDg) const
+                                Int_t ndgCk, const Int_t *pdgDg) const
 {
   //
   // Check if this candidate is matched to a MC signal

diff --git a/STEER/AliAODRecoDecay.h b/STEER/AliAODRecoDecay.h
index 853efaa83a8b891d9480228fb2f5ffdd6c8028e3..8525e7ad35a151a81861fd364d5f719ed023a17e 100644 (file)
--- a/STEER/AliAODRecoDecay.h
+++ b/STEER/AliAODRecoDecay.h
@@ -54,7 +54,7 @@ class AliAODRecoDecay : public AliVTrack {
   // If no, return -1
   // If yes, return label (>=0) of the AliAODMCParticle
   // if ndgCk>0, checks also daughters PDGs
-  Int_t    MatchToMC(Int_t pdgabs,TClonesArray *mcArray,Int_t ndgCk=0,Int_t *pdgDg=0) const;
+  Int_t    MatchToMC(Int_t pdgabs,TClonesArray *mcArray,Int_t ndgCk=0, const Int_t *pdgDg=0) const;
 
   // PID
   void      SetPID(Int_t nprongs,Double_t *pid);
@@ -193,7 +193,7 @@ class AliAODRecoDecay : public AliVTrack {
   
  protected:
 
-  Int_t    MatchToMC(Int_t pdgabs,TClonesArray *mcArray,Int_t dgLabels[10],Int_t ndg,Int_t ndgCk=0,Int_t *pdgDg=0) const;
+  Int_t    MatchToMC(Int_t pdgabs,TClonesArray *mcArray,Int_t dgLabels[10],Int_t ndg,Int_t ndgCk=0,const Int_t *pdgDg=0) const;
   Int_t    MatchToMC(Int_t pdgabs,TClonesArray *mcArray,Int_t dgLabels[10]) const { return MatchToMC(pdgabs,mcArray,dgLabels,GetNDaughters()); }
 
   TRef     fSecondaryVtx;  // decay vertex

diff --git a/STEER/AliAODVertex.cxx b/STEER/AliAODVertex.cxx
index fedfa70dde7d9d0a11eee176cfe8285fc9affc0f..01c05088f0895ecec913ff250020224adc056b1f 100644 (file)
--- a/STEER/AliAODVertex.cxx
+++ b/STEER/AliAODVertex.cxx
@@ -484,7 +484,7 @@ Double_t AliAODVertex::RotatedCovMatrixZZ(Double_t phi, Double_t theta) const
 }
 
 //______________________________________________________________________________
-Double_t AliAODVertex::Distance2ToVertex(AliAODVertex *vtx) const
+Double_t AliAODVertex::Distance2ToVertex(const AliAODVertex *vtx) const
 {
   // distance in 3D to another AliAODVertex
 
@@ -496,7 +496,7 @@ Double_t AliAODVertex::Distance2ToVertex(AliAODVertex *vtx) const
 }
 
 //______________________________________________________________________________
-Double_t AliAODVertex::DistanceXY2ToVertex(AliAODVertex *vtx) const
+Double_t AliAODVertex::DistanceXY2ToVertex(const AliAODVertex *vtx) const
 {
   // distance in XY to another AliAODVertex
 

diff --git a/STEER/AliAODVertex.h b/STEER/AliAODVertex.h
index 061014681f754072ae6c6f7e826147531fcbd190..dc267d82b12533e38d3b557fca872e863214cb3b 100644 (file)
--- a/STEER/AliAODVertex.h
+++ b/STEER/AliAODVertex.h
@@ -119,10 +119,10 @@ class AliAODVertex : public AliVVertex {
   Double_t  RotatedCovMatrixZZ(Double_t phi = 0., Double_t theta = 0.) const;
 
   template <class T, class P> void     PhiAndThetaToVertex(AliAODVertex *vtx, P &phi, T &theta) const;
-  Double_t  Distance2ToVertex(AliAODVertex *vtx) const;
+  Double_t  Distance2ToVertex(const AliAODVertex *vtx) const;
   Double_t  DistanceToVertex(AliAODVertex *vtx) const 
      {return TMath::Sqrt(Distance2ToVertex(vtx));}
-  Double_t  DistanceXY2ToVertex(AliAODVertex *vtx) const;
+  Double_t  DistanceXY2ToVertex(const AliAODVertex *vtx) const;
   Double_t  DistanceXYToVertex(AliAODVertex *vtx) const 
      {return TMath::Sqrt(DistanceXY2ToVertex(vtx));}
   Double_t  Error2DistanceToVertex(AliAODVertex *vtx) const;

diff --git a/STEER/AliAODpidUtil.cxx b/STEER/AliAODpidUtil.cxx
index fe85dda89ad61bf04d2683f61c0a2aa0cc19fa87..56cade7b1a767b25486e9299e6a69197e00f061b 100644 (file)
--- a/STEER/AliAODpidUtil.cxx
+++ b/STEER/AliAODpidUtil.cxx
@@ -65,7 +65,7 @@ ClassImp(AliAODpidUtil)
   return 0;
 }
 //_________________________________________________________________________
-void AliAODpidUtil::MakeTPCPID(AliAODTrack *track,Double_t *p) const
+void AliAODpidUtil::MakeTPCPID(const AliAODTrack *track,Double_t *p) const
 {
   //
   //  TPC pid using bethe-bloch and gaussian response
@@ -105,7 +105,7 @@ void AliAODpidUtil::MakeTPCPID(AliAODTrack *track,Double_t *p) const
   return;
 }
 //_________________________________________________________________________
-void AliAODpidUtil::MakeITSPID(AliAODTrack *track,Double_t *p) const
+void AliAODpidUtil::MakeITSPID(const AliAODTrack *track,Double_t *p) const
 {
   //
   // ITS PID
@@ -161,7 +161,7 @@ void AliAODpidUtil::MakeITSPID(AliAODTrack *track,Double_t *p) const
 
 }
 //_________________________________________________________________________
-void AliAODpidUtil::MakeTOFPID(AliAODTrack *track, Double_t *p) const
+void AliAODpidUtil::MakeTOFPID(const AliAODTrack *track, Double_t *p) const
 {
   //
   //   TOF PID using gaussian response
@@ -221,7 +221,7 @@ void AliAODpidUtil::MakeTOFPID(AliAODTrack *track, Double_t *p) const
   return;
 }
 //_________________________________________________________________________
-void AliAODpidUtil::MakeTRDPID(AliAODTrack *track,Double_t *p) const
+void AliAODpidUtil::MakeTRDPID(const AliAODTrack *track,Double_t *p) const
 {
   
   // Method to recalculate the TRD PID probabilities

diff --git a/STEER/AliAODpidUtil.h b/STEER/AliAODpidUtil.h
index 8bee355e1fe90689f4c9dcad7b75b29e91c8bf0d..dc371ac927af8cd2d119f23420d916ce396b65bf 100644 (file)
--- a/STEER/AliAODpidUtil.h
+++ b/STEER/AliAODpidUtil.h
@@ -30,11 +30,11 @@ public:
 
 
   Int_t MakePID(AliAODTrack *track,Double_t *p) const;
-  void MakeTPCPID(AliAODTrack *track,Double_t *p) const;
-  void MakeITSPID(AliAODTrack *track,Double_t *p) const;
-  void MakeTOFPID(AliAODTrack *track,Double_t *p) const;
+  void MakeTPCPID(const AliAODTrack *track,Double_t *p) const;
+  void MakeITSPID(const AliAODTrack *track,Double_t *p) const;
+  void MakeTOFPID(const AliAODTrack *track,Double_t *p) const;
   //  void MakeHMPIDPID(AliESDtrack *track);
-  void MakeTRDPID(AliAODTrack *track,Double_t *p) const;
+  void MakeTRDPID(const AliAODTrack *track,Double_t *p) const;
 
   Float_t NumberOfSigmasTPC(const AliAODTrack *track, AliPID::EParticleType type) const;
   Float_t NumberOfSigmasTOF(const AliAODTrack *track, AliPID::EParticleType type) const;
@@ -46,10 +46,10 @@ public:
 
 private:
   Float_t           fRange;          // nSigma max in likelihood
-  AliTPCPIDResponse fTPCResponse;
-  AliITSPIDResponse fITSResponse;
-  AliTOFPIDResponse fTOFResponse;
-  AliTRDPIDResponse fTRDResponse;
+  AliTPCPIDResponse fTPCResponse;    // TPC Response
+  AliITSPIDResponse fITSResponse;    // ITS Response
+  AliTOFPIDResponse fTOFResponse;    // TOF Response
+  AliTRDPIDResponse fTRDResponse;    // TRD Response
   
   ClassDef(AliAODpidUtil,1)  // PID calculation class
 };

diff --git a/STEER/AliCheb3D.cxx b/STEER/AliCheb3D.cxx
index 9cafd0e541f2e09cbe5a28fc76223af3da8de559..63a9b913559a5610d34b638021f0a341c280c4ad 100644 (file)
--- a/STEER/AliCheb3D.cxx
+++ b/STEER/AliCheb3D.cxx
@@ -37,6 +37,7 @@ AliCheb3D::AliCheb3D() :
   fUsrFunName(""), 
   fUsrMacro(0) 
 {
+// Default constructor
   for (int i=3;i--;) {
     fBMin[i] = fBMax[i] = fBScale[i] = fBOffset[i] = fArgsTmp[i] = 0;
     fNPoints[i] = 0;
@@ -116,7 +117,7 @@ AliCheb3D::AliCheb3D(FILE* stream) :
 
 //__________________________________________________________________________________________
 #ifdef _INC_CREATION_ALICHEB3D_
-AliCheb3D::AliCheb3D(const char* funName, int DimOut, Float_t  *bmin,Float_t  *bmax, Int_t *npoints, Float_t prec) : 
+AliCheb3D::AliCheb3D(const char* funName, int DimOut, const Float_t  *bmin, const Float_t  *bmax, Int_t *npoints, Float_t prec) : 
   TNamed(funName,funName), 
   fDimOut(0), 
   fPrec(TMath::Max(1.E-12f,prec)), 

diff --git a/STEER/AliCheb3D.h b/STEER/AliCheb3D.h
index 02c6760dbd0ae0a8fce2567385bfe5e8ebff7f05..e4771b57140cace86e16cfcef5e496d1cfa71b52 100644 (file)
--- a/STEER/AliCheb3D.h
+++ b/STEER/AliCheb3D.h
@@ -88,7 +88,7 @@ class AliCheb3D: public TNamed
   AliCheb3D(FILE* stream);
   //
 #ifdef _INC_CREATION_ALICHEB3D_
-  AliCheb3D(const char* funName, Int_t DimOut, Float_t  *bmin,Float_t  *bmax, Int_t *npoints, Float_t  prec=1E-6);
+  AliCheb3D(const char* funName, Int_t DimOut, const Float_t  *bmin, const Float_t  *bmax, Int_t *npoints, Float_t  prec=1E-6);
   AliCheb3D(void (*ptr)(float*,float*), Int_t DimOut, Float_t  *bmin,Float_t  *bmax, Int_t *npoints, Float_t  prec=1E-6);
   AliCheb3D(void (*ptr)(float*,float*), int DimOut, Float_t  *bmin,Float_t  *bmax, Int_t *npX,Int_t *npY,Int_t *npZ, Float_t prec=1E-6);
   AliCheb3D(void (*ptr)(float*,float*), int DimOut, Float_t  *bmin,Float_t  *bmax, Float_t prec=1E-6, Bool_t run=kTRUE);

diff --git a/STEER/AliESDACORDE.cxx b/STEER/AliESDACORDE.cxx
index ecfe1176a9dc464ec892a0d370bddb3d9c4fe369..e46563965deb32294b32d0cc56b3857298995512 100644 (file)
--- a/STEER/AliESDACORDE.cxx
+++ b/STEER/AliESDACORDE.cxx
@@ -41,6 +41,7 @@ AliESDACORDE::AliESDACORDE(Bool_t* MACORDEBitPattern):TObject()
 \r
 AliESDACORDE& AliESDACORDE::operator=(const AliESDACORDE& o)\r
 {\r
+// Copy Constructor\r
        if(this==&o)return *this;\r
        TObject::operator=(o);\r
 \r
@@ -54,7 +55,7 @@ AliESDACORDE& AliESDACORDE::operator=(const AliESDACORDE& o)
 }\r
 \r
 \r
-Bool_t AliESDACORDE::GetHitChannel(Int_t i)\r
+Bool_t AliESDACORDE::GetHitChannel(Int_t i) const\r
 {\r
        return fACORDEBitPattern[i];\r
 }\r

diff --git a/STEER/AliESDACORDE.h b/STEER/AliESDACORDE.h
index fd8c5a8c2c98d25e18f1d275a1124268c933e174..d094c5ad04d366788c64d048e53646f878e89f54 100644 (file)
--- a/STEER/AliESDACORDE.h
+++ b/STEER/AliESDACORDE.h
@@ -24,7 +24,7 @@ class AliESDACORDE : public TObject
   \r
   \r
  // Getters    \r
-  Bool_t GetHitChannel(Int_t i);\r
+  Bool_t GetHitChannel(Int_t i) const;\r
   AliESDACORDE &operator=(const AliESDACORDE& source);\r
   \r
  protected:\r

diff --git a/STEER/AliESDInputHandler.cxx b/STEER/AliESDInputHandler.cxx
index fe36dc1c64b9926fb8f235a7ec8865c170588c60..60543daeaa05b0244c900efdee4012e6301df54b 100644 (file)
--- a/STEER/AliESDInputHandler.cxx
+++ b/STEER/AliESDInputHandler.cxx
@@ -379,7 +379,7 @@ Int_t AliESDInputHandler::GetNEventRejectedInFile()
 }
 
 //______________________________________________________________________________
-Bool_t AliESDInputHandler::GetCutSummaryForChain(Int_t *aTotal, Int_t *aAccepted, Int_t *aRejected)
+Bool_t AliESDInputHandler::GetCutSummaryForChain(Int_t *aTotal,  Int_t *aAccepted,  Int_t *aRejected)
 {
   // Get number of events in the full chain
   // Count accepted and rejected events

diff --git a/STEER/AliESDInputHandler.h b/STEER/AliESDInputHandler.h
index 70db8de6d09596617a5aa0dc1100b62b82ce925e..ae1d3931d6ead1ab006bcb671e2b1ad8e01a96ef 100644 (file)
--- a/STEER/AliESDInputHandler.h
+++ b/STEER/AliESDInputHandler.h
@@ -19,6 +19,7 @@ class AliEventTag;
 class TMap;
 class AliESDfriend;
 class AliESDpid;
+class AliESDEvent;
 
 
 class AliESDInputHandler : public AliInputEventHandler {

diff --git a/STEER/AliESDInputHandlerRP.h b/STEER/AliESDInputHandlerRP.h
index f143e7f77cdf454845114cf3309c9f111d005038..9bcc07c49997254daae93bba910dd6774cc2435c 100644 (file)
--- a/STEER/AliESDInputHandlerRP.h
+++ b/STEER/AliESDInputHandlerRP.h
@@ -12,7 +12,6 @@
 //-------------------------------------------------------------------------
 
 #include "AliESDInputHandler.h"
-#include "AliESDEvent.h"
 class TList;
 class TTree;
 class TDirectoryFile;

diff --git a/STEER/AliGenCocktailEventHeader.cxx b/STEER/AliGenCocktailEventHeader.cxx
index 3d35f4cf8bf6d2f9d089b75c0f714ff00d80cc56..bd0e3222e11941494f638c8adf13413b5e445b9a 100644 (file)
--- a/STEER/AliGenCocktailEventHeader.cxx
+++ b/STEER/AliGenCocktailEventHeader.cxx
@@ -51,7 +51,7 @@ AliGenCocktailEventHeader::~AliGenCocktailEventHeader()
     }
 }
 
-void AliGenCocktailEventHeader::AddHeader(AliGenEventHeader* header)
+void AliGenCocktailEventHeader::AddHeader(const AliGenEventHeader* header)
 {
 // Add a header to the list
     if (!fHeaders) fHeaders = new TList();

diff --git a/STEER/AliGenCocktailEventHeader.h b/STEER/AliGenCocktailEventHeader.h
index f98eaffd1f3cd5805ceb056d1f4f41f485c4b21b..54c56824fb9e3d1ea66f52b83ada3fd48b383fac 100644 (file)
--- a/STEER/AliGenCocktailEventHeader.h
+++ b/STEER/AliGenCocktailEventHeader.h
@@ -16,7 +16,7 @@ class AliGenCocktailEventHeader : public AliGenEventHeader
     AliGenCocktailEventHeader(const char* name);
     AliGenCocktailEventHeader(const AliGenCocktailEventHeader &header);
     virtual ~AliGenCocktailEventHeader();
-    virtual void AddHeader(AliGenEventHeader* header);
+    virtual void AddHeader(const AliGenEventHeader* header);
     virtual TList* GetHeaders() {return fHeaders;}
     virtual Int_t CalcNProduced();
     AliGenCocktailEventHeader & operator=(const AliGenCocktailEventHeader & rhs);

diff --git a/STEER/AliGenDPMjetEventHeader.h b/STEER/AliGenDPMjetEventHeader.h
index 0a859e59d9e108543fdaaf15fd0bbb904d0ecc6e..11443bbff0e0eab901bce6f3eb561aa14f9f352d 100644 (file)
--- a/STEER/AliGenDPMjetEventHeader.h
+++ b/STEER/AliGenDPMjetEventHeader.h
@@ -17,9 +17,9 @@ class AliGenDPMjetEventHeader : public AliGenEventHeader, public AliCollisionGeo
     virtual ~AliGenDPMjetEventHeader() {}
 
   // Getters
-  Float_t TotalEnergy()  {return fTotalEnergy;} 
-  Int_t   Trials()       {return fTrials;}
-  Int_t   ProcessType()  {return fProcessType;}
+  Float_t TotalEnergy()  const {return fTotalEnergy;} 
+  Int_t   Trials()       const {return fTrials;}
+  Int_t   ProcessType()  const {return fProcessType;}
   
          
   // Setters

diff --git a/STEER/AliGenHerwigEventHeader.h b/STEER/AliGenHerwigEventHeader.h
index ee1d28c2f0f9c308e8f8e1df984993412d5cd464..f77eba5ac2a03e48f322431a68b8f21766bfee72 100644 (file)
--- a/STEER/AliGenHerwigEventHeader.h
+++ b/STEER/AliGenHerwigEventHeader.h
@@ -15,11 +15,11 @@ class AliGenHerwigEventHeader : public AliGenEventHeader
     AliGenHerwigEventHeader();
     AliGenHerwigEventHeader(const char* name);
     virtual ~AliGenHerwigEventHeader() {}
-    Int_t    ProcessType()  {return fProcessType;}
+    Int_t    ProcessType() const  {return fProcessType;}
     void     SetProcessType(Int_t type)  {fProcessType = type;}
-    Int_t    Trials() {return fTrials;}
+    Int_t    Trials() const {return fTrials;}
     void     SetTrials(Int_t trials) {fTrials = trials;}
-    Float_t  Weight() {return fWeight;}
+    Float_t  Weight() const {return fWeight;}
     void     SetWeight(Float_t weight) {fWeight = weight;}
 protected:
     Int_t    fProcessType;               // HERWIG process id for this event 

diff --git a/STEER/AliGenHijingEventHeader.h b/STEER/AliGenHijingEventHeader.h
index 9db87db9bb276a33d63662a1db25378c871a3e25..f92ea571b47ada6adf3fc292ebf8b7e049e753d5 100644 (file)
--- a/STEER/AliGenHijingEventHeader.h
+++ b/STEER/AliGenHijingEventHeader.h
@@ -18,17 +18,17 @@ class AliGenHijingEventHeader : public AliGenEventHeader, public AliCollisionGeo
   AliGenHijingEventHeader();
   virtual ~AliGenHijingEventHeader() {}
   // Getters
-  Float_t TotalEnergy()  {return fTotalEnergy;} 
-  Int_t   Trials() {return fTrials;}
+  Float_t TotalEnergy() const {return fTotalEnergy;} 
+  Int_t   Trials() const {return fTrials;}
   
          
   // Setters
   void SetTotalEnergy(Float_t energy)  {fTotalEnergy=energy;}
-  void SetJets(TLorentzVector* jet1, TLorentzVector* jet2,
-              TLorentzVector* jet3, TLorentzVector* jet4)
+  void SetJets(const TLorentzVector* jet1, const TLorentzVector* jet2,
+              const TLorentzVector* jet3, const TLorentzVector* jet4)
       {fJet1 = *jet1; fJet2 = *jet2; fJetFsr1 = *jet3; fJetFsr2 = *jet4;}
   void GetJets(TLorentzVector& jet1, TLorentzVector& jet2,
-              TLorentzVector& jet3, TLorentzVector& jet4)  
+              TLorentzVector& jet3, TLorentzVector& jet4) const  
       {jet1 = fJet1; jet2 = fJet2; jet3 = fJetFsr1; jet4 = fJetFsr2;}
   void SetTrials(Int_t trials) {fTrials = trials;}
          

diff --git a/STEER/AliGenPythiaEventHeader.cxx b/STEER/AliGenPythiaEventHeader.cxx
index e5be04ab321fcb95bd4362a76ec7eabf2124c020..23aa076487b098af788e970c87697292e3455666 100644 (file)
--- a/STEER/AliGenPythiaEventHeader.cxx
+++ b/STEER/AliGenPythiaEventHeader.cxx
@@ -100,7 +100,7 @@ void AliGenPythiaEventHeader::SetZQuench(Double_t z[4])
     for (Int_t i = 0; i < 4; i++) fZquench[i] = z[i];
 }
 
-void AliGenPythiaEventHeader::GetZQuench(Double_t z[4])
+void AliGenPythiaEventHeader::GetZQuench(Double_t z[4]) const
 {
     //
     // Get quenching fraction

diff --git a/STEER/AliGenPythiaEventHeader.h b/STEER/AliGenPythiaEventHeader.h
index 250c317afbcbba0764d25e334b990253d976e00c..28e4c172e3ad91ec337aaac1423ce30712dd9fc0 100644 (file)
--- a/STEER/AliGenPythiaEventHeader.h
+++ b/STEER/AliGenPythiaEventHeader.h
@@ -16,28 +16,28 @@ class AliGenPythiaEventHeader : public AliGenEventHeader
     AliGenPythiaEventHeader(const char* name);
     virtual ~AliGenPythiaEventHeader() {}
     // Getters
-    Int_t    ProcessType()  {return fProcessType;}
+    Int_t    ProcessType() const {return fProcessType;}
     // Setters
     void     SetProcessType(Int_t type)  {fProcessType = type;}
-    Int_t    Trials() {return fTrials;}
+    Int_t    Trials() const {return fTrials;}
     void     SetTrials(Int_t trials) {fTrials = trials;}
     void     AddJet(Float_t px, Float_t py, Float_t pz, Float_t e);
     void     AddUQJet(Float_t px, Float_t py, Float_t pz, Float_t e);
-    Int_t    NTriggerJets() {return fNJets;}
-    Int_t    NUQTriggerJets() {return fNUQJets;}
+    Int_t    NTriggerJets() const {return fNJets;}
+    Int_t    NUQTriggerJets() const {return fNUQJets;}
     void     TriggerJet(Int_t i, Float_t p[4]);
     void     UQJet(Int_t i, Float_t p[4]);
-    Double_t GetXJet() {return fXJet;}
-    Double_t GetYJet() {return fYJet;}
-    Double_t GetInMediumLength()  {return fInMediumLength;}
-    Double_t GetImpactParameter() {return fImpactParameter;}
+    Double_t GetXJet() const {return fXJet;}
+    Double_t GetYJet() const {return fYJet;}
+    Double_t GetInMediumLength() const  {return fInMediumLength;}
+    Double_t GetImpactParameter() const {return fImpactParameter;}
     void     SetXYJet(Double_t x, Double_t y);
     void     SetImpactParameter(Double_t b) {fImpactParameter = b;}
     void     SetInMe(Double_t l) {fInMediumLength = l;}
     void     SetZQuench(Double_t z[4]);
-    void     GetZQuench(Double_t z[4]);
+    void     GetZQuench(Double_t z[4]) const;
     void     SetPtHard(Float_t pthard) {fPtHard = pthard;}
-    Float_t  GetPtHard() {return fPtHard;}    
+    Float_t  GetPtHard() const {return fPtHard;}    
        
            
 protected:

diff --git a/STEER/AliMCParticle.cxx b/STEER/AliMCParticle.cxx
index 0f8db46d44475257129280a5ccfaa36a3d320fe6..c4b66304cdc047502f942a4a226ff966394999d1 100644 (file)
--- a/STEER/AliMCParticle.cxx
+++ b/STEER/AliMCParticle.cxx
@@ -75,7 +75,7 @@ AliMCParticle::AliMCParticle(const AliMCParticle& mcPart) :
 
 AliMCParticle& AliMCParticle::operator=(const AliMCParticle& mcPart)
 { 
-
+// Copy constructor
   if (this!=&mcPart) { 
     AliVParticle::operator=(mcPart);
   }

diff --git a/STEER/AliMCParticle.h b/STEER/AliMCParticle.h
index 75d4a266f8639329bb10f6555792646f1019ce27..b8f45bb55a34b3841f3e14790250b65ebbb4e9db 100644 (file)
--- a/STEER/AliMCParticle.h
+++ b/STEER/AliMCParticle.h
@@ -42,6 +42,7 @@ public:
     virtual Double_t Yv()        const;
     virtual Double_t Zv()        const;
     virtual Bool_t   XvYvZv(Double_t x[3]) const;  
+    virtual Double_t T()         const;
 
     virtual Double_t E()          const;
     virtual Double_t M()          const;
@@ -60,7 +61,7 @@ public:
     virtual const Double_t *PID() const {return 0;} // return PID object (to be defined, still)
 
     // Track References
-    Int_t              GetNumberOfTrackReferences() {return fNTrackRef;}
+    Int_t              GetNumberOfTrackReferences() const {return fNTrackRef;}
     AliTrackReference* GetTrackReference(Int_t i)
       {return dynamic_cast<AliTrackReference*>((*fTrackReferences)[i]);}
 
@@ -100,6 +101,7 @@ inline Double_t AliMCParticle::Xv()        const {return fParticle->Vx();}
 inline Double_t AliMCParticle::Yv()        const {return fParticle->Vy();}
 inline Double_t AliMCParticle::Zv()        const {return fParticle->Vz();}
 inline Bool_t   AliMCParticle::XvYvZv(Double_t x[3]) const { x[0] = Xv(); x[1] = Yv(); x[2] = Zv(); return kTRUE; }
+inline Double_t AliMCParticle::T()        const {return fParticle->T();}
 inline Double_t AliMCParticle::E()         const {return fParticle->Energy();}
 inline Double_t AliMCParticle::Eta()       const {return fParticle->Eta();}
 

diff --git a/STEER/AliVVertex.cxx b/STEER/AliVVertex.cxx
index 9e1547f8a2fbbc1bfe8a8a16381bbe12dc8121c2..a01d17f7ed0c2966cd13700dbfb94a58ee71d0d5 100644 (file)
--- a/STEER/AliVVertex.cxx
+++ b/STEER/AliVVertex.cxx
@@ -27,9 +27,11 @@ AliVVertex::AliVVertex(const AliVVertex& vVert) :
   TNamed(vVert) { } // Copy constructor
 
 AliVVertex& AliVVertex::operator=(const AliVVertex& vVert)
-{ if (this!=&vVert) { 
-    TNamed::operator=(vVert); 
-  }
+{ 
+    // Copy constructor
+    if (this!=&vVert) { 
+       TNamed::operator=(vVert); 
+    }
   
   return *this; 
 }