upgraded the version number

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

diff --git a/STEER/AliAODEvent.h b/STEER/AliAODEvent.h
index d34a1c9ff5a6fe355cd8f866136a5eccee47afe4..d648082059301f371ac1d5b52626208b8ad012b6 100644 (file)
--- a/STEER/AliAODEvent.h
+++ b/STEER/AliAODEvent.h
@@ -74,12 +74,16 @@ class AliAODEvent : public AliVEvent {
   void     SetOrbitNumber(UInt_t n) {if (fHeader) fHeader->SetOrbitNumber(n);}
   void     SetBunchCrossNumber(UShort_t n) {if (fHeader) fHeader->SetBunchCrossNumber(n);}
   void     SetMagneticField(Double_t mf){if (fHeader) fHeader->SetMagneticField(mf);}
+  void     SetDiamond(Float_t xy[2],Float_t cov[3]){if (fHeader) fHeader->SetDiamond(xy,cov);}
 
   Int_t    GetRunNumber() const {return fHeader ? fHeader->GetRunNumber() : -999;}
   UInt_t   GetPeriodNumber() const {return fHeader ? fHeader->GetPeriodNumber() : 0;}
   UInt_t   GetOrbitNumber() const {return fHeader ? fHeader->GetOrbitNumber() : 0;}
   UShort_t GetBunchCrossNumber() const {return fHeader ? fHeader->GetBunchCrossNumber() : 0;}
   Double_t GetMagneticField() const {return fHeader ? fHeader->GetMagneticField() : -999.;}
+  Double_t GetDiamondX() const {return fHeader ? fHeader->GetDiamondX() : -999.;}
+  Double_t GetDiamondY() const {return fHeader ? fHeader->GetDiamondY() : -999.;}
+  void     GetDiamondCovXY(Float_t cov[3]) const {cov[0]=-999.; if(fHeader) fHeader->GetDiamondCovXY(cov);}
   
   void      SetEventType(UInt_t eventType){fHeader->SetEventType(eventType);}
   void      SetTriggerMask(ULong64_t n) {fHeader->SetTriggerMask(n);}
@@ -106,7 +110,7 @@ class AliAODEvent : public AliVEvent {
 
   // -- Vertex
   TClonesArray *GetVertices()            const { return fVertices; }
-  Int_t         GetNVertices()           const { return fVertices->GetEntriesFast(); }
+  Int_t         GetNumberOfVertices()    const { return fVertices->GetEntriesFast(); }
   AliAODVertex *GetVertex(Int_t nVertex) const { return (AliAODVertex*)fVertices->UncheckedAt(nVertex); }
   Int_t         AddVertex(const AliAODVertex* vtx)
   {new((*fVertices)[fVertices->GetEntriesFast()]) AliAODVertex(*vtx); return fVertices->GetEntriesFast()-1;}
@@ -116,7 +120,7 @@ class AliAODEvent : public AliVEvent {
 
   // V0
   TClonesArray *GetV0s()                 const { return fV0s; }
-  Int_t         GetNV0s()                const { return fV0s->GetEntriesFast(); }
+  Int_t         GetNumberOfV0s()         const { return fV0s->GetEntriesFast(); }
   AliAODv0     *GetV0(Int_t nV0)         const { return (AliAODv0*)fV0s->UncheckedAt(nV0); }
   Int_t         AddV0(const AliAODv0* v0)
   {new((*fV0s)[fV0s->GetEntriesFast()]) AliAODv0(*v0); return fV0s->GetEntriesFast()-1;}
@@ -128,6 +132,10 @@ class AliAODEvent : public AliVEvent {
   Int_t         AddCaloCluster(const AliAODCaloCluster* clus)
   {new((*fCaloClusters)[fCaloClusters->GetEntriesFast()]) AliAODCaloCluster(*clus); return fCaloClusters->GetEntriesFast()-1;}
 
+  Int_t GetEMCALClusters(TRefArray *clusters) const;
+  Int_t GetPHOSClusters(TRefArray *clusters) const;
+
+
   // -- FMD Cluster
   TClonesArray *GetFmdClusters()        const { return fFmdClusters; }
   Int_t         GetNFmdClusters()       const { return fFmdClusters->GetEntriesFast(); }
@@ -169,16 +177,17 @@ class AliAODEvent : public AliVEvent {
                   Int_t fmdClusSize = 0, 
                   Int_t pmdClusSize = 0);
   void    ClearStd();
-  void    ReadFromTree(TTree *tree);
-  const void WriteToTree(TTree* tree) const {tree->Branch(fAODObjects);}
+  void    ReadFromTree(TTree *tree, Option_t* opt = "");
+  void    WriteToTree(TTree* tree) const {tree->Branch(fAODObjects);}
 
   void  Print(Option_t *option="") const;
-
+  void  MakeEntriesReferencable();
+  static void AssignIDtoCollection(TCollection* col);
  private :
 
   TList   *fAODObjects; //  list of AODObjects
   TFolder *fAODFolder;  //  folder structure of branches
- 
+  Bool_t   fConnected;  //! flag if leaves are alreday connected 
   // standard content
   AliAODHeader    *fHeader;       //! event information
   TClonesArray    *fTracks;       //! charged tracks