For embedding: use AliESDEvent instead of AliESD (obsolete)

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

diff --git a/STEER/AliESDEvent.h b/STEER/AliESDEvent.h
index 25463c611688135130cb8d34d1d0ed34ba60cee5..0a622b91f0fcfbb4ad274155defb9636cafa5851 100644 (file)
--- a/STEER/AliESDEvent.h
+++ b/STEER/AliESDEvent.h
@@ -34,6 +34,8 @@ class TList;
 // AliESDtrack has to be included so that the compiler 
 // knows its inheritance tree (= that it is a AliVParticle).
 #include "AliESDtrack.h"
+// same for AliESDVertex (which is a AliVVertex)
+#include "AliESDVertex.h"
 
 class AliESDfriend;
 class AliESDVZERO;
@@ -71,6 +73,8 @@ public:
                       kSPDMult,
                       kPHOSTrigger,
                       kEMCALTrigger,
+                      kSPDPileupVertices,
+                      kTrkPileupVertices,
                       kTracks,
                       kMuonTracks,
                       kPmdTracks,
@@ -145,8 +149,10 @@ public:
   Double_t GetZDCEMEnergy(Int_t i=0) const {return fESDZDC->GetZDCEMEnergy(i);}
   Int_t   GetZDCParticipants() const {return fESDZDC->GetZDCParticipants();}
   void    SetZDC(Float_t n1Energy, Float_t p1Energy, Float_t em1Energy, Float_t em2Energy,
-                 Float_t n2Energy, Float_t p2Energy, Int_t participants)
-  {fESDZDC->SetZDC(n1Energy, p1Energy, em1Energy, em2Energy, n2Energy, p2Energy, participants);}
+                 Float_t n2Energy, Float_t p2Energy, Int_t participants, Int_t nPartA,
+                Int_t nPartC, Double_t b, Double_t bA, Double_t bC, UInt_t recoflag)
+  {fESDZDC->SetZDC(n1Energy, p1Energy, em1Energy, em2Energy, n2Energy, p2Energy, 
+   participants, nPartA, nPartC, b, bA, bC,  recoflag);}
 
 
   // FMD
@@ -190,8 +196,10 @@ public:
      return GetPrimaryVertexSPD();
   }
 
-  void SetPrimaryVertex(const AliESDVertex *vertex);
-  const AliESDVertex *GetPrimaryVertex() const {return fPrimaryVertex;}
+  void SetPrimaryVertexTracks(const AliESDVertex *vertex);
+  const AliESDVertex *GetPrimaryVertexTracks() const {return fPrimaryVertex;}
+
+  const AliESDVertex *GetPrimaryVertex() const;
 
   void SetMultiplicity(const AliMultiplicity *mul);
 
@@ -203,6 +211,16 @@ public:
   Bool_t RemoveV0(Int_t i)     const;
   Bool_t RemoveTrack(Int_t i)  const;
 
+  const AliESDVertex *GetPileupVertexSPD(Int_t i) const {
+    return (const AliESDVertex *)fSPDPileupVertices->UncheckedAt(i);
+  }
+  Char_t  AddPileupVertexSPD(const AliESDVertex *vtx);
+
+  const AliESDVertex *GetPileupVertexTracks(Int_t i) const {
+    return (const AliESDVertex *)fTrkPileupVertices->UncheckedAt(i);
+  }
+  Char_t  AddPileupVertexTracks(const AliESDVertex *vtx);
+
   AliESDtrack *GetTrack(Int_t i) const {
     return (AliESDtrack *)fTracks->UncheckedAt(i);
   }
@@ -288,6 +306,12 @@ public:
   void AddEMCALTriggerPosition(TArrayF array)  { fEMCALTrigger->AddTriggerPosition(array); }
   void AddEMCALTriggerAmplitudes(TArrayF array){ fEMCALTrigger->AddTriggerAmplitudes(array); }
 
+  Int_t GetNumberOfPileupVerticesSPD() const {
+     return fSPDPileupVertices->GetEntriesFast();
+  }
+  Int_t GetNumberOfPileupVerticesTracks() const {
+     return fTrkPileupVertices->GetEntriesFast();
+  }
   Int_t GetNumberOfTracks()     const {return fTracks->GetEntriesFast();}
   Int_t GetNumberOfHLTConfMapTracks()     const {return 0;} 
   // fHLTConfMapTracks->GetEntriesFast();}
@@ -333,10 +357,10 @@ public:
   void  Print(Option_t *option="") const;
 
   void AddObject(TObject* obj);
-  void ReadFromTree(TTree *tree);
+  void ReadFromTree(TTree *tree, Option_t* opt = "");
   TObject* FindListObject(const char *name);
   AliESD *GetAliESDOld(){return fESDOld;}
-  const void WriteToTree(TTree* tree) const;
+  void WriteToTree(TTree* tree) const;
   void GetStdContent();
   void ResetStdContent();
   void CreateStdContent();
@@ -347,7 +371,7 @@ public:
 
 protected:
   AliESDEvent(const AliESDEvent&);
-
+  static Bool_t ResetWithPlacementNew(TObject *pObject);
 
   TList *fESDObjects;             // List of esd Objects
 
@@ -365,6 +389,8 @@ protected:
   AliESDCaloTrigger* fEMCALTrigger;    //! PHOS Trigger information
   AliESDACORDE    *fESDACORDE;        //! ACORDE ESD object caontaining bit pattern
 
+  TClonesArray *fSPDPileupVertices;//! Pileup primary vertices reconstructed by SPD 
+  TClonesArray *fTrkPileupVertices;//! Pileup primary vertices reconstructed using the tracks 
   TClonesArray *fTracks;           //! ESD tracks 
   TClonesArray *fMuonTracks;       //! MUON ESD tracks
   TClonesArray *fPmdTracks;        //! PMD ESD tracks
@@ -393,7 +419,7 @@ protected:
   Int_t        fPHOSClusters;     // Number of PHOS clusters (subset of caloclusters)
   Int_t        fFirstPHOSCluster; // First PHOS cluster in the fCaloClusters list 
 
-  ClassDef(AliESDEvent,9)  //ESDEvent class 
+  ClassDef(AliESDEvent,10)  //ESDEvent class 
 };
 #endif