X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ANALYSIS%2FAliAnalysisManager.cxx;h=cba6ce046440709e77b2855dedabc993674a8972;hb=ecdde216444501ceaefce635f872a6e6f00ca3ef;hp=6c1683a78a9bcfb9cd2d1c12ca3210ca42c856c0;hpb=332781200dc4ce2aea6f362b236e20ff6cd06c2a;p=u%2Fmrichter%2FAliRoot.git diff --git a/ANALYSIS/AliAnalysisManager.cxx b/ANALYSIS/AliAnalysisManager.cxx index 6c1683a78a9..cba6ce04644 100644 --- a/ANALYSIS/AliAnalysisManager.cxx +++ b/ANALYSIS/AliAnalysisManager.cxx @@ -446,7 +446,10 @@ Bool_t AliAnalysisManager::Init(TTree *tree) if (!fInitOK) return kFALSE; fTree = tree; if (fMode != kProofAnalysis) CreateReadCache(); - fTable.Rehash(100); + else { + // cholm - here we should re-add to the table or branches + fTable.Clear(); + } AliAnalysisDataContainer *top = fCommonInput; if (!top) top = (AliAnalysisDataContainer*)fInputs->At(0); if (!top) { @@ -455,6 +458,7 @@ Bool_t AliAnalysisManager::Init(TTree *tree) } top->SetData(tree); CheckBranches(kFALSE); + fTable.Rehash(100); if (fDebug > 1) { printf("<-AliAnalysisManager::Init(%s)\n", tree->GetName()); } @@ -1639,8 +1643,8 @@ void AliAnalysisManager::CheckBranches(Bool_t load) Error("CheckBranches", "Could not find branch %s",obj->GetName()); continue; } + fTable.Add(br); } - fTable.Add(br); if (load && br->GetReadEntry()!=GetCurrentEntry()) { br->GetEntry(GetCurrentEntry()); }