X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=STEER%2FAliESDEvent.h;h=22392d5ff60ad82c2f0d64d3e61576f1c7f5a880;hb=10eb3d173dd4f09822d4f0197ebc0b701dcfb429;hp=6f8463c8771fde155761c1ebb7d2e1bf24afe60f;hpb=a85132e72f281b2dcd9172970c3813b07320f877;p=u%2Fmrichter%2FAliRoot.git

diff --git a/STEER/AliESDEvent.h b/STEER/AliESDEvent.h
index 6f8463c8771..22392d5ff60 100644
--- a/STEER/AliESDEvent.h
+++ b/STEER/AliESDEvent.h
@@ -42,6 +42,7 @@ class AliESDPmdTrack;
 class AliESDFMD;
 class AliESDkink;
 class AliESDCaloCluster;
+class AliESDCaloCells;
 class AliESDv0;
 class AliMultiplicity;
 class AliRawDataErrorLog;
@@ -62,6 +63,7 @@ public:
 		       kESDFMD,
 		       kESDVZERO,
 		       kESDTZERO,
+		       kTPCVertex,
 		       kSPDVertex,
 		       kPrimaryVertex,
 		       kSPDMult,
@@ -75,6 +77,8 @@ public:
 		       kCascades,
 		       kKinks,
 		       kCaloClusters,
+		       kEMCALCells,
+		       kPHOSCells,
 		       kErrorLogs,
 		       kESDListN
   };
@@ -100,6 +104,7 @@ public:
   Double_t  GetSigma2DiamondX() const {return  fESDRun->GetSigma2DiamondX();}
   Double_t  GetSigma2DiamondY() const {return  fESDRun->GetSigma2DiamondY();}
   void      GetDiamondCovXY(Float_t cov[3]) const {fESDRun->GetDiamondCovXY(cov);}   
+  void     SetTriggerClass(const char*name, Int_t index) {fESDRun->SetTriggerClass(name,index);}
   
 
   // HEADER
@@ -116,6 +121,8 @@ public:
   void      SetTriggerCluster(UChar_t n) {fHeader->SetTriggerCluster(n);}
   
   ULong64_t GetTriggerMask() const {return fHeader->GetTriggerMask();}
+  TString   GetFiredTriggerClasses() const {return fESDRun->GetFiredTriggerClasses(fHeader->GetTriggerMask());}
+  Bool_t    IsTriggerClassFired(const char *name) const {return fESDRun->IsTriggerClassFired(fHeader->GetTriggerMask(),name);}
   UInt_t    GetOrbitNumber() const {return fHeader->GetOrbitNumber();}
   UInt_t    GetTimeStamp()  const { return fHeader->GetTimeStamp();}
   UInt_t    GetEventType()  const { return fHeader->GetEventType();}
@@ -166,8 +173,15 @@ public:
 
 
 
-  void SetVertex(const AliESDVertex *vertex); 
-  const AliESDVertex *GetVertex() const {return fSPDVertex;}
+  void SetPrimaryVertexTPC(const AliESDVertex *vertex); 
+  const AliESDVertex *GetPrimaryVertexTPC() const {return fTPCVertex;}
+
+  void SetPrimaryVertexSPD(const AliESDVertex *vertex); 
+  const AliESDVertex *GetPrimaryVertexSPD() const {return fSPDVertex;}
+  const AliESDVertex *GetVertex() const {
+    //For the backward compatibily only
+     return GetPrimaryVertexSPD();
+  }
 
   void SetPrimaryVertex(const AliESDVertex *vertex);
   const AliESDVertex *GetPrimaryVertex() const {return fPrimaryVertex;}
@@ -248,8 +262,12 @@ public:
   AliESDCaloCluster *GetCaloCluster(Int_t i) const {
     return (AliESDCaloCluster *)fCaloClusters->UncheckedAt(i);
   }
+
   Int_t AddCaloCluster(const AliESDCaloCluster *c);
 
+  AliESDCaloCells *GetEMCALCells() const {return fEMCALCells; }  
+  AliESDCaloCells *GetPHOSCells() const {return fPHOSCells; }  
+
   AliRawDataErrorLog *GetErrorLog(Int_t i) const {
     return (AliRawDataErrorLog *)fErrorLogs->UncheckedAt(i);
   }
@@ -275,21 +293,27 @@ public:
   Int_t GetNumberOfV0s()      const {return fV0s->GetEntriesFast();}
   Int_t GetNumberOfCascades() const {return fCascades->GetEntriesFast();}
   Int_t GetNumberOfKinks() const {return fKinks->GetEntriesFast();}
+  
   Int_t GetEMCALClusters(TRefArray *clusters) const;
   Int_t GetPHOSClusters(TRefArray *clusters) const;
   Int_t GetNumberOfCaloClusters() const {return fCaloClusters->GetEntriesFast();}
 
+  
+  // Remove this stuff CKB?
+  //---------------------------------------------------
   Int_t GetNumberOfEMCALClusters() const {return fEMCALClusters;}
   void  SetNumberOfEMCALClusters(Int_t clus) {fEMCALClusters = clus;}
   Int_t GetFirstEMCALCluster() const {return fFirstEMCALCluster;}
   void  SetFirstEMCALCluster(Int_t index) {fFirstEMCALCluster = index;}
-  TArrayF *GetEMCALTriggerPosition() const {return  fEMCALTrigger->GetTriggerPosition();}
-  TArrayF *GetEMCALTriggerAmplitudes() const {return  fEMCALTrigger->GetTriggerAmplitudes();}
-
+ 
   Int_t GetNumberOfPHOSClusters() const {return fPHOSClusters;}
   void  SetNumberOfPHOSClusters(Int_t part) { fPHOSClusters = part ; }
   void  SetFirstPHOSCluster(Int_t index) { fFirstPHOSCluster = index ; } 
   Int_t GetFirstPHOSCluster() const  { return fFirstPHOSCluster ; }
+  //-------------------------------------------------------
+
+  TArrayF *GetEMCALTriggerPosition() const {return  fEMCALTrigger->GetTriggerPosition();}
+  TArrayF *GetEMCALTriggerAmplitudes() const {return  fEMCALTrigger->GetTriggerAmplitudes();}
   TArrayF *GetPHOSTriggerPosition() const {return  fPHOSTrigger->GetTriggerPosition();}
   TArrayF *GetPHOSTriggerAmplitudes() const {return  fPHOSTrigger->GetTriggerAmplitudes();}
 
@@ -303,7 +327,7 @@ public:
   void ReadFromTree(TTree *tree);
   TObject* FindListObject(const char *name);
   AliESD *GetAliESDOld(){return fESDOld;}
-  const void WriteToTree(TTree* tree) const {tree->Branch(fESDObjects);}
+  const void WriteToTree(TTree* tree) const;
   void GetStdContent();
   void ResetStdContent();
   void CreateStdContent();
@@ -324,6 +348,7 @@ protected:
   AliESDFMD       *fESDFMD;           //! FMD object containing rough multiplicity
   AliESDVZERO     *fESDVZERO;         //! VZERO object containing rough multiplicity
   AliESDTZERO     *fESDTZERO;         //! TZEROObject
+  AliESDVertex    *fTPCVertex;        //! Primary vertex estimated by the TPC
   AliESDVertex    *fSPDVertex;        //! Primary vertex estimated by the SPD
   AliESDVertex    *fPrimaryVertex;    //! Primary vertex estimated using ESD tracks
   AliMultiplicity *fSPDMult;          //! SPD tracklet multiplicity
@@ -338,6 +363,8 @@ protected:
   TClonesArray *fCascades;         //! Cascade vertices
   TClonesArray *fKinks;            //! Kinks
   TClonesArray *fCaloClusters;     //! Calorimeter clusters for PHOS/EMCAL
+  AliESDCaloCells *fEMCALCells;     //! EMCAL cell info
+  AliESDCaloCells *fPHOSCells;     //! PHOS cell info
   TClonesArray *fErrorLogs;        //! Raw-data reading error messages
  
 
@@ -355,7 +382,7 @@ protected:
   Int_t        fPHOSClusters;     // Number of PHOS clusters (subset of caloclusters)
   Int_t        fFirstPHOSCluster; // First PHOS cluster in the fCaloClusters list 
 
-  ClassDef(AliESDEvent,5)  //ESDEvent class 
+  ClassDef(AliESDEvent,7)  //ESDEvent class 
 };
 #endif