Corrected tag names

sevdokim · Feb 2, 2010 · 64e34b3 · 64e34b3
2 parents 68be95b + 9873850
commit 64e34b3
Show file tree

Hide file tree

Showing 149 changed files with 2,849 additions and 6,685 deletions.
diff --git a/ANALYSIS/AliAnalysisManager.cxx b/ANALYSIS/AliAnalysisManager.cxx
@@ -454,11 +454,8 @@ void AliAnalysisManager::PackOutput(TList *target)
             if (strlen(filename) && !isManagedByHandler) {
                // Backup current folder
                TDirectory *opwd = gDirectory;
-               // File resident outputs. 
-               // Check first if the file exists.
-               TString open_option = "RECREATE";
-               if (!gSystem->AccessPathName(output->GetFileName())) open_option = "UPDATE";
-               TFile *file = AliAnalysisManager::OpenFile(output, open_option, kTRUE);
+               // File resident outputs
+               TFile *file = AliAnalysisManager::OpenFile(output, "RECREATE", kTRUE);
                // Clear file list to release object ownership to user.
                file->Clear();
                // Save data to file, then close.
@@ -754,28 +751,20 @@ void AliAnalysisManager::Terminate()
    if (fOutputEventHandler)  fOutputEventHandler ->TerminateIO();
    if (fMCtruthEventHandler) fMCtruthEventHandler->TerminateIO();
    TIter next1(fOutputs);
-   TString handlerFile = "";
-   if (fOutputEventHandler) {
-      handlerFile = fOutputEventHandler->GetOutputFileName();
-   }
    while ((output=(AliAnalysisDataContainer*)next1())) {
       // Special outputs or grid files have the files already closed and written.
       if (fMode == kGridAnalysis) continue;
       if (fMode == kProofAnalysis) {
         if (output->IsSpecialOutput() || output->IsRegisterDataset()) continue;
       }  
       const char *filename = output->GetFileName();
-      TString open_option = "RECREATE";
       if (!(strcmp(filename, "default"))) continue;
       if (!strlen(filename)) continue;
       if (!output->GetData()) continue;
       TDirectory *opwd = gDirectory;
       TFile *file = output->GetFile();
       if (!file) file = (TFile*)gROOT->GetListOfFiles()->FindObject(filename);
-      if (!file) {
-         if (handlerFile == filename && !gSystem->AccessPathName(filename)) open_option = "UPDATE";
-         file = new TFile(filename, open_option);
-      }
+      if (!file) file = new TFile(filename, "RECREATE");
       if (file->IsZombie()) {
          Error("Terminate", "Cannot open output file %s", filename);
          continue;
@@ -1294,7 +1283,7 @@ TFile *AliAnalysisManager::OpenFile(AliAnalysisDataContainer *cont, const char *
       TString opt(option);
       opt.ToUpper();
       if ((opt=="UPDATE") && (opt!=f->GetOption())) 
-        ::Info("AliAnalysisManager::OpenFile", "File %s already opened in %s mode!", cont->GetFileName(), f->GetOption());
+        ::Fatal("AliAnalysisManager::OpenFile", "File %s already opened, but not in UPDATE mode!", cont->GetFileName());
     } else {
       f = TFile::Open(filename, option);
     }    
@@ -1338,7 +1327,7 @@ TFile *AliAnalysisManager::OpenProofFile(AliAnalysisDataContainer *cont, const c
       TString opt(option);
       opt.ToUpper();
       if ((opt=="UPDATE") && (opt!=f->GetOption()))
-        ::Info("OpenProofFile", "File %s already opened in %s mode!", cont->GetFileName(), f->GetOption());
+        Fatal("OpenProofFile", "File %s already opened, but not in UPDATE mode!", cont->GetFileName());
     } else {
       f = new TFile(filename, option);
     }

diff --git a/ANALYSIS/AliAnalysisTaskSE.cxx b/ANALYSIS/AliAnalysisTaskSE.cxx
@@ -280,20 +280,12 @@ void AliAnalysisTaskSE::Exec(Option_t* option)
 //
 // Exec analysis of one event
     if (fDebug > 1) AliInfo("AliAnalysisTaskSE::Exec() \n");
-//
-    AliAODHandler* handler = (AliAODHandler*) 
-	((AliAnalysisManager::GetAnalysisManager())->GetOutputEventHandler());
-    AliAODInputHandler* aodH = dynamic_cast<AliAODInputHandler*>(fInputHandler);
-//
-// Was event selected ?
+
     Bool_t isSelected = kTRUE;
     if( fInputHandler ) {
       isSelected = fInputHandler->IsEventSelected();
       fEntry = fInputHandler->GetReadEntry();
     }
-
-    if (handler) handler->SetFillAOD(isSelected);
-
 
 // Notify the change of run number
     if (InputEvent()->GetRunNumber() != fCurrentRunNumber) {
@@ -306,8 +298,9 @@ void AliAnalysisTaskSE::Exec(Option_t* option)
     if ( !((Entry()-1)%100) && fDebug > 0) 
          AliInfo(Form("%s ----> Processing event # %lld", CurrentFileName(), Entry()));
 
-
-
+    AliAODHandler* handler = (AliAODHandler*) 
+	((AliAnalysisManager::GetAnalysisManager())->GetOutputEventHandler());
+    AliAODInputHandler* aodH = dynamic_cast<AliAODInputHandler*>(fInputHandler);
 
     if (handler && aodH) {
 	fMCEvent = aodH->MCEvent();