Add inheritance from AliVEvent. Eliminate streaming names. Minor bug fixes (Markus)

diff --git a/STEER/AliESDEvent.cxx b/STEER/AliESDEvent.cxx
index dbb22bd7b55ecb3a158e8051a891c1a16567112b..5dc124aafba9b7ef45cdc6faff98698e5dd09d82 100644 (file)
--- a/STEER/AliESDEvent.cxx
+++ b/STEER/AliESDEvent.cxx
@@ -80,6 +80,7 @@ ClassImp(AliESDEvent)
                                                       "AliRawDataErrorLogs"};
 //______________________________________________________________________________
 AliESDEvent::AliESDEvent():
+  AliVEvent(),
   fESDObjects(new TList()),
   fESDRun(0),
   fHeader(0),
@@ -111,7 +112,7 @@ AliESDEvent::AliESDEvent():
 }
 //______________________________________________________________________________
 AliESDEvent::AliESDEvent(const AliESDEvent& esd):
-  TObject(esd),
+  AliVEvent(esd),
   fESDObjects(new TList()),
   fESDRun(new AliESDRun(*esd.fESDRun)),
   fHeader(new AliESDHeader(*esd.fHeader)),
@@ -173,7 +174,7 @@ AliESDEvent & AliESDEvent::operator=(const AliESDEvent& source) {
   // Assignment operator
 
   if(&source == this) return *this;
-  TObject::operator=(source);
+  AliVEvent::operator=(source);
 
   fESDRun = new AliESDRun(*source.fESDRun);
   fHeader = new AliESDHeader(*source.fHeader);
@@ -352,6 +353,8 @@ void AliESDEvent::Print(Option_t *) const
   printf("                 emcal     %d\n", GetNumberOfEMCALClusters());
   printf("                 FMD       %s\n", (fESDFMD ? "yes" : "no"));
   printf("                 VZERO     %s\n", (fESDVZERO ? "yes" : "no"));
+
+  return;
 }
 
 void AliESDEvent::SetESDfriend(const AliESDfriend *ev) {
@@ -588,9 +591,6 @@ void AliESDEvent::CreateStdContent()
   SetStdNames();
   // read back pointers
   GetStdContent();
-
-
-
 }
 
 TObject* AliESDEvent::FindListObject(const char *name){
@@ -599,8 +599,10 @@ TObject* AliESDEvent::FindListObject(const char *name){
 } 
 
 void AliESDEvent::ReadFromTree(TTree *tree){
-  
- 
+
+  // load the TTree
+  tree->LoadTree(0);
+
   // if we find the "ESD" branch on the tree we do have the old structure
   if(tree->GetBranch("ESD")){
       char ** address = (char **)(tree->GetBranch("ESD")->GetAddress());

diff --git a/STEER/AliESDEvent.h b/STEER/AliESDEvent.h
index c24398187fc4c404b89d0210f1b9a9ab844a4b1a..5ef58162abf9d95873a1c1c75ab23493943efaf5 100644 (file)
--- a/STEER/AliESDEvent.h
+++ b/STEER/AliESDEvent.h
@@ -22,14 +22,18 @@
 
 class TList;
 
-
-// some includes for delegeated methds
+#include "AliVEvent.h"
+// some includes for delegeated methods
 #include "AliESDCaloTrigger.h"
 #include "AliESDRun.h"
 #include "AliESDHeader.h"
 #include "AliESDTZERO.h"
 #include "AliESDZDC.h"
 
+// AliESDtrack has to be included so that the compiler 
+// knows its inheritance tree (= that it is a AliVParticle).
+#include "AliESDtrack.h"
+
 class AliESDfriend;
 class AliESDVZERO;
 class AliESDHLTtrack;
@@ -37,7 +41,6 @@ class AliESDVertex;
 class AliESDPmdTrack;
 class AliESDFMD;
 class AliESDkink;
-class AliESDtrack;
 class AliESDCaloCluster;
 class AliESDv0;
 class AliESDFMD;
@@ -49,7 +52,7 @@ class AliESDMuonTrack;
 class AliESD;
 class AliESDcascade;
 
-class AliESDEvent : public TObject {
+class AliESDEvent : public AliVEvent {
 public:
 
 
@@ -85,22 +88,22 @@ public:
   const AliESDRun*    GetESDRun() const {return fESDRun;}
 
   // Delegated methods for fESDRun
-  void    SetRunNumber(Int_t n) {fESDRun->SetRunNumber(n);}
-  Int_t   GetRunNumber() const {return fESDRun->GetRunNumber();}
-  void    SetPeriodNumber(Int_t n){fESDRun->SetPeriodNumber(n);}
-  Int_t   GetPeriodNumber() const {return fESDRun->GetPeriodNumber();}
-  void    SetMagneticField(Float_t mf){fESDRun->SetMagneticField(mf);}
-  Float_t GetMagneticField() const {return fESDRun->GetMagneticField();}
-  void SetDiamond(const AliESDVertex *vertex) { fESDRun->SetDiamond(vertex);}
-  Float_t GetDiamondX() const {return fESDRun->GetDiamondX();}
-  Float_t GetDiamondY() const {return fESDRun->GetDiamondY();}
-  Float_t GetSigma2DiamondX() const {return  fESDRun->GetSigma2DiamondX();}
-  Float_t GetSigma2DiamondY() const {return  fESDRun->GetSigma2DiamondY();}
-  void GetDiamondCovXY(Float_t cov[3]) const {fESDRun->GetDiamondCovXY(cov);}   
+  void     SetRunNumber(Int_t n) {fESDRun->SetRunNumber(n);}
+  Int_t    GetRunNumber() const {return fESDRun->GetRunNumber();}
+  void     SetPeriodNumber(UInt_t n){fESDRun->SetPeriodNumber(n);}
+  UInt_t   GetPeriodNumber() const {return fESDRun->GetPeriodNumber();}
+  void     SetMagneticField(Double_t mf){fESDRun->SetMagneticField(mf);}
+  Double_t GetMagneticField() const {return fESDRun->GetMagneticField();}
+  void     SetDiamond(const AliESDVertex *vertex) { fESDRun->SetDiamond(vertex);}
+  Float_t  GetDiamondX() const {return fESDRun->GetDiamondX();}
+  Float_t  GetDiamondY() const {return fESDRun->GetDiamondY();}
+  Float_t  GetSigma2DiamondX() const {return  fESDRun->GetSigma2DiamondX();}
+  Float_t  GetSigma2DiamondY() const {return  fESDRun->GetSigma2DiamondY();}
+  void     GetDiamondCovXY(Float_t cov[3]) const {fESDRun->GetDiamondCovXY(cov);}   
   
 
   // HEADER
-  const AliESDHeader* GetHeader() const {return fHeader;}
+  AliESDHeader* GetHeader() const {return fHeader;}
 
   // Delegated methods for fHeader
   void      SetTriggerMask(ULong64_t n) {fHeader->SetTriggerMask(n);}
@@ -123,11 +126,11 @@ public:
   const AliESDZDC*    GetESDZDC() const {return fESDZDC;}
 
   // Delegated methods for fESDZDC
-  Float_t GetZDCN1Energy() const {return fESDZDC->GetZDCN1Energy();}
-  Float_t GetZDCP1Energy() const {return fESDZDC->GetZDCP1Energy();}
-  Float_t GetZDCN2Energy() const {return fESDZDC->GetZDCN2Energy();}
-  Float_t GetZDCP2Energy() const {return fESDZDC->GetZDCP2Energy();}
-  Float_t GetZDCEMEnergy() const {return fESDZDC->GetZDCEMEnergy();}
+  Double_t GetZDCN1Energy() const {return fESDZDC->GetZDCN1Energy();}
+  Double_t GetZDCP1Energy() const {return fESDZDC->GetZDCP1Energy();}
+  Double_t GetZDCN2Energy() const {return fESDZDC->GetZDCN2Energy();}
+  Double_t GetZDCP2Energy() const {return fESDZDC->GetZDCP2Energy();}
+  Double_t GetZDCEMEnergy() const {return fESDZDC->GetZDCEMEnergy();}
   Int_t   GetZDCParticipants() const {return fESDZDC->GetZDCParticipants();}
   void    SetZDC(Float_t n1Energy, Float_t p1Energy, Float_t emEnergy,
                  Float_t n2Energy, Float_t p2Energy, Int_t participants)
@@ -300,7 +303,7 @@ public:
   void CreateStdContent();
   void SetStdNames();
   void CopyFromOldESD();
-  TList* GetList(){return fESDObjects;}
+  TList* GetList() const {return fESDObjects;}
 
 protected:
   AliESDEvent(const AliESDEvent&);
@@ -336,7 +339,7 @@ protected:
   AliESD    *fESDOld;              //! Old esd Structure
   Bool_t    fConnected;            //! flag if leaves are alreday connected
 
-  static const char* fESDListName[kESDListN];
+  static const char* fESDListName[kESDListN]; //!
 
   // Remove this stuff CKB
   Int_t        fEMCALClusters;   // Number of EMCAL clusters (subset of caloclusters)
@@ -345,7 +348,7 @@ protected:
   Int_t        fPHOSClusters;     // Number of PHOS clusters (subset of caloclusters)
   Int_t        fFirstPHOSCluster; // First PHOS cluster in the fCaloClusters list 
 
-  ClassDef(AliESDEvent,2)  //ESDEvent class 
+  ClassDef(AliESDEvent,1)  //ESDEvent class 
 };
 #endif