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

diff --git a/EMCAL/AliEMCALGetter.cxx b/EMCAL/AliEMCALGetter.cxx
index 0ba1fe70298c444f249ea51095a008b095675206..d7f965057b8de56b7e95aacc865529a683cab5bb 100644 (file)
--- a/EMCAL/AliEMCALGetter.cxx
+++ b/EMCAL/AliEMCALGetter.cxx
@@ -181,6 +181,23 @@ void AliEMCALGetter::CloseFile()
   gAlice = 0 ; 
 }
 
+//____________________________________________________________________________ 
+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()
 {

diff --git a/EMCAL/AliEMCALGetter.h b/EMCAL/AliEMCALGetter.h
index 3dfc05df9812388c2aad8d61e3657141f0bb9e02..db11014f6216af290e7d4a32e41438057e65af17 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 880e7dd0de07b296fae7c19d5940ab6228f61f24..a2656621f1d512c06e71375cf5befd6f4bc5ef60 100644 (file)
--- a/PHOS/AliPHOSGetter.cxx
+++ b/PHOS/AliPHOSGetter.cxx
@@ -172,6 +172,24 @@ void AliPHOSGetter::CloseFile()
   gAlice = 0 ; 
 }
 
+//____________________________________________________________________________ 
+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()
 {
@@ -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 c5c5adb3ca47e98c3b2281302b40fc45a903fb7e..42af48356cc056904468e5c81e4b08d2a613b49b 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) ;