Make use of new method AliRawReader::GetNumberOfEvents() - goinf to the last event...

[u/mrichter/AliRoot.git] / STEER / AliAODPhoton.h

diff --git a/STEER/AliAODPhoton.h b/STEER/AliAODPhoton.h
index eff8649c21f2dd77630563de0bff8e696738d860..716ff11024f240cf9f7ceb034a7d27e6184efcb0 100644 (file)
--- a/STEER/AliAODPhoton.h
+++ b/STEER/AliAODPhoton.h
@@ -11,11 +11,11 @@
 //-------------------------------------------------------------------------
 
 #include <TLorentzVector.h>
-#include "AliVirtualParticle.h"
+#include "AliVParticle.h"
 #include "AliAODVertex.h"
 
 
-class AliAODPhoton : public AliVirtualParticle {
+class AliAODPhoton : public AliVParticle {
 
  public:
     AliAODPhoton();
@@ -24,26 +24,32 @@ 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();      }
     virtual Double_t Pt()         const { return fMomentum->Pt();      }
     virtual Double_t P()          const { return fMomentum->P();       }
+    virtual Bool_t   PxPyPz(Double_t p[3]) const { p[0] = Px(); p[1] = Py(); p[2] = Pz(); return kTRUE; }
     virtual Double_t OneOverPt()  const { return 1. / fMomentum->Pt(); }
-    virtual Double_t Phi()        const { return fMomentum->Phi();     }
+    virtual Double_t Phi()        const;
     virtual Double_t Theta()      const { return fMomentum->Theta();   }
     virtual Double_t E()          const { return fMomentum->E();       }
     virtual Double_t M()          const { return fMomentum->M();       }
     virtual Double_t Eta()        const { return fMomentum->Eta();     }
     virtual Double_t Y()          const { return fMomentum->Rapidity();}
-//
-
+    virtual Double_t Xv()         const {return -999.;} // put reasonable values here
+    virtual Double_t Yv()         const {return -999.;} //
+    virtual Double_t Zv()         const {return -999.;} //
+    virtual Bool_t   XvYvZv(Double_t x[3]) const { x[0] = Xv(); x[1] = Yv(); x[2] = Zv(); return kTRUE; }  
+    //
+    
     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;}
 //
     
     
@@ -52,4 +58,12 @@ class AliAODPhoton : public AliVirtualParticle {
     ClassDef(AliAODPhoton,1);
 };
 
+inline Double_t AliAODPhoton::Phi() const
+{
+    // Return phi
+    Double_t phi = fMomentum->Phi();
+    if (phi < 0.) phi += 2. * TMath::Pi();
+    return phi;
+}
+
 #endif