X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ANALYSIS%2FAliAnalysisGoodies.cxx;h=f2ce7d0b75d849b051584f6ebaae9ad66baab83d;hb=3bc229d88e8803035c2bfbecf68ef8c244288842;hp=16ec7a3a9fa042fcb1de4d5562c2625aa0990a29;hpb=2acc7de8030628ec6d2c075b4adff8876b945a6d;p=u%2Fmrichter%2FAliRoot.git

diff --git a/ANALYSIS/AliAnalysisGoodies.cxx b/ANALYSIS/AliAnalysisGoodies.cxx
index 16ec7a3a9fa..f2ce7d0b75d 100644
--- a/ANALYSIS/AliAnalysisGoodies.cxx
+++ b/ANALYSIS/AliAnalysisGoodies.cxx
@@ -33,6 +33,7 @@
 #ifdef WITHALIEN
 #include <TGridResult.h>
 #include <TFileMerger.h>
+#include <TFile.h> 
 #endif
 #include <TChain.h>
 #include <TGrid.h>
@@ -142,8 +143,6 @@ Bool_t AliAnalysisGoodies::Alien2Local(const TString collectionNameIn, const TSt
   collectionOu->SetCollectionName(collectionNameOu) ; 
   collectionOu->WriteHeader() ; 
 
-  TFileMerger merger ; 
-  
   const char* ocwd = gSystem->WorkingDirectory();
 
   Int_t counter = 1 ;  
@@ -171,7 +170,7 @@ Bool_t AliAnalysisGoodies::Alien2Local(const TString collectionNameIn, const TSt
     AliInfo(Form("Copying %s to %s\n", fileTURL.Data(), dir.Data())) ;  
     collectionOu->WriteBody(counter, collectionIn->GetGUID(""), collectionIn->GetLFN(""), dir, list) ;
     counter++ ;
-    merger.Cp(fileTURL, dir) ;
+    TFile::Cp(fileTURL, dir) ;
   }
   collectionOu->Export() ;
   gSystem->ChangeDirectory(ocwd) ; 
@@ -229,10 +228,10 @@ AliAnalysisDataContainer *  AliAnalysisGoodies::ConnectOuput(AliAnalysisTask * t
   char filename[20] ; 
 
     if (opt == "AOD" ) {    
-      if ( fAmgr->GetEventHandler() == 0x0) {
+      if ( fAmgr->GetOutputEventHandler() == 0x0) {
 	AliAODHandler * aodHandler = new AliAODHandler() ; 
 	aodHandler->SetOutputFileName(Form("%s_0.root",task->GetName())) ; 
-	fAmgr->SetEventHandler(aodHandler) ;
+	fAmgr->SetOutputEventHandler(aodHandler) ;
       } 
       sprintf(filename, "default") ; 
     }