From: morsch Date: Thu, 11 Mar 2010 08:32:30 +0000 (+0000) Subject: PdgCode() ported to the interface X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=commitdiff_plain;h=6a8e543acf80ff23ef04580b0af874312a300a24 PdgCode() ported to the interface --- diff --git a/CORRFW/AliCFPair.h b/CORRFW/AliCFPair.h index 0ce562c7268..ef5975c7460 100755 --- a/CORRFW/AliCFPair.h +++ b/CORRFW/AliCFPair.h @@ -73,7 +73,7 @@ class AliCFPair : public AliVParticle { virtual void SetMassHypothesis(Double_t massNeg, Double_t massPos) {fMassNeg=massNeg;fMassPos=massPos;} // PID virtual const Double_t *PID() const {return 0;} // return PID object (to be defined, still) - + virtual Int_t PdgCode() {return 0;} private: Bool_t fIsV0; // true if V0 passed to the constructor diff --git a/PWG3/dielectron/AliDielectronPair.h b/PWG3/dielectron/AliDielectronPair.h index 7957a565d7d..93883a31346 100644 --- a/PWG3/dielectron/AliDielectronPair.h +++ b/PWG3/dielectron/AliDielectronPair.h @@ -85,7 +85,8 @@ public: // daughter references AliVParticle* GetFirstDaughter() const { return dynamic_cast(fRefD1.GetObject()); } AliVParticle* GetSecondDaughter() const { return dynamic_cast(fRefD2.GetObject()); } - + // Dummy + Int_t PdgCode() const {return 0;} private: Double_t fOpeningAngle; // opening angle of the pair diff --git a/STEER/AliAODDimuon.h b/STEER/AliAODDimuon.h index 21d05ef838a..fd1a80366d8 100644 --- a/STEER/AliAODDimuon.h +++ b/STEER/AliAODDimuon.h @@ -82,15 +82,17 @@ public: Double_t MaxChi2Match(); // PID virtual const Double_t *PID() const {return 0;} // return PID object (to be defined, still) + // Int_t GetLabel() const {return -1;} - // Additional getters and setters AliAODTrack* GetMu(Int_t imu=0) const {return (imu==0||imu==1)&&(fMu[imu]!=0) ? (AliAODTrack*)fMu[imu].GetObject() : 0; } // Get a pointer to a muon AliAODTrack* Mu(Int_t imu=0) const {return (imu==0||imu==1)&&(fMu[imu]!=0) ? (AliAODTrack*)fMu[imu].GetObject() : 0; } // Get a pointer to a muon void SetMu(Int_t imu=0, AliAODTrack *mu=0); void SetMuons(AliAODTrack *mu0=0, AliAODTrack *mu1=0); + // Dummy + virtual Int_t PdgCode() const {return 0;} private: Int_t CheckPointers() const; diff --git a/STEER/AliAODJet.h b/STEER/AliAODJet.h index 54f2e050c62..696d411d4f9 100644 --- a/STEER/AliAODJet.h +++ b/STEER/AliAODJet.h @@ -81,6 +81,9 @@ class AliAODJet : public AliVParticle { virtual Short_t Charge() const { return 0;} virtual const Double_t* PID() const { return NULL;} virtual Int_t GetLabel() const { return -1;} + // Dummy + virtual Int_t PdgCode() const {return 0;} + // // first only one bit for EMCAL and TRD, leave space for more diff --git a/STEER/AliAODMCParticle.h b/STEER/AliAODMCParticle.h index 36dfd55d6cf..2715db5c237 100644 --- a/STEER/AliAODMCParticle.h +++ b/STEER/AliAODMCParticle.h @@ -73,7 +73,8 @@ class AliAODMCParticle: public AliVParticle { virtual Int_t GetMother() const {return fMother;} virtual void Print(const Option_t *opt = "") const; virtual Int_t GetPdgCode() const { return fPdgCode;} - + virtual Int_t PdgCode() const { return GetPdgCode();} + enum { kPrimary = 1<<0, kPhysicalPrim = 1<<1 }; void SetFlag(UInt_t flag){fFlag = flag;} UInt_t GetFlag() const {return fFlag;} diff --git a/STEER/AliAODPWG4Particle.h b/STEER/AliAODPWG4Particle.h index 2c93d248fbc..bae02f5ed6b 100755 --- a/STEER/AliAODPWG4Particle.h +++ b/STEER/AliAODPWG4Particle.h @@ -105,6 +105,8 @@ class AliAODPWG4Particle : public AliVParticle { Bool_t IsPIDOK(const Int_t ipid, const Int_t pdgwanted) const; Double_t GetPairMass(AliAODPWG4Particle * p)const{ return (*(p->fMomentum)+*fMomentum).M(); } + // Dummy + Int_t PdgCode() const {return 0;} private: TLorentzVector* fMomentum; // Photon 4-momentum vector diff --git a/STEER/AliAODPhoton.h b/STEER/AliAODPhoton.h index 716ff11024f..6c752402799 100644 --- a/STEER/AliAODPhoton.h +++ b/STEER/AliAODPhoton.h @@ -47,9 +47,12 @@ class AliAODPhoton : public AliVParticle { virtual void Print(Option_t* /*option*/) const; // Dummy - virtual Short_t Charge() const { return 0;} - virtual const Double_t* PID() const { return NULL;} - virtual Int_t GetLabel() const { return -1;} + virtual Short_t Charge() const { return 0;} + virtual const Double_t* PID() const { return NULL;} + virtual Int_t GetLabel() const { return -1;} + // Dummy + virtual Int_t PdgCode() const {return 0;} + // diff --git a/STEER/AliAODRecoDecay.h b/STEER/AliAODRecoDecay.h index c7ca7e219d9..d1d66546460 100644 --- a/STEER/AliAODRecoDecay.h +++ b/STEER/AliAODRecoDecay.h @@ -169,6 +169,7 @@ class AliAODRecoDecay : public AliVTrack { Double_t M() const {printf("Dummy function"); return (Double_t)-999.;} Int_t GetLabel() const {return -1;} + Int_t PdgCode() const {return 0;} 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; diff --git a/STEER/AliAODTrack.h b/STEER/AliAODTrack.h index fb8366eb39e..6abb656e9d6 100644 --- a/STEER/AliAODTrack.h +++ b/STEER/AliAODTrack.h @@ -258,7 +258,9 @@ class AliAODTrack : public AliVTrack { void SetProdVertex(TObject *vertex) { fProdVertex = vertex; } void SetType(AODTrk_t ttype) { fType=ttype; } - + // Dummy + Int_t PdgCode() const {return 0;} + private : // Momentum & position diff --git a/STEER/AliAODv0.h b/STEER/AliAODv0.h index ce508ab3c37..b960e0415c9 100644 --- a/STEER/AliAODv0.h +++ b/STEER/AliAODv0.h @@ -82,8 +82,9 @@ public: Short_t GetPosID() const; Short_t GetNegID() const; - Int_t GetLabel() const {return -1;} // Dummy - + Int_t GetLabel() const {return -1;} // Dummy + Int_t PdgCode() const {return 0;} // Dummy + protected: Double32_t fDcaV0ToPrimVertex; // dca of V0 to primary vertex Bool_t fOnFlyStatus; // if kTRUE, then this V0 is recontructed diff --git a/STEER/AliESDMuonTrack.h b/STEER/AliESDMuonTrack.h index 6e1c7e6d339..06f03588603 100644 --- a/STEER/AliESDMuonTrack.h +++ b/STEER/AliESDMuonTrack.h @@ -180,7 +180,11 @@ public: Double_t Eta() const { return -TMath::Log(TMath::Tan(0.5 * Theta()));} Double_t Y() const { return (Pz()/E() != 1.) ? TMath::ATanH(Pz()/E()) : FLT_MAX; } Short_t Charge() const { return (Short_t)TMath::Sign(1., GetInverseBendingMomentum()); } + + + // Dummy const Double_t *PID() const { return (Double_t*)0x0; } + Int_t PdgCode() const {return 0;} /// Set the corresponding MC track number void SetLabel(Int_t label) {fLabel = label;} diff --git a/STEER/AliESDv0.h b/STEER/AliESDv0.h index a41be806ad8..50807c8e613 100644 --- a/STEER/AliESDv0.h +++ b/STEER/AliESDv0.h @@ -133,6 +133,8 @@ public: const Int_t * GetClusters(Int_t i) const {return fClusters[i];} void SetNormDCAPrim(Float_t nd0, Float_t nd1){fNormDCAPrim[0] = nd0; fNormDCAPrim[1]=nd1;} const Double_t *GetNormDCAPrimP() const {return fNormDCAPrim;} + // Dummy + Int_t PdgCode() const {return 0;} protected: AliExternalTrackParam fParamN; // external parameters of negative particle diff --git a/STEER/AliExternalTrackParam.h b/STEER/AliExternalTrackParam.h index 0bc5d63ccb8..85a39a0dc6a 100644 --- a/STEER/AliExternalTrackParam.h +++ b/STEER/AliExternalTrackParam.h @@ -205,6 +205,8 @@ class AliExternalTrackParam: public AliVTrack { Bool_t GetDistance(AliExternalTrackParam *param2, Double_t x, Double_t dist[3], Double_t b); Int_t GetIndex(Int_t i, Int_t j) const; Int_t GetLabel() const {return -1;} + Int_t PdgCode() const {return 0;} + // // visualization (M. Ivanov) // diff --git a/STEER/AliVParticle.h b/STEER/AliVParticle.h index 753d5ce9800..d2db0295594 100644 --- a/STEER/AliVParticle.h +++ b/STEER/AliVParticle.h @@ -34,7 +34,7 @@ public: virtual Double_t Py() const = 0; virtual Double_t Pz() const = 0; virtual Double_t Pt() const = 0; - virtual Double_t P() const = 0; + virtual Double_t P() const = 0; virtual Bool_t PxPyPz(Double_t p[3]) const = 0; virtual Double_t Xv() const = 0; @@ -42,20 +42,21 @@ public: virtual Double_t Zv() const = 0; virtual Bool_t XvYvZv(Double_t x[3]) const = 0; - virtual Double_t OneOverPt() const = 0; - virtual Double_t Phi() const = 0; - virtual Double_t Theta() const = 0; + virtual Double_t OneOverPt() const = 0; + virtual Double_t Phi() const = 0; + virtual Double_t Theta() const = 0; - virtual Double_t E() const = 0; - virtual Double_t M() const = 0; + virtual Double_t E() const = 0; + virtual Double_t M() const = 0; - virtual Double_t Eta() const = 0; - virtual Double_t Y() const = 0; + virtual Double_t Eta() const = 0; + virtual Double_t Y() const = 0; - virtual Short_t Charge() const = 0; - virtual Int_t GetLabel() const = 0; + virtual Short_t Charge() const = 0; + virtual Int_t GetLabel() const = 0; // PID + virtual Int_t PdgCode() const = 0; virtual const Double_t *PID() const = 0; // return PID object (to be defined, still)