Gsatt replaces

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

diff --git a/STEER/AliVParticle.h b/STEER/AliVParticle.h
index 9ea139f798c7e973f21653ecafac8cd37bd45775..d2db029559492e84ba0aa98d6f4d7bbe225a4795 100644 (file)
--- a/STEER/AliVParticle.h
+++ b/STEER/AliVParticle.h
@@ -13,10 +13,12 @@
 #include <Rtypes.h>
 #include <TObject.h>
 
-const Double_t kAlmost1=0.999;
-const Double_t kAlmost0=1e-33;
+#include <float.h>
 
-const Double_t kB2C=0.299792458e-3;
+const Double_t kAlmost1=1. - Double_t(FLT_EPSILON);
+const Double_t kAlmost0=Double_t(FLT_MIN);
+
+const Double_t kB2C=-0.299792458e-3;
 const Double_t kAlmost0Field=1.e-13;
 
 class AliVParticle: public TObject {
@@ -32,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;
@@ -40,29 +42,49 @@ 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)
 
+
+  
+  /** Compare this class with an other instance of this class
+   *  used in a TCollection::Sort()/TClonesArray::Sort()
+   *  @param   obj  ptr to other instance
+   *  @return  Returns 0 when equal, 1 when this is smaller
+   *  and -1 when bigger -- sorts descending
+   */
+  Int_t Compare( const TObject* obj) const;
+  
+    
+  /** Defines this class as being sortable in a TCollection
+   *  @return     always kTRUE;
+   */
+  Bool_t IsSortable() const  { return kTRUE; }
+
+
   // coordinate system conversions
   Bool_t   Local2GlobalMomentum(Double_t p[3], Double_t alpha) const;
   Bool_t   Local2GlobalPosition(Double_t r[3], Double_t alpha) const;
   Bool_t   Global2LocalMomentum(Double_t p[3], Short_t charge, Double_t &alpha) const;
   Bool_t   Global2LocalPosition(Double_t r[3], Double_t alpha) const;
 
-  ClassDef(AliVParticle,0)  // base class for particles
+  
+
+  ClassDef(AliVParticle, 3)  // base class for particles
 };
 
 #endif