From 707ec2bd6de803011a1ad81f3e99554d4a5a902c Mon Sep 17 00:00:00 2001 From: hdalsgaa Date: Thu, 12 Nov 2009 12:40:57 +0000 Subject: [PATCH] Changes to comply with analysis train naming --- PWG2/FORWARD/analysis/AddTaskFMD.C | 6 ++++-- PWG2/FORWARD/analysis/AliFMDAnaParameters.h | 2 ++ PWG2/FORWARD/analysis/AliFMDDndeta.cxx | 14 +++++++++----- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/PWG2/FORWARD/analysis/AddTaskFMD.C b/PWG2/FORWARD/analysis/AddTaskFMD.C index 31bbc47e86a..544f2e49543 100644 --- a/PWG2/FORWARD/analysis/AddTaskFMD.C +++ b/PWG2/FORWARD/analysis/AddTaskFMD.C @@ -22,8 +22,10 @@ AliFMDAnalysisTaskSE* AddTaskFMD() { pars->SetProcessPrimary(kTRUE); pars->SetProcessHits(kFALSE); - - AliAnalysisDataContainer *cout_fmd = mgr->CreateContainer("BackgroundCorrected", TList::Class(), AliAnalysisManager::kOutputContainer,"fmdana.root"); + TString outputfile = AliAnalysisManager::GetCommonFileName(); + outputfile += Form(":%s",pars->GetDndetaAnalysisName()); + + AliAnalysisDataContainer *cout_fmd = mgr->CreateContainer("BackgroundCorrected", TList::Class(), AliAnalysisManager::kOutputContainer,outputfile); mgr->ConnectInput(taskfmd, 0, mgr->GetCommonInputContainer()); mgr->ConnectOutput(taskfmd, 1, cout_fmd); diff --git a/PWG2/FORWARD/analysis/AliFMDAnaParameters.h b/PWG2/FORWARD/analysis/AliFMDAnaParameters.h index b27d75a4c19..cd873e87fbf 100644 --- a/PWG2/FORWARD/analysis/AliFMDAnaParameters.h +++ b/PWG2/FORWARD/analysis/AliFMDAnaParameters.h @@ -120,6 +120,8 @@ public: void SetCollisionSystem(Species collsystem) {fSpecies = collsystem;} void PrintStatus() const; void Print(Option_t* /* option */) const { PrintStatus(); } + char* GetDndetaAnalysisName() {return "FORWARD_DnDeta";} + protected: AliFMDAnaParameters(const AliFMDAnaParameters& o) diff --git a/PWG2/FORWARD/analysis/AliFMDDndeta.cxx b/PWG2/FORWARD/analysis/AliFMDDndeta.cxx index 04db794cee2..6571f7b8228 100644 --- a/PWG2/FORWARD/analysis/AliFMDDndeta.cxx +++ b/PWG2/FORWARD/analysis/AliFMDDndeta.cxx @@ -175,10 +175,14 @@ void AliFMDDndeta::Init(const Char_t* filename) { AliWarning("No file - aborting !"); return; } - fList = (TList*)fin->Get("BackgroundCorrected"); AliFMDAnaParameters* pars = AliFMDAnaParameters::Instance(); - pars->Init(); + //pars->Init(); + fList = (TList*)fin->Get(Form("%s/BackgroundCorrected",pars->GetDndetaAnalysisName())); + + if(!fList) //an old file ? Perhaps... + fList = (TList*)fin->Get("BackgroundCorrected"); + fIsGenerated[kHits] = kFALSE; fIsGenerated[kMult] = kFALSE; fIsGenerated[kMultTrVtx] = kFALSE; @@ -283,9 +287,9 @@ void AliFMDDndeta::GenerateMult(Analysis what) { nNonZero++; } Int_t nBinsOld = fNbinsToCut; - if(det == 2 && ringChar =='I') { - fNbinsToCut = 1; - } + // if(det == 2 && ringChar =='I') { + // fNbinsToCut = 1; + // } TH1F* hRingMult = (TH1F*)fMultList.FindObject(Form("hRingMult_FMD%d%c",det,ringChar)); for(Int_t i=1; i<=hRingMult->GetNbinsX(); i++) { -- 2.39.3