Added Folder() to remove all hard coded name of folders

diff --git a/EMCAL/AliEMCALGetter.cxx b/EMCAL/AliEMCALGetter.cxx
index 0ba1fe7..d7f9650 100644 (file)
--- a/EMCAL/AliEMCALGetter.cxx
+++ b/EMCAL/AliEMCALGetter.cxx
@@ -182,6 +182,23 @@ void AliEMCALGetter::CloseFile()
 }
 
 //____________________________________________________________________________ 
+const TFolder * AliEMCALGetter::Folder(const TString what) const {
+
+  // returns the EMCAL folder required by what
+  // what = hits, sdigits, digits
+
+  if ( what == "hits" ) 
+    return dynamic_cast<const TFolder *>(fHitsFolder->FindObject("EMCAL")) ; 
+  else if ( what == "sdigits" ) 
+    return  dynamic_cast<const TFolder *>(fSDigitsFolder->FindObject("EMCAL")) ; 
+  else if ( what == "digits" ) 
+    return  dynamic_cast<const TFolder *>(fDigitsFolder->FindObject("EMCAL")) ; 
+  else {
+    cerr << "ERROR: AliEMCALGetter::GetFolder -> " << what.Data() << " illegal option (hits, sdigits, digits) " << endl ; 
+    return 0 ; 
+  }
+}
+//____________________________________________________________________________ 
 AliEMCALGetter * AliEMCALGetter::GetInstance()
 {
   // Returns the pointer of the unique instance already defined

diff --git a/EMCAL/AliEMCALGetter.h b/EMCAL/AliEMCALGetter.h
index 3dfc05d..db11014 100644 (file)
--- a/EMCAL/AliEMCALGetter.h
+++ b/EMCAL/AliEMCALGetter.h
@@ -63,6 +63,7 @@ class AliEMCALGetter : public TObject {
   virtual ~AliEMCALGetter() ; 
   
   void CloseFile() ;  
+  const TFolder * Folder(const TString what) const ;
   const Bool_t HasFailed(void) const {return fFailed ;} 
   Bool_t PostHits(void ) const ;  
   Bool_t PostSDigits(      const char * name,  const char * file = 0) const ;  

diff --git a/PHOS/AliPHOSGetter.cxx b/PHOS/AliPHOSGetter.cxx
index 880e7dd..a265662 100644 (file)
--- a/PHOS/AliPHOSGetter.cxx
+++ b/PHOS/AliPHOSGetter.cxx
@@ -173,6 +173,24 @@ void AliPHOSGetter::CloseFile()
 }
 
 //____________________________________________________________________________ 
+const TFolder * AliPHOSGetter::Folder(const TString what) const {
+
+  // returns the PHOS folder required by what
+  // what = hits, sdigits, digits
+
+  if ( what == "hits" ) 
+    return dynamic_cast<const TFolder *>(fHitsFolder->FindObject("PHOS")) ; 
+  else if ( what == "sdigits" ) 
+    return  dynamic_cast<const TFolder *>(fSDigitsFolder->FindObject("PHOS")) ; 
+  else if ( what == "digits" ) 
+    return  dynamic_cast<const TFolder *>(fDigitsFolder->FindObject("PHOS")) ; 
+  else {
+    cerr << "ERROR: AliPHOSGetter::GetFolder -> " << what.Data() << " illegal option (hits, sdigits, digits) " << endl ; 
+    return 0 ; 
+  }
+}
+
+//____________________________________________________________________________ 
 AliPHOSGetter * AliPHOSGetter::GetInstance()
 {
   // Returns the pointer of the unique instance already defined
@@ -1404,6 +1422,7 @@ Int_t AliPHOSGetter::ReadTreeD()
   
   
   // read  the Digitizer
+  RemoveTask("D", fDigitsTitle) ;
   if(!Digitizer(fDigitsTitle))
     PostDigitizer(fDigitsTitle) ;
   digitizerbranch->SetAddress(DigitizerRef(fDigitsTitle)) ;

diff --git a/PHOS/AliPHOSGetter.h b/PHOS/AliPHOSGetter.h
index c5c5adb..42af483 100644 (file)
--- a/PHOS/AliPHOSGetter.h
+++ b/PHOS/AliPHOSGetter.h
@@ -63,6 +63,7 @@ class AliPHOSGetter : public TObject {
   virtual ~AliPHOSGetter() ; 
   
   void CloseFile() ;  
+  const TFolder * Folder(const TString what) const ;
   void ListBranches(Int_t event=0) const ;
   void NewBranch(TString name, Int_t event = 0) ; 
   Bool_t NewFile(TString name) ;