Fix fixed-string length bug

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

diff --git a/STEER/AliAODJet.h b/STEER/AliAODJet.h
index 760fc1dae7e1f9f580400f43760330cd0c1c7cdb..0c0ec1fe853d5ed5ba9378e9e657657250300aa6 100644 (file)
--- a/STEER/AliAODJet.h
+++ b/STEER/AliAODJet.h
@@ -32,12 +32,18 @@ class AliAODJet : public AliVParticle {
     virtual Double_t Pt()         const { return fMomentum->Pt();      }
     virtual Double_t P()          const { return fMomentum->P();       }
     virtual Double_t OneOverPt()  const { return 1. / fMomentum->Pt(); }
-    virtual Double_t Phi()        const { return fMomentum->Phi();     }
+    virtual Bool_t   PxPyPz(Double_t p[3]) const { p[0] = Px(); p[1] = Py(); p[2] = Pz(); return kTRUE; }
+    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     AddTrack(TObject *tr) {fRefTracks->Add(tr);}
     TObject* GetTrack(Int_t i) {return fRefTracks->At(i);}
@@ -45,7 +51,8 @@ class AliAODJet : public AliVParticle {
        {fBackgEnergy[0] = bgEnCh; fBackgEnergy[1] = bgEnNe;}
     virtual void     SetEffArea(Double_t effACh, Double_t effANe)
        {fEffectiveArea[0] = effACh; fEffectiveArea[1] = effANe;}
-    
+    virtual void     SetPxPyPzE(Double_t px, Double_t py, Double_t pz, Double_t e);
+
     virtual TRefArray* GetRefTracks()           const { return  fRefTracks;}
     virtual Double_t   ChargedBgEnergy()        const { return  fBackgEnergy[0];}
     virtual Double_t   NeutralBgEnergy()        const { return  fBackgEnergy[1];}
@@ -54,20 +61,33 @@ class AliAODJet : public AliVParticle {
     virtual Double_t   EffectiveAreaCharged()   const { return  fEffectiveArea[0];}
     virtual Double_t   EffectiveAreaNeutral()   const { return  fEffectiveArea[1];}
 
+    TLorentzVector*    MomentumVector()         const {return fMomentum;}
     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;}
 //
     
     
  private:
+    Double32_t      fBackgEnergy[2];     // Subtracted background energy
+    Double32_t      fEffectiveArea[2];   // Effective jet area used for background subtraction
+
     TLorentzVector* fMomentum;           // Jet 4-momentum vector
     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,4);
+
 };
 
+inline Double_t AliAODJet::Phi() const
+{
+    // Return phi
+    Double_t phi = fMomentum->Phi();
+    if (phi < 0.) phi += 2. * TMath::Pi();
+    return phi;
+}
+
 #endif