X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=STEER%2FAliAODJet.h;h=3534d5dafe511890468a8ca52ee7a5e8b1a2ab35;hb=dd6416aabf47741bfbfdc2546b6696ef6840751c;hp=760fc1dae7e1f9f580400f43760330cd0c1c7cdb;hpb=ff7c57dd42500b4812e1177d4dbf9d314530095d;p=u%2Fmrichter%2FAliRoot.git

diff --git a/STEER/AliAODJet.h b/STEER/AliAODJet.h
index 760fc1dae7e..3534d5dafe5 100644
--- a/STEER/AliAODJet.h
+++ b/STEER/AliAODJet.h
@@ -32,20 +32,36 @@ 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 void     AddTrack(TObject *tr) {fRefTracks->Add(tr);}
+    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 Bool_t   IsTriggeredEMCAL(){return (fTrigger&kEMCALTriggered)==kEMCALTriggered;}
+    virtual Bool_t   IsTriggeredTRD(){return (fTrigger&kTRDTriggered)==kTRDTriggered;}
+    virtual UChar_t  Trigger(){return fTrigger;}
+
+    virtual void     AddTrack(TObject *tr);
+    
     TObject* GetTrack(Int_t i) {return fRefTracks->At(i);}
     virtual void     SetBgEnergy(Double_t bgEnCh, Double_t bgEnNe)
 	{fBackgEnergy[0] = bgEnCh; fBackgEnergy[1] = bgEnNe;}
-    virtual void     SetEffArea(Double_t effACh, Double_t effANe)
-	{fEffectiveArea[0] = effACh; fEffectiveArea[1] = effANe;}
-    
+    virtual void     SetEffArea(Double_t effACh, Double_t effANe, Double_t effAErrCh = 0, Double_t effAErrNe = 0)
+	{
+	  fEffectiveArea[0] = effACh; fEffectiveArea[1] = effANe;
+	  fEffectiveAreaError[0] = effAErrCh;
+	  fEffectiveAreaError[1] = effAErrNe;
+	}
+    virtual void     SetPxPyPzE(Double_t px, Double_t py, Double_t pz, Double_t e);
+    virtual void     SetTrigger(UChar_t f){fTrigger |= f;}
+    virtual void     ResetTrigger(UChar_t f){fTrigger &= ~f;}
+
     virtual TRefArray* GetRefTracks()           const { return  fRefTracks;}
     virtual Double_t   ChargedBgEnergy()        const { return  fBackgEnergy[0];}
     virtual Double_t   NeutralBgEnergy()        const { return  fBackgEnergy[1];}
@@ -53,21 +69,57 @@ class AliAODJet : public AliVParticle {
 
     virtual Double_t   EffectiveAreaCharged()   const { return  fEffectiveArea[0];}
     virtual Double_t   EffectiveAreaNeutral()   const { return  fEffectiveArea[1];}
+    virtual void SetVectorAreaCharged(TLorentzVector *effVACh){
+      if(!fVectorAreaCharged)fVectorAreaCharged= new TLorentzVector(*effVACh);
+      else *fVectorAreaCharged = *effVACh;
+    }
+    virtual TLorentzVector*  VectorAreaCharged()   const {return fVectorAreaCharged;}
 
-    virtual void     Print(Option_t* /*option*/) const;
+
+
+    virtual Double_t   ErrorEffectiveAreaCharged()   const { return  fEffectiveAreaError[0];}
+    virtual Double_t   ErrorEffectiveAreaNeutral()   const { return  fEffectiveAreaError[1];}
+    virtual Double_t   DeltaR(const AliVParticle* part);
+
+    
+    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;}
+  // Dummy
+    virtual Int_t    PdgCode()    const {return 0;}
+
 //
-    
-    
+
+    // first only one bit for EMCAL and TRD, leave space for more
+    // trigger types and/or other detectors
+    enum {kEMCALTriggered = 1<<0,
+	  kTRDTriggered = 4<<0};
+
+
  private:
-    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);
+    Double32_t      fBackgEnergy[2];         // Subtracted background energy
+    Double32_t      fEffectiveArea[2];       // Effective jet area used for background subtraction
+    Double32_t      fEffectiveAreaError[2];  //[0,1,10] relative error of jet areas, 10 bit precision
+    Double32_t      fNeutralFraction;        //[0,1,12] Neutral fraction between 0 and 1 12 bit precision;
+    UChar_t         fTrigger;                // Bit mask to flag jets triggered by a certain detector  
+    TLorentzVector* fMomentum;               // Jet 4-momentum vector
+    TLorentzVector* fVectorAreaCharged;      // jet area four momentum 
+    TRefArray*      fRefTracks;              // array of references to the tracks belonging to the jet
+
+    ClassDef(AliAODJet,7);
+
 };
 
+inline Double_t AliAODJet::Phi() const
+{
+    // Return phi
+    Double_t phi = fMomentum->Phi();
+    if (phi < 0.) phi += 2. * TMath::Pi();
+    return phi;
+}
+
 #endif