From ff7c57dd42500b4812e1177d4dbf9d314530095d Mon Sep 17 00:00:00 2001 From: hristov Date: Tue, 7 Aug 2007 20:51:23 +0000 Subject: [PATCH] Rename AliVirtualParticle to AliVParticle (Markus) --- STEER/AliAODCluster.cxx | 10 +++++----- STEER/AliAODCluster.h | 6 +++--- STEER/AliAODJet.cxx | 8 ++++---- STEER/AliAODJet.h | 8 ++++---- STEER/AliAODPhoton.cxx | 8 ++++---- STEER/AliAODPhoton.h | 6 +++--- STEER/AliAODRecoDecay.cxx | 10 +++++----- STEER/AliAODRecoDecay.h | 6 +++--- 8 files changed, 31 insertions(+), 31 deletions(-) diff --git a/STEER/AliAODCluster.cxx b/STEER/AliAODCluster.cxx index fecf1cfffd4..297af607150 100644 --- a/STEER/AliAODCluster.cxx +++ b/STEER/AliAODCluster.cxx @@ -26,7 +26,7 @@ ClassImp(AliAODCluster) //______________________________________________________________________________ AliAODCluster::AliAODCluster() : - AliVirtualParticle(), + AliVParticle(), fEnergy(0), fChi2(-999.), fID(-999), @@ -52,7 +52,7 @@ AliAODCluster::AliAODCluster(Int_t id, AliAODVertex *prodVertex, AliAODTrack *primTrack, Char_t ttype) : - AliVirtualParticle(), + AliVParticle(), fEnergy(energy), fChi2(-999.), fID(id), @@ -80,7 +80,7 @@ AliAODCluster::AliAODCluster(Int_t id, AliAODVertex *prodVertex, AliAODTrack *primTrack, Char_t ttype) : - AliVirtualParticle(), + AliVParticle(), fEnergy(energy), fChi2(-999.), fID(id), @@ -109,7 +109,7 @@ AliAODCluster::~AliAODCluster() //______________________________________________________________________________ AliAODCluster::AliAODCluster(const AliAODCluster& clus) : - AliVirtualParticle(clus), + AliVParticle(clus), fEnergy(clus.fEnergy), fChi2(clus.fChi2), fID(clus.fID), @@ -133,7 +133,7 @@ AliAODCluster& AliAODCluster::operator=(const AliAODCluster& clus) // Assignment operator if(this!=&clus) { - AliVirtualParticle::operator=(clus); + AliVParticle::operator=(clus); clus.GetPosition(fPosition); clus.GetPID(fPID); diff --git a/STEER/AliAODCluster.h b/STEER/AliAODCluster.h index 1ced4c9fab5..c2c8cf933be 100644 --- a/STEER/AliAODCluster.h +++ b/STEER/AliAODCluster.h @@ -12,11 +12,11 @@ #include -#include "AliVirtualParticle.h" +#include "AliVParticle.h" #include "AliAODVertex.h" #include "AliAODTrack.h" -class AliAODCluster : public AliVirtualParticle { +class AliAODCluster : public AliVParticle { public: @@ -149,7 +149,7 @@ class AliAODCluster : public AliVirtualParticle { Char_t fType; - ClassDef(AliAODCluster,1); + ClassDef(AliAODCluster,2); }; #endif diff --git a/STEER/AliAODJet.cxx b/STEER/AliAODJet.cxx index 5641940e2c3..a38066e3c52 100644 --- a/STEER/AliAODJet.cxx +++ b/STEER/AliAODJet.cxx @@ -28,7 +28,7 @@ ClassImp(AliAODJet) //______________________________________________________________________________ AliAODJet::AliAODJet() : - AliVirtualParticle(), + AliVParticle(), fMomentum(0), fRefTracks(new TRefArray()) { @@ -40,7 +40,7 @@ AliAODJet::AliAODJet() : } AliAODJet::AliAODJet(Double_t px, Double_t py, Double_t pz, Double_t e): - AliVirtualParticle(), + AliVParticle(), fMomentum(0), fRefTracks(new TRefArray()) { @@ -53,7 +53,7 @@ AliAODJet::AliAODJet(Double_t px, Double_t py, Double_t pz, Double_t e): } AliAODJet::AliAODJet(TLorentzVector & p): - AliVirtualParticle(), + AliVParticle(), fMomentum(0), fRefTracks(new TRefArray()) { @@ -76,7 +76,7 @@ AliAODJet::~AliAODJet() //______________________________________________________________________________ AliAODJet::AliAODJet(const AliAODJet& jet) : - AliVirtualParticle(jet), + AliVParticle(jet), fMomentum(0) { // Copy constructor diff --git a/STEER/AliAODJet.h b/STEER/AliAODJet.h index 0d67782c4a1..760fc1dae7e 100644 --- a/STEER/AliAODJet.h +++ b/STEER/AliAODJet.h @@ -11,12 +11,12 @@ //------------------------------------------------------------------------- #include +#include "AliVParticle.h" #include -#include "AliVirtualParticle.h" #include "AliAODVertex.h" -class AliAODJet : public AliVirtualParticle { +class AliAODJet : public AliVParticle { public: AliAODJet(); @@ -25,7 +25,7 @@ class AliAODJet : public AliVirtualParticle { virtual ~AliAODJet(); AliAODJet(const AliAODJet& jet); AliAODJet& operator=(const AliAODJet& jet); -// AliVirtualParticle methods +// AliVParticle methods virtual Double_t Px() const { return fMomentum->Px(); } virtual Double_t Py() const { return fMomentum->Py(); } virtual Double_t Pz() const { return fMomentum->Pz(); } @@ -67,7 +67,7 @@ class AliAODJet : public AliVirtualParticle { TRefArray* fRefTracks; // array of references to the tracks belonging to the jet Double_t fBackgEnergy[2]; // Subtracted background energy Double_t fEffectiveArea[2]; // Effective jet area used for background subtraction - ClassDef(AliAODJet, 2); + ClassDef(AliAODJet,2); }; #endif diff --git a/STEER/AliAODPhoton.cxx b/STEER/AliAODPhoton.cxx index d1c6235525d..acf2e8c118c 100644 --- a/STEER/AliAODPhoton.cxx +++ b/STEER/AliAODPhoton.cxx @@ -28,14 +28,14 @@ ClassImp(AliAODPhoton) //______________________________________________________________________________ AliAODPhoton::AliAODPhoton() : - AliVirtualParticle(), + AliVParticle(), fMomentum(0) { // constructor } AliAODPhoton::AliAODPhoton(Double_t px, Double_t py, Double_t pz, Double_t e): - AliVirtualParticle(), + AliVParticle(), fMomentum(0) { // constructor @@ -43,7 +43,7 @@ AliAODPhoton::AliAODPhoton(Double_t px, Double_t py, Double_t pz, Double_t e): } AliAODPhoton::AliAODPhoton(TLorentzVector & p): - AliVirtualParticle(), + AliVParticle(), fMomentum(0) { // constructor @@ -60,7 +60,7 @@ AliAODPhoton::~AliAODPhoton() //______________________________________________________________________________ AliAODPhoton::AliAODPhoton(const AliAODPhoton& photon) : - AliVirtualParticle(photon), + AliVParticle(photon), fMomentum(0) { // Copy constructor diff --git a/STEER/AliAODPhoton.h b/STEER/AliAODPhoton.h index eff8649c21f..35d800feb86 100644 --- a/STEER/AliAODPhoton.h +++ b/STEER/AliAODPhoton.h @@ -11,11 +11,11 @@ //------------------------------------------------------------------------- #include -#include "AliVirtualParticle.h" +#include "AliVParticle.h" #include "AliAODVertex.h" -class AliAODPhoton : public AliVirtualParticle { +class AliAODPhoton : public AliVParticle { public: AliAODPhoton(); @@ -24,7 +24,7 @@ class AliAODPhoton : public AliVirtualParticle { virtual ~AliAODPhoton(); AliAODPhoton(const AliAODPhoton& photon); AliAODPhoton& operator=(const AliAODPhoton& photon); -// AliVirtualParticle methods +// AliVParticle methods virtual Double_t Px() const { return fMomentum->Px(); } virtual Double_t Py() const { return fMomentum->Py(); } virtual Double_t Pz() const { return fMomentum->Pz(); } diff --git a/STEER/AliAODRecoDecay.cxx b/STEER/AliAODRecoDecay.cxx index 059537a44aa..34c4feacbbd 100644 --- a/STEER/AliAODRecoDecay.cxx +++ b/STEER/AliAODRecoDecay.cxx @@ -22,14 +22,14 @@ #include #include -#include "AliVirtualParticle.h" +#include "AliVParticle.h" #include "AliAODRecoDecay.h" ClassImp(AliAODRecoDecay) //-------------------------------------------------------------------------- AliAODRecoDecay::AliAODRecoDecay() : - AliVirtualParticle(), + AliVParticle(), fSecondaryVtx(0x0), fCharge(0), fNProngs(0), fNDCA(0), fNPID(0), @@ -49,7 +49,7 @@ AliAODRecoDecay::AliAODRecoDecay(AliAODVertex *vtx2,Int_t nprongs, Short_t charge, Double_t *px,Double_t *py,Double_t *pz, Double_t *d0) : - AliVirtualParticle(), + AliVParticle(), fSecondaryVtx(vtx2), fCharge(charge), fNProngs(nprongs), fNDCA(0), fNPID(0), @@ -78,7 +78,7 @@ AliAODRecoDecay::AliAODRecoDecay(AliAODVertex *vtx2,Int_t nprongs, AliAODRecoDecay::AliAODRecoDecay(AliAODVertex *vtx2,Int_t nprongs, Short_t charge, Double_t *d0) : - AliVirtualParticle(), + AliVParticle(), fSecondaryVtx(vtx2), fCharge(charge), fNProngs(nprongs), fNDCA(0), fNPID(0), @@ -97,7 +97,7 @@ AliAODRecoDecay::AliAODRecoDecay(AliAODVertex *vtx2,Int_t nprongs, } //-------------------------------------------------------------------------- AliAODRecoDecay::AliAODRecoDecay(const AliAODRecoDecay &source) : - AliVirtualParticle(source), + AliVParticle(source), fSecondaryVtx(source.fSecondaryVtx), fCharge(source.fCharge), fNProngs(source.fNProngs), fNDCA(source.fNDCA), fNPID(source.fNPID), diff --git a/STEER/AliAODRecoDecay.h b/STEER/AliAODRecoDecay.h index 644434652e8..594ba4682d9 100644 --- a/STEER/AliAODRecoDecay.h +++ b/STEER/AliAODRecoDecay.h @@ -11,9 +11,9 @@ #include #include "AliAODVertex.h" -#include "AliVirtualParticle.h" +#include "AliVParticle.h" -class AliAODRecoDecay : public AliVirtualParticle { +class AliAODRecoDecay : public AliVParticle { public: @@ -136,7 +136,7 @@ class AliAODRecoDecay : public AliVirtualParticle { void Print(Option_t* option = "") const; //void PrintIndices() const {fSecondaryVtx->PrintIndices();} - // dummy functions for inheritance from AliVirtualParticle + // dummy functions for inheritance from AliVParticle Double_t E() const {printf("Dummy function; use AliAODRecoDecay::E(UInt_t pdg) instead"); return (Double_t)-999.;} Double_t Y() const -- 2.43.0