New ESD format (with TTree)

diff --git a/PHOS/AliPHOSGetter.cxx b/PHOS/AliPHOSGetter.cxx
index 7a6a8227da4b1065567271a4ac6259f2280b25b7..6e9bfb620c12cfa3c5a2de2400ab3b7f80a3ab15 100644 (file)
--- a/PHOS/AliPHOSGetter.cxx
+++ b/PHOS/AliPHOSGetter.cxx
@@ -100,6 +100,8 @@ AliPHOSGetter::AliPHOSGetter(const char* headerFile, const char* version, Option
   fESDFileName = rl->GetFileName()  ; // this should be the galice.root file
   fESDFileName.ReplaceAll("galice.root", "AliESDs.root") ;  
   fESDFile = 0 ; 
+  fESD = 0 ; 
+  fESDTree = 0 ; 
 }
 
 //____________________________________________________________________________ 
@@ -112,7 +114,11 @@ AliPHOSGetter::~AliPHOSGetter()
   fBTE = 0 ; 
   fPrimaries->Delete() ; 
   delete fPrimaries ; 
-  fgObjGetter = 0; 
+  fgObjGetter = 0;
+  if (fESD) 
+    delete fESD ; 
+  if (fESDTree) 
+    delete fESDTree ; 
 }
 
 //____________________________________________________________________________ 
@@ -294,7 +300,11 @@ void AliPHOSGetter::Event(Int_t event, const char* opt)
 
   if( strstr(opt,"P") )
     ReadTreeP() ;
+
+  if( strstr(opt,"E") )
+    ReadTreeE(event) ;
  
+
 //   if( strstr(opt,"Q") )
 //     ReadTreeQA() ;
  
@@ -484,22 +494,6 @@ void AliPHOSGetter::ReadPrimaries()
   }
 }
 
-//____________________________________________________________________________ 
-AliESD * AliPHOSGetter::ESD(Int_t event)
-{
-  //Read the ESD
-
-  AliESD * esd = 0 ; 
-  if (!fESDFile)
-    if ( !OpenESDFile() ) 
-      return esd ; 
-
-  TString esdEvent("ESD") ;  
-  esdEvent+= event ; 
-  esd = dynamic_cast<AliESD *>(fESDFile->Get(esdEvent)) ; 
-  return esd ; 
-}
-
 //____________________________________________________________________________ 
 Bool_t AliPHOSGetter::OpenESDFile() 
 {
@@ -610,6 +604,29 @@ Int_t AliPHOSGetter::ReadTreeS()
   return SDigits()->GetEntries() ; 
 }
 
+//____________________________________________________________________________ 
+Int_t AliPHOSGetter::ReadTreeE(Int_t event)
+{
+  // Read the ESD
+  
+  // gets esdTree from the root file (AliESDs.root)
+  if (!fESDFile)
+    if ( !OpenESDFile() ) 
+      return -1 ; 
+
+  fESDTree = static_cast<TTree*>(fESDFile->Get("esdTree")) ; 
+  fESD = new AliESD;
+   if (!fESDTree) {
+
+     Error("ReadTreeE", "no ESD tree found");
+     return -1;
+   }
+   fESDTree->SetBranchAddress("ESD", &fESD);
+   fESDTree->GetEvent(event);
+
+   return event ; 
+}
+
 //____________________________________________________________________________ 
 TClonesArray * AliPHOSGetter::SDigits() 
 {

diff --git a/PHOS/AliPHOSGetter.h b/PHOS/AliPHOSGetter.h
index e647553ee7e5cdf083664b5cf7f6b8bb13cfd85d..07240ec9022eb23e0ef35f460dffbe54290c4924 100644 (file)
--- a/PHOS/AliPHOSGetter.h
+++ b/PHOS/AliPHOSGetter.h
@@ -184,8 +184,7 @@ public:
   AliPHOSLoader * PhosLoader() const { return  fgPhosLoader ; }
   void Reset() ;
   
-  AliESD * ESD(Int_t event = 0) ;
-  Bool_t OpenESDFile() ;
+  AliESD * ESD() const { return fESD ; }
   
 private:
   
@@ -199,7 +198,9 @@ private:
   Int_t ReadTreeT(void) ;
   Int_t ReadTreeS(void) ;
   Int_t ReadTreeP(void) ;
-   
+
+  Int_t ReadTreeE(Int_t event) ;    
+  Bool_t OpenESDFile() ;
   void ReadPrimaries(void) ;
   
 private:
@@ -212,7 +213,9 @@ private:
   TClonesArray *    fPrimaries ;         //! list of lists of primaries
   TFile *           fESDFile ;           //! ESD file
   TString           fESDFileName ;       //! ESD File Name
-  
+  AliESD *          fESD ;               //! ESD object
+  TTree *           fESDTree ;           //! ESD Tree
+
   //  AliPHOSCalibrationDB * fcdb ;       //!
   
   static AliPHOSLoader * fgPhosLoader ; // the loader for the NewIO