Energy -> E

diff --git a/ANALYSIS/AliAODParticle.cxx b/ANALYSIS/AliAODParticle.cxx
index c72ca54e8e22acbc53932e99ca316d611f53a0ce..bcb32b0cbaaccb15c3a31b0106233263a8a58190 100644 (file)
--- a/ANALYSIS/AliAODParticle.cxx
+++ b/ANALYSIS/AliAODParticle.cxx
@@ -76,7 +76,7 @@ AliAODParticle::AliAODParticle(const AliAODParticle& in):
    fPdgIdx(in.fPdgIdx), fIdxInEvent(in.fIdxInEvent),
    fNPids(in.fNPids),fPids(new Int_t[fNPids]),fPidProb(new Float_t[fNPids]),
    fCalcMass(in.GetCalcMass()),
-   fPx(in.Px()),fPy(in.Py()),fPz(in.Pz()),fE(in.Energy()), 
+   fPx(in.Px()),fPy(in.Py()),fPz(in.Pz()),fE(in.E()), 
    fVx(in.Vx()),fVy(in.Vy()),fVz(in.Vz()),fVt(in.T()),
    fTPCTrackPoints(0x0),fITSTrackPoints(0x0),fClusterMap(0x0)
 {
@@ -186,7 +186,7 @@ AliAODParticle& AliAODParticle::operator=(const AliAODParticle& in)
   fPx = in.Px();
   fPy = in.Py();
   fPz = in.Pz();
-  fE = in.Energy(); 
+  fE = in.E(); 
   fVx = in.Vx();
   fVy = in.Vy();
   fVz = in.Vz();
@@ -357,7 +357,7 @@ void AliAODParticle::Print() const
    }
   
   printf("Px: %+f Py: %+f Pz: %+f E: %+f Calculated Mass: %f\nVx: %+f Vy: %+f Vz: %+f T: %+f\n",
-          Px(),Py(),Pz(),Energy(),GetCalcMass(),Vx(),Vy(),Vz(),T());
+          Px(),Py(),Pz(),E(),GetCalcMass(),Vx(),Vy(),Vz(),T());
 
   for (Int_t i = 0; i < fNPids; i++)
    {

diff --git a/ANALYSIS/AliAODParticle.h b/ANALYSIS/AliAODParticle.h
index 3e6ef21b9e9c647ade2c8f5613fdc19d41fada5e..95aea067a0160985d6b2d85db221c03954a90f6f 100644 (file)
--- a/ANALYSIS/AliAODParticle.h
+++ b/ANALYSIS/AliAODParticle.h
@@ -95,7 +95,7 @@ public:
     
   Double_t         Pt    () const  //transverse momentum
     { return TMath::Sqrt(fPx*fPx+fPy*fPy); }
-  Double_t         Energy() const { return fE; }
+  Double_t         E() const { return fE; }
   
                                    //Pseudo Rapidity
   Double_t         Eta   () const { if (P() != fPz) return 0.5*TMath::Log((P()+fPz)/(P()-fPz));