Merge branch 'master' into flatdev

[u/mrichter/AliRoot.git] / ANALYSIS / AliAnalysisSelector.cxx

diff --git a/ANALYSIS/AliAnalysisSelector.cxx b/ANALYSIS/AliAnalysisSelector.cxx
index 4379c2fda6b2d19338c39b7993241b48b2ee0a93..3873dcf5c6bafc6ccefaafa28bddd2c0eca85c1a 100644 (file)
--- a/ANALYSIS/AliAnalysisSelector.cxx
+++ b/ANALYSIS/AliAnalysisSelector.cxx
@@ -23,12 +23,15 @@
 
 #include <Riostream.h>
 #include <TProcessID.h>
+#include <TROOT.h>
 
 #include "AliAnalysisManager.h"
 #include "AliAnalysisTask.h"
 #include "AliAnalysisDataContainer.h"
 #include "AliAnalysisSelector.h"
 
+using std::cout;
+using std::endl;
 ClassImp(AliAnalysisSelector)
 
 //______________________________________________________________________________
@@ -100,6 +103,7 @@ void AliAnalysisSelector::Begin(TTree *)
    RestoreAnalysisManager();
    if (fAnalysis && fAnalysis->GetDebugLevel()>1) {
       cout << "->AliAnalysisSelector->Begin: Analysis manager restored" << endl;
+      gROOT->SetMustClean(fAnalysis->MustClean());
    }
 }
 
@@ -107,9 +111,9 @@ void AliAnalysisSelector::Begin(TTree *)
 void AliAnalysisSelector::SlaveBegin(TTree *tree)
 {
 // Called on each worker. We "unpack" analysis manager here and call InitAnalysis.
-   TObject::SetObjectStat(kFALSE);
    RestoreAnalysisManager();
    if (fAnalysis) {
+      gROOT->SetMustClean(fAnalysis->MustClean());
       if (fAnalysis->GetDebugLevel()>1) {
          cout << "->AliAnalysisSelector->SlaveBegin() after Restore" << endl;
       }   
@@ -157,7 +161,7 @@ Bool_t AliAnalysisSelector::Process(Long64_t entry)
       return kFALSE;
    } else {
       fAnalysis->ExecAnalysis();
-      if (returnCode<100000000) fAnalysis->CountEvent(1,1,0,0);
+      fAnalysis->CountEvent(1,1,0,0);
    }   
    if (fAnalysis->GetDebugLevel() > 1) {
       cout << "<-AliAnalysisSelector::Process()" << endl;
@@ -178,7 +182,7 @@ void AliAnalysisSelector::RestoreAnalysisManager()
             fAnalysis->SetSelector(this);
             if (fAnalysis->GetDebugLevel()>1) {
                cout << "->AliAnalysisSelector->RestoreAnalysisManager: Analysis manager restored" << endl;
-            }   
+            }
             break;
          }
       }
@@ -195,6 +199,7 @@ void AliAnalysisSelector::SlaveTerminate()
   // The SlaveTerminate() function is called after all entries or objects
   // have been processed. When running with PROOF SlaveTerminate() is called
   // on each slave server.
+   gROOT->SetMustClean(kTRUE);
    if (fStatus == -1) return;  // TSelector won't abort...
    if (fAnalysis->GetAnalysisType() == AliAnalysisManager::kMixingAnalysis) return;
    if (fAnalysis->GetDebugLevel() > 1) {
@@ -212,6 +217,7 @@ void AliAnalysisSelector::Terminate()
   // The Terminate() function is the last function to be called during
   // a query. It always runs on the client, it can be used to present
   // the results graphically or save the results to file.
+   gROOT->SetMustClean(kTRUE);
    if (fStatus == -1) return;  // TSelector won't abort...
    if (!fAnalysis) {
       Error("Terminate","AliAnalysisSelector::Terminate: No analysis manager!!!");