Retagging v5-02-Rev-02

sevdokim · Mar 6, 2012 · 9fa3531 · 9fa3531
2 parents 5be6844 + dd80c25
commit 9fa3531
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/ANALYSIS/AliAnalysisManager.cxx b/ANALYSIS/AliAnalysisManager.cxx
@@ -71,6 +71,7 @@ AliAnalysisManager::AliAnalysisManager(const char *name, const char *title)
                     fNSysInfo(0),
                     fMode(kLocalAnalysis),
                     fInitOK(kFALSE),
+                    fMustClean(kFALSE),
                     fIsRemote(kFALSE),
                     fDebug(0),
                     fSpecialOutputLocation(""), 
@@ -124,6 +125,7 @@ AliAnalysisManager::AliAnalysisManager(const AliAnalysisManager& other)
                     fNSysInfo(0),
                     fMode(other.fMode),
                     fInitOK(other.fInitOK),
+                    fMustClean(other.fMustClean),
                     fIsRemote(other.fIsRemote),
                     fDebug(other.fDebug),
                     fSpecialOutputLocation(""), 

diff --git a/ANALYSIS/AliAnalysisManager.h b/ANALYSIS/AliAnalysisManager.h
@@ -186,6 +186,8 @@ enum EAliAnalysisFlags {
    Bool_t               IsExternalLoop() const {return TObject::TestBit(kExternalLoop);}
    Bool_t               IsEventLoop() const {return TObject::TestBit(kEventLoop);}
    Bool_t               IsSkipTerminate() const {return TObject::TestBit(kSkipTerminate);}
+   Bool_t               MustClean() const {return fMustClean;}
+   void                 SetMustClean(Bool_t flag=kTRUE) {fMustClean = flag;}
    void                 ResetAnalysis();
    void                 ExecAnalysis(Option_t *option="");
    void                 PrintStatus(Option_t *option="all") const;
@@ -217,6 +219,7 @@ enum EAliAnalysisFlags {
    Long64_t                fNSysInfo;            // Event frequency for collecting system information
    EAliAnalysisExecMode    fMode;                // Execution mode
    Bool_t                  fInitOK;              // Initialisation done
+   Bool_t                  fMustClean;           // Flag to let ROOT do cleanup
    Bool_t                  fIsRemote;            //! Flag is set for remote analysis
    UInt_t                  fDebug;               // Debug level
    TString                 fSpecialOutputLocation; // URL/path where the special outputs will be copied
@@ -244,6 +247,6 @@ enum EAliAnalysisFlags {
    TMap                   *fGlobals;             // Map with global variables
    static TString          fgCommonFileName;     //! Common output file name (not streamed)
    static AliAnalysisManager *fgAnalysisManager; //! static pointer to object instance
-   ClassDef(AliAnalysisManager,14)  // Analysis manager class
+   ClassDef(AliAnalysisManager,15)  // Analysis manager class
 };   
 #endif
diff --git a/ANALYSIS/AliAnalysisSelector.cxx b/ANALYSIS/AliAnalysisSelector.cxx
@@ -23,6 +23,7 @@
 
 #include <Riostream.h>
 #include <TProcessID.h>
+#include <TROOT.h>
 
 #include "AliAnalysisManager.h"
 #include "AliAnalysisTask.h"
@@ -100,6 +101,7 @@ void AliAnalysisSelector::Begin(TTree *)
    RestoreAnalysisManager();
    if (fAnalysis && fAnalysis->GetDebugLevel()>1) {
       cout << "->AliAnalysisSelector->Begin: Analysis manager restored" << endl;
+      gROOT->SetMustClean(fAnalysis->MustClean());
    }
 }
 
@@ -109,6 +111,7 @@ void AliAnalysisSelector::SlaveBegin(TTree *tree)
 // Called on each worker. We "unpack" analysis manager here and call InitAnalysis.
    RestoreAnalysisManager();
    if (fAnalysis) {
+      gROOT->SetMustClean(fAnalysis->MustClean());
       if (fAnalysis->GetDebugLevel()>1) {
          cout << "->AliAnalysisSelector->SlaveBegin() after Restore" << endl;
       }   
@@ -194,6 +197,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) {
@@ -211,6 +215,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!!!");

diff --git a/STEER/AOD/AliAODEvent.cxx b/STEER/AOD/AliAODEvent.cxx
@@ -425,8 +425,6 @@ void AliAODEvent::ResetStd(Int_t trkArrSize,
 			   )
 {
   // deletes content of standard arrays and resets size 
-  // The line below added to avoid very costly and un-needed TROOT::RecursiveRemove (A.G.)
-  gROOT->SetMustClean(kFALSE);  
   if (fTracks) {
     fTracks->Delete();
     if (trkArrSize > fTracks->GetSize()) 
@@ -483,6 +481,7 @@ void AliAODEvent::ResetStd(Int_t trkArrSize,
 	fEMCALTrigger->DeAllocate();
   if (fPHOSTrigger)
 	fPHOSTrigger->DeAllocate();
+
 }
 
 void AliAODEvent::ClearStd()