From 0345b95084625374bd081a208bcb171b61f7b492 Mon Sep 17 00:00:00 2001 From: dainese Date: Tue, 17 Feb 2009 22:50:13 +0000 Subject: [PATCH] New way to set input and output containers for AliAnalysisManager --- .../vertexingHF/AliAnalysisTaskSECompareHFTest.C | 10 +++++++--- PWG3/vertexingHF/AliAnalysisTaskSESelectHFTest.C | 5 +++++ .../AliAnalysisTaskSEVertexingHFTest.C | 9 +++++++-- PWG3/vertexingHF/AliCFHeavyFlavourTask.C | 2 +- PWG3/vertexingHF/CreateStandardAODfromESD.C | 16 +++++++++++----- 5 files changed, 31 insertions(+), 11 deletions(-) diff --git a/PWG3/vertexingHF/AliAnalysisTaskSECompareHFTest.C b/PWG3/vertexingHF/AliAnalysisTaskSECompareHFTest.C index a893632b09d..84dcc5a638a 100644 --- a/PWG3/vertexingHF/AliAnalysisTaskSECompareHFTest.C +++ b/PWG3/vertexingHF/AliAnalysisTaskSECompareHFTest.C @@ -56,14 +56,18 @@ void AliAnalysisTaskSECompareHFTest() // // Create containers for input/output + mgr->ConnectInput(hfTask,0,mgr->GetCommonInputContainer()); + /* + // before v4-17-Release AliAnalysisDataContainer *cinput = mgr->CreateContainer("cinput",TChain::Class(), - AliAnalysisManager::kInputContainer); + AliAnalysisManager::kInputContainer); + mgr->ConnectInput(hfTask,0,cinput); + */ AliAnalysisDataContainer *coutput = mgr->CreateContainer("coutput",TList::Class(), AliAnalysisManager::kOutputContainer, "CmpHF.root"); - mgr->ConnectInput(hfTask,0,cinput); mgr->ConnectOutput(hfTask,1,coutput); - + // // Run the analysis // diff --git a/PWG3/vertexingHF/AliAnalysisTaskSESelectHFTest.C b/PWG3/vertexingHF/AliAnalysisTaskSESelectHFTest.C index 3defab27ee0..0507e336327 100644 --- a/PWG3/vertexingHF/AliAnalysisTaskSESelectHFTest.C +++ b/PWG3/vertexingHF/AliAnalysisTaskSESelectHFTest.C @@ -63,6 +63,10 @@ void AliAnalysisTaskSESelectHFTest() // // Create containers for input/output + mgr->ConnectInput(hfTask,0,mgr->GetCommonInputContainer()); + mgr->ConnectOutput(hfTask,0,mgr->GetCommonOutputContainer()); + /* + // before v4-17-Release AliAnalysisDataContainer *cinput1 = mgr->CreateContainer("cchain",TChain::Class(), AliAnalysisManager::kInputContainer); AliAnalysisDataContainer *coutput1 = mgr->CreateContainer("tree", TTree::Class(), @@ -70,6 +74,7 @@ void AliAnalysisTaskSESelectHFTest() "default"); mgr->ConnectInput(hfTask,0,cinput1); mgr->ConnectOutput(hfTask,0,coutput1); + */ // // Run the analysis diff --git a/PWG3/vertexingHF/AliAnalysisTaskSEVertexingHFTest.C b/PWG3/vertexingHF/AliAnalysisTaskSEVertexingHFTest.C index 3924a256341..38707ab4312 100644 --- a/PWG3/vertexingHF/AliAnalysisTaskSEVertexingHFTest.C +++ b/PWG3/vertexingHF/AliAnalysisTaskSEVertexingHFTest.C @@ -7,7 +7,7 @@ void AliAnalysisTaskSEVertexingHFTest() Bool_t inputAOD=kTRUE; // otherwise, ESD TString mode="local"; // otherwise, "grid" - Bool_t useParFiles=kTRUE; + Bool_t useParFiles=kFALSE; gROOT->LoadMacro("$ALICE_ROOT/PWG3/vertexingHF/LoadLibraries.C"); LoadLibraries(useParFiles); @@ -84,13 +84,18 @@ void AliAnalysisTaskSEVertexingHFTest() // // Create containers for input/output + mgr->ConnectInput(hfTask,0,mgr->GetCommonInputContainer()); + mgr->ConnectOutput(hfTask,0,mgr->GetCommonOutputContainer()); + /* + // before v4-17-Release AliAnalysisDataContainer *cinput1 = mgr->CreateContainer("cchain",TChain::Class(), AliAnalysisManager::kInputContainer); AliAnalysisDataContainer *coutput1 = mgr->CreateContainer("tree", TTree::Class(), AliAnalysisManager::kOutputContainer, - "default"); + "default"); mgr->ConnectInput(hfTask,0,cinput1); mgr->ConnectOutput(hfTask,0,coutput1); + */ // // Run the analysis diff --git a/PWG3/vertexingHF/AliCFHeavyFlavourTask.C b/PWG3/vertexingHF/AliCFHeavyFlavourTask.C index 1584a933a35..c70ebc1e3ff 100644 --- a/PWG3/vertexingHF/AliCFHeavyFlavourTask.C +++ b/PWG3/vertexingHF/AliCFHeavyFlavourTask.C @@ -158,7 +158,7 @@ Bool_t AliCFHeavyFlavourTask() cinput0->SetData(analysisChain); mgr->AddTask(task); - mgr->ConnectInput(task,0,cinput0); + mgr->ConnectInput(task,0,mgr->GetCommonInputContainer()); mgr->ConnectOutput(task,0,coutput0); mgr->ConnectOutput(task,1,coutput1); mgr->ConnectOutput(task,2,coutput2); diff --git a/PWG3/vertexingHF/CreateStandardAODfromESD.C b/PWG3/vertexingHF/CreateStandardAODfromESD.C index bc1cc62e045..c13540b2961 100644 --- a/PWG3/vertexingHF/CreateStandardAODfromESD.C +++ b/PWG3/vertexingHF/CreateStandardAODfromESD.C @@ -97,24 +97,30 @@ void CreateStandardAODfromESD() filter->SetTrackFilter(trackFilter); // Pipelining + mgr->ConnectInput(filter,0,mgr->GetCommonInputContainer()); + mgr->ConnectOutput(filter,0,mgr->GetCommonOutputContainer()); + mgr->ConnectInput(esdmuonfilter,0,mgr->GetCommonInputContainer()); + mgr->ConnectOutput(esdmuonfilter,0,mgr->GetCommonOutputContainer()); + if(writeKineToAOD) { + mgr->ConnectInput(kinefilter,0,mgr->GetCommonInputContainer()); + mgr->ConnectOutput(kinefilter,0,mgr->GetCommonOutputContainer()); + } + /* + // before v4-17-Release AliAnalysisDataContainer *cinput1 = mgr->CreateContainer("cchain", TChain::Class(), AliAnalysisManager::kInputContainer); - AliAnalysisDataContainer *coutput1 = mgr->CreateContainer("tree", TTree::Class(), AliAnalysisManager::kOutputContainer, "default"); - - mgr->ConnectInput(filter,0,cinput1); mgr->ConnectOutput(filter,0,coutput1); - mgr->ConnectInput(esdmuonfilter,0,cinput1); mgr->ConnectOutput(esdmuonfilter,0,coutput1); - if(writeKineToAOD) { mgr->ConnectInput(kinefilter,0,cinput1); mgr->ConnectOutput(kinefilter,0,coutput1); } + */ // // Run the analysis // -- 2.43.0