Updated branch aliroot-master, development and master to

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

diff --git a/ANALYSIS/AliAnalysisManager.cxx b/ANALYSIS/AliAnalysisManager.cxx
index cfafd4002b65c8a1abf41e56f61bda8e319ea30a..9ba3e8860938cd21c08b1221880903be5623ba9a 100644 (file)
--- a/ANALYSIS/AliAnalysisManager.cxx
+++ b/ANALYSIS/AliAnalysisManager.cxx
@@ -303,8 +303,8 @@ void AliAnalysisManager::CreateReadCache()
       return;
    }
    gEnv->SetValue("TFile.AsyncPrefetching",(Int_t)fAsyncReading);
-   if (fAsyncReading) gEnv->SetValue("Cache.Directory",Form("file://%s/cache", gSystem->WorkingDirectory()));
-   if (fAsyncReading) gEnv->SetValue("TFile.AsyncReading",1);
+//   if (fAsyncReading) gEnv->SetValue("Cache.Directory",Form("file://%s/cache", gSystem->WorkingDirectory()));
+//   if (fAsyncReading) gEnv->SetValue("TFile.AsyncReading",1);
    fTree->SetCacheSize(fCacheSize);
    TTreeCache::SetLearnEntries(1);  //<<< we can take the decision after 1 entry
    if (!fAutoBranchHandling && !fRequestedBranches.IsNull()) {
@@ -551,6 +551,7 @@ void AliAnalysisManager::SlaveBegin(TTree *tree)
    AliAnalysisTask *task;
    // Call CreateOutputObjects for all tasks
    Bool_t getsysInfo = ((fNSysInfo>0) && (fMode==kLocalAnalysis))?kTRUE:kFALSE;
+   if (getsysInfo) AliSysInfo::SetVerbose(kTRUE); 
    Bool_t dirStatus = TH1::AddDirectoryStatus();
    Int_t itask = 0;
    while ((task=(AliAnalysisTask*)next())) {
@@ -1055,6 +1056,7 @@ void AliAnalysisManager::Terminate()
    TIter next(fTasks);
    TStopwatch timer;
    Bool_t getsysInfo = ((fNSysInfo>0) && (fMode==kLocalAnalysis))?kTRUE:kFALSE;
+   if (getsysInfo) AliSysInfo::SetVerbose(kTRUE);
    // Call Terminate() for tasks
    Int_t itask = 0;
    while (!IsSkipTerminate() && (task=(AliAnalysisTask*)next())) {
@@ -1703,8 +1705,10 @@ void AliAnalysisManager::PrintStatus(Option_t *option) const
       return;
    }   
    Bool_t getsysInfo = ((fNSysInfo>0) && (fMode==kLocalAnalysis))?kTRUE:kFALSE;
-   if (getsysInfo)
+   if (getsysInfo) {
+      AliSysInfo::SetVerbose(kTRUE);
       Info("PrintStatus", "System information will be collected each %lld events", fNSysInfo);
+   }   
    AliAnalysisDataContainer *cont = fCommonInput;
    if (!cont) cont = (AliAnalysisDataContainer*)fInputs->At(0);
    printf("=== TOP CONTAINER:\n");
@@ -1884,7 +1888,10 @@ Long64_t AliAnalysisManager::StartAnalysis(const char *type, TTree * const tree,
    }   
 
    Bool_t getsysInfo = ((fNSysInfo>0) && (fMode==kLocalAnalysis))?kTRUE:kFALSE;
-   if (getsysInfo) AliSysInfo::AddStamp("Start", 0);
+   if (getsysInfo) {
+      AliSysInfo::SetVerbose(kTRUE); 
+      AliSysInfo::AddStamp("Start", 0);
+   }   
    // Initialize locally all tasks (happens for all modes)
    TIter next(fTasks);
    AliAnalysisTask *task;