From: fca Date: Wed, 18 Feb 2009 12:56:20 +0000 (+0000) Subject: Completion of previous checkin X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=commitdiff_plain;h=8a546c82f9d36f2891019bf3d31e927f704fdf3e Completion of previous checkin --- diff --git a/PWG2/AOD/runPWG2AODCreation.C b/PWG2/AOD/runPWG2AODCreation.C index 3737547f629..fab5b0b75dd 100644 --- a/PWG2/AOD/runPWG2AODCreation.C +++ b/PWG2/AOD/runPWG2AODCreation.C @@ -74,12 +74,10 @@ void producePWG2AOD(const char *esdsource, int nfiles) // Create containers for input/output // Top ESD container - AliAnalysisDataContainer *cin_esd = mgr->CreateContainer("cchain",TChain::Class(), - AliAnalysisManager::kInputContainer); + AliAnalysisDataContainer *cin_esd = mgr->GetCommonInputContainer(); // Output AOD container - AliAnalysisDataContainer *cout_aod = mgr->CreateContainer("tree", TTree::Class(), - AliAnalysisManager::kOutputContainer, "default"); + AliAnalysisDataContainer *cout_aod = mgr->GetCommonOutputContainer(); mgr->ConnectInput (esdfilter, 0, cin_esd ); mgr->ConnectOutput (esdfilter, 0, cout_aod ); diff --git a/PWG2/AOD/runPWG2AODUpdate.C b/PWG2/AOD/runPWG2AODUpdate.C index 7f3e73c1160..d301654a001 100644 --- a/PWG2/AOD/runPWG2AODUpdate.C +++ b/PWG2/AOD/runPWG2AODUpdate.C @@ -78,12 +78,10 @@ void producePWG2AOD(const char *esdsource, int nfiles) // Create containers for input/output // Top ESD container - AliAnalysisDataContainer *cin_esd = mgr->CreateContainer("cchain",TChain::Class(), - AliAnalysisManager::kInputContainer); + AliAnalysisDataContainer *cin_esd = mgr->GetCommonInputContainer(); // Output AOD container - AliAnalysisDataContainer *cout_aod = mgr->CreateContainer("tree", TTree::Class(), - AliAnalysisManager::kOutputContainer, "default"); + AliAnalysisDataContainer *cout_aod = mgr->GetCommonOutputContainer(); mgr->ConnectInput (esdfilter, 0, cin_esd ); mgr->ConnectOutput (esdfilter, 0, cout_aod ); diff --git a/PWG2/AnalysisMacros/Batch/runBatch.C b/PWG2/AnalysisMacros/Batch/runBatch.C index bc6f068ea3c..07171061b67 100644 --- a/PWG2/AnalysisMacros/Batch/runBatch.C +++ b/PWG2/AnalysisMacros/Batch/runBatch.C @@ -54,7 +54,7 @@ void runBatch() { AliAnalysisTaskPt *task1 = new AliAnalysisTaskPt("TaskPt"); mgr->AddTask(task1); // Create containers for input/output - AliAnalysisDataContainer *cinput1 = mgr->CreateContainer("cchain1",TChain::Class(),AliAnalysisManager::kInputContainer); + AliAnalysisDataContainer *cinput1 = mgr->GetCommonInputContainer(); AliAnalysisDataContainer *coutput1 = mgr->CreateContainer("chist1", TH1::Class(),AliAnalysisManager::kOutputContainer,"Pt.ESD.root"); //____________________________________________// diff --git a/PWG2/AnalysisMacros/Interactive/runInteractive.C b/PWG2/AnalysisMacros/Interactive/runInteractive.C index 48dd03bfbaa..491ae754dbd 100644 --- a/PWG2/AnalysisMacros/Interactive/runInteractive.C +++ b/PWG2/AnalysisMacros/Interactive/runInteractive.C @@ -60,7 +60,7 @@ void runInteractive() { AliAnalysisTaskPt *task1 = new AliAnalysisTaskPt("TaskPt"); mgr->AddTask(task1); // Create containers for input/output - AliAnalysisDataContainer *cinput1 = mgr->CreateContainer("cchain1",TChain::Class(),AliAnalysisManager::kInputContainer); + AliAnalysisDataContainer *cinput1 = mgr->GetCommonInputContainer(); AliAnalysisDataContainer *coutput1 = mgr->CreateContainer("chist1", TH1::Class(),AliAnalysisManager::kOutputContainer,"Pt.ESD.root"); //____________________________________________// diff --git a/PWG2/AnalysisMacros/Kine/runKine.C b/PWG2/AnalysisMacros/Kine/runKine.C index ffb70d2406c..af9c69a4b0a 100644 --- a/PWG2/AnalysisMacros/Kine/runKine.C +++ b/PWG2/AnalysisMacros/Kine/runKine.C @@ -54,7 +54,7 @@ void runKine() { AliAnalysisTaskPtMC *task1 = new AliAnalysisTaskPtMC("TaskPtMC"); mgr->AddTask(task1); // Create containers for input/output - AliAnalysisDataContainer *cinput1 = mgr->CreateContainer("cchain1",TChain::Class(),AliAnalysisManager::kInputContainer); + AliAnalysisDataContainer *cinput1 = mgr->GetCommonInputContainer(); AliAnalysisDataContainer *coutput1 = mgr->CreateContainer("chist1", TH1::Class(),AliAnalysisManager::kOutputContainer,"Pt.MC.root"); //____________________________________________// diff --git a/PWG2/AnalysisMacros/Local/runLocal.C b/PWG2/AnalysisMacros/Local/runLocal.C index 238eabefc78..bcc3d1c7b81 100644 --- a/PWG2/AnalysisMacros/Local/runLocal.C +++ b/PWG2/AnalysisMacros/Local/runLocal.C @@ -52,7 +52,7 @@ void runLocal() { AliAnalysisTaskPt *task1 = new AliAnalysisTaskPt("TaskPt"); mgr->AddTask(task1); // Create containers for input/output - AliAnalysisDataContainer *cinput1 = mgr->CreateContainer("cchain1",TChain::Class(),AliAnalysisManager::kInputContainer); + AliAnalysisDataContainer *cinput1 = mgr->GetCommonInputContainer(); AliAnalysisDataContainer *coutput1 = mgr->CreateContainer("chist1", TH1::Class(),AliAnalysisManager::kOutputContainer,"Pt.ESD.root"); //____________________________________________// diff --git a/PWG2/AnalysisMacros/Proof/runProof.C b/PWG2/AnalysisMacros/Proof/runProof.C index 1a151b8c6cd..dcde338ab61 100644 --- a/PWG2/AnalysisMacros/Proof/runProof.C +++ b/PWG2/AnalysisMacros/Proof/runProof.C @@ -45,7 +45,7 @@ void runProofESD(const char *file) { AliAnalysisTaskPt *task1 = new AliAnalysisTaskPt("TaskPt"); mgr->AddTask(task1); // Create containers for input/output - AliAnalysisDataContainer *cinput1 = mgr->CreateContainer("cchain1",TChain::Class(),AliAnalysisManager::kInputContainer); + AliAnalysisDataContainer *cinput1 = mgr->GetCommonInputContainer(); AliAnalysisDataContainer *coutput1 = mgr->CreateContainer("chist1", TH1::Class(),AliAnalysisManager::kOutputContainer,"Pt.ESD.root"); //____________________________________________// mgr->ConnectInput(task1,0,cinput1); diff --git a/PWG2/FEMTOSCOPY/macros/Batch/runBatch.C b/PWG2/FEMTOSCOPY/macros/Batch/runBatch.C index cf9994a5fcc..56620f56ed5 100644 --- a/PWG2/FEMTOSCOPY/macros/Batch/runBatch.C +++ b/PWG2/FEMTOSCOPY/macros/Batch/runBatch.C @@ -80,11 +80,11 @@ void runBatch(const char *chainlistfile) { mgr->AddTask(task1); // Create containers for input/output - AliAnalysisDataContainer *cinput1 = mgr->CreateContainer("cchain1",TChain::Class(),AliAnalysisManager::kInputContainer); + AliAnalysisDataContainer *cinput1 = mgr->GetCommonInputContainer(); AliAnalysisDataContainer *coutput1 = mgr->CreateContainer("clist1", TList::Class(),AliAnalysisManager::kOutputContainer,"Femto.ESD.root"); //____________________________________________// - cinput1->SetData(chain); +// cinput1->SetData(chain); mgr->ConnectInput(task1,0,cinput1); mgr->ConnectOutput(task1,0,coutput1); diff --git a/PWG2/FEMTOSCOPY/macros/Local/runLocal.C b/PWG2/FEMTOSCOPY/macros/Local/runLocal.C index 7e26b8ff4c3..1f052db3035 100644 --- a/PWG2/FEMTOSCOPY/macros/Local/runLocal.C +++ b/PWG2/FEMTOSCOPY/macros/Local/runLocal.C @@ -90,7 +90,7 @@ void runLocal(const char *chainlistfile, int dataFromAlien=0) { mgr->AddTask(task1); // Create containers for input/output - AliAnalysisDataContainer *cinput1 = mgr->CreateContainer("cchain1",TChain::Class(),AliAnalysisManager::kInputContainer); + AliAnalysisDataContainer *cinput1 = mgr->GetCommonInputContainer(); AliAnalysisDataContainer *coutput1 = mgr->CreateContainer("clist1", TList::Class(),AliAnalysisManager::kOutputContainer,"Femto.ESD.root"); //____________________________________________// diff --git a/PWG2/FEMTOSCOPY/macros/Proof/runProof.C b/PWG2/FEMTOSCOPY/macros/Proof/runProof.C index a0b93296644..04fa308c054 100644 --- a/PWG2/FEMTOSCOPY/macros/Proof/runProof.C +++ b/PWG2/FEMTOSCOPY/macros/Proof/runProof.C @@ -63,7 +63,7 @@ void runProof(int dataType=0, const char *dataSource="ESD82XX_30K.txt") { mgr->AddTask(task1); // Create containers for input/output - AliAnalysisDataContainer *cinput1 = mgr->CreateContainer("cchain1",TChain::Class(),AliAnalysisManager::kInputContainer); + AliAnalysisDataContainer *cinput1 = mgr->GetCommonInputContainer(); AliAnalysisDataContainer *coutput1 = mgr->CreateContainer("clist1", TList::Class(),AliAnalysisManager::kOutputContainer,"Femto.ESD.root"); //____________________________________________// diff --git a/PWG2/FLOW/macros/runAliAnalysisTaskFlow.C b/PWG2/FLOW/macros/runAliAnalysisTaskFlow.C index 709c6c7c54f..28961d8bc56 100644 --- a/PWG2/FLOW/macros/runAliAnalysisTaskFlow.C +++ b/PWG2/FLOW/macros/runAliAnalysisTaskFlow.C @@ -595,8 +595,7 @@ void runAliAnalysisTaskFlow(Int_t mode=mPROOF, const Char_t* data="/PWG2/akisiel // Create containers for input/output - AliAnalysisDataContainer *cinput1 = - mgr->CreateContainer("cchain1",TChain::Class(),AliAnalysisManager::kInputContainer); + AliAnalysisDataContainer *cinput1 = mgr->GetCommonInputContainer(); if (useWeights) { AliAnalysisDataContainer *cinputWeights = mgr->CreateContainer("cobjWeights",TList::Class(),AliAnalysisManager::kInputContainer); diff --git a/PWG2/RESONANCES/macros/AddRsnAnalysisTask.C b/PWG2/RESONANCES/macros/AddRsnAnalysisTask.C index af4277a8c7c..da1c160ccc7 100644 --- a/PWG2/RESONANCES/macros/AddRsnAnalysisTask.C +++ b/PWG2/RESONANCES/macros/AddRsnAnalysisTask.C @@ -106,7 +106,7 @@ Int_t AddRsnAnalysisTask() task->AddPairMgrFromConfig("CreatePairsPhi.C"); // initialize containers - AliAnalysisDataContainer *input = mgr->CreateContainer("in", TChain::Class(), AliAnalysisManager::kInputContainer); + AliAnalysisDataContainer *input = mgr->GetCommonInputContainer(); AliAnalysisDataContainer *dummy = mgr->CreateContainer("dummy1", TTree::Class(), AliAnalysisManager::kOutputContainer, "default"); AliAnalysisDataContainer *out = mgr->CreateContainer("RSN", TList::Class(), AliAnalysisManager::kOutputContainer, outputFileName); diff --git a/PWG2/runAODAnalysisExample.C b/PWG2/runAODAnalysisExample.C index 1af7df38c97..e6172b41f10 100644 --- a/PWG2/runAODAnalysisExample.C +++ b/PWG2/runAODAnalysisExample.C @@ -69,12 +69,10 @@ void produceAOD() // Create containers for input/output // Top ESD container - AliAnalysisDataContainer *cin_esd = mgr->CreateContainer("cchain",TChain::Class(), - AliAnalysisManager::kInputContainer); + AliAnalysisDataContainer *cin_esd = mgr->GetCommonInputContainer(); // Output AOD container - AliAnalysisDataContainer *cout_aod = mgr->CreateContainer("tree", TTree::Class(), - AliAnalysisManager::kOutputContainer, "default"); + AliAnalysisDataContainer *cout_aod = mgr->GetCommonOutputContainer(); mgr->ConnectInput (esdfilter, 0, cin_esd ); mgr->ConnectOutput (esdfilter, 0, cout_aod ); @@ -155,8 +153,7 @@ void runPWG2() mgr->AddTask(taskproton); // Create containers for input/output // Top AOD container - AliAnalysisDataContainer *cin_aod = mgr->CreateContainer("cchain",TChain::Class(), - AliAnalysisManager::kInputContainer); + AliAnalysisDataContainer *cin_aod = mgr->GetCommonInputContainer(); // Output histogram container AliAnalysisDataContainer *cout_hist = mgr->CreateContainer("protonhistos", TList::Class(),AliAnalysisManager::kOutputContainer,"protonhistos.root"); diff --git a/PWG2/runProtonAnalysis.C b/PWG2/runProtonAnalysis.C index 4cd6646df91..45bd87b4e22 100644 --- a/PWG2/runProtonAnalysis.C +++ b/PWG2/runProtonAnalysis.C @@ -120,9 +120,7 @@ void runLocal(const char* mode = "ESD", mgr->AddTask(taskProtons); // Create containers for input/output - AliAnalysisDataContainer *cinput1 = mgr->CreateContainer("dataChain", - TChain::Class(), - AliAnalysisManager::kInputContainer); + AliAnalysisDataContainer *cinput1 = mgr->GetCommonInputContainer(); AliAnalysisDataContainer *coutput1 = mgr->CreateContainer("outputList1", TList::Class(), AliAnalysisManager::kOutputCont @@ -239,9 +237,7 @@ void runInteractive(const char* mode = "ESD", mgr->AddTask(taskProtons); // Create containers for input/output - AliAnalysisDataContainer *cinput1 = mgr->CreateContainer("dataChain", - TChain::Class(), - AliAnalysisManager::kInputContainer); + AliAnalysisDataContainer *cinput1 = mgr->GetCommonInputContainer(); AliAnalysisDataContainer *coutput1 = mgr->CreateContainer("outputList1", TList::Class(), AliAnalysisManager::kOutputCont @@ -349,8 +345,7 @@ void runBatch(const char* mode = "ESD", mgr->AddTask(taskProtons); // Create containers for input/output - AliAnalysisDataContainer *cinput1 = mgr->CreateContainer("dataChain", - TChain::Class(),AliAnalysisManager::kInputContainer); + AliAnalysisDataContainer *cinput1 = mgr->GetCommonInputContainer(); AliAnalysisDataContainer *coutput1 = mgr->CreateContainer("outputList1", TList::Class(),AliAnalysisManager::kOutputCont outputFilename.Data()); @@ -448,9 +443,7 @@ void runProof(const char* mode = "ESD", mgr->AddTask(taskProtons); // Create containers for input/output - AliAnalysisDataContainer *cinput1 = mgr->CreateContainer("dataChain", - TChain::Class(), - AliAnalysisManager::kInputContainer); + AliAnalysisDataContainer *cinput1 = mgr->GetCommonInputContainer(); AliAnalysisDataContainer *coutput1 = mgr->CreateContainer("outputList1", TList::Class(), AliAnalysisManager::kOutputContainer, diff --git a/PWG2/runProtonAnalysisQA.C b/PWG2/runProtonAnalysisQA.C index db4fd03c14b..75bc7ba4a62 100644 --- a/PWG2/runProtonAnalysisQA.C +++ b/PWG2/runProtonAnalysisQA.C @@ -83,9 +83,7 @@ void runInteractive(const char *collectionfile, mgr->AddTask(taskProtonsQA); // Create containers for input/output - AliAnalysisDataContainer *cinput1 = mgr->CreateContainer("dataChain", - TChain::Class(), - AliAnalysisManager::kInputContainer); + AliAnalysisDataContainer *cinput1 = mgr->GetCommonInputContainer(); AliAnalysisDataContainer *coutput1 = mgr->CreateContainer("globalQAList", TList::Class(), AliAnalysisManager::kOutputContainer, @@ -190,9 +188,7 @@ void runProof(Int_t stats = 0, mgr->AddTask(taskProtonsQA); // Create containers for input/output - AliAnalysisDataContainer *cinput1 = mgr->CreateContainer("dataChain", - TChain::Class(), - AliAnalysisManager::kInputContainer); + AliAnalysisDataContainer *cinput1 = mgr->GetCommonInputContainer(); AliAnalysisDataContainer *coutput1 = mgr->CreateContainer("globalQAList", TList::Class(), AliAnalysisManager::kOutputContainer, diff --git a/PWG2/runProtonCorrection.C b/PWG2/runProtonCorrection.C index 9c302817b27..a2ef53b7f80 100755 --- a/PWG2/runProtonCorrection.C +++ b/PWG2/runProtonCorrection.C @@ -238,7 +238,7 @@ Bool_t runProtonCorrection(Int_t stats = 0, const char* dataset = 0x0) { mgr->SetInputEventHandler(esdHandler); //------ input data ------ - AliAnalysisDataContainer *cinput0 = mgr->CreateContainer("cchain0",TChain::Class(),AliAnalysisManager::kInputContainer); + AliAnalysisDataContainer *cinput0 = mgr->GetCommonInputContainer(); // ----- output data ----- //slot 0 : default output tree (by default handled by AliAnalysisTaskSE) diff --git a/PWG3/muon/AnalysisTrainFromStandardToMuonAODLocal.C b/PWG3/muon/AnalysisTrainFromStandardToMuonAODLocal.C index cf012ff00ec..f3dd2f94c40 100644 --- a/PWG3/muon/AnalysisTrainFromStandardToMuonAODLocal.C +++ b/PWG3/muon/AnalysisTrainFromStandardToMuonAODLocal.C @@ -88,10 +88,8 @@ void AnalysisTrainFromStandardToMuonAODLocal(char* filein= "AliAODs.root", mgr->AddTask(aodfilter); // Create containers for input/output - AliAnalysisDataContainer *cinput1 = mgr->CreateContainer("cchain",TChain::Class(), - AliAnalysisManager::kInputContainer); - AliAnalysisDataContainer *coutput1 = mgr->CreateContainer("tree", TTree::Class(), - AliAnalysisManager::kOutputContainer, "default"); + AliAnalysisDataContainer *cinput1 = mgr->GetCommonInputContainer(); + AliAnalysisDataContainer *coutput1 = mgr->GetCommonOutputContainer(); mgr->ConnectInput(aodfilter,0,cinput1); mgr->ConnectOutput(aodfilter,0,coutput1); diff --git a/PWG3/muon/AnalysisTrainMuonCAF.C b/PWG3/muon/AnalysisTrainMuonCAF.C index 8e27c339993..63d63a9ad47 100644 --- a/PWG3/muon/AnalysisTrainMuonCAF.C +++ b/PWG3/muon/AnalysisTrainMuonCAF.C @@ -114,9 +114,9 @@ void AnalysisTrainMuonCAF(char* fileout = "AliAOD.root", char *datasetname = "my mgr->AddTask(esdmuonfilter); // Containers for input/output - AliAnalysisDataContainer *cin_esd = mgr->CreateContainer("cESD",TChain::Class(), AliAnalysisManager::kInputContainer); + AliAnalysisDataContainer *cin_esd = mgr->GetCommonInputContainer(); // Output AOD container. - AliAnalysisDataContainer *cout_aod = mgr->CreateContainer("cAOD", TTree::Class(), AliAnalysisManager::kOutputContainer, "default"); + AliAnalysisDataContainer *cout_aod = mgr->GetCommonOutputContainer(); // Connect containers to tasks slots mgr->ConnectInput (esdfilter, 0, cin_esd ); diff --git a/PWG3/muon/AnalysisTrainMuonComp.C b/PWG3/muon/AnalysisTrainMuonComp.C index 6bff0199d41..d58a67fae5c 100644 --- a/PWG3/muon/AnalysisTrainMuonComp.C +++ b/PWG3/muon/AnalysisTrainMuonComp.C @@ -88,9 +88,9 @@ void AnalysisTrainMuonComp(){ mgr->AddTask(AODvsESD); // Input ESD container - AliAnalysisDataContainer *esdIn = mgr->CreateContainer("input1",TChain::Class(), AliAnalysisManager::kInputContainer); + AliAnalysisDataContainer *esdIn = mgr->GetCommonInputContainer(); // Output AOD container. - AliAnalysisDataContainer *aodOut = mgr->CreateContainer("output1", TTree::Class(), AliAnalysisManager::kOutputContainer, "default"); + AliAnalysisDataContainer *aodOut = mgr->GetCommonOutputContainer(); // Output comparison AliAnalysisDataContainer *listOut = mgr->CreateContainer("output2", TList::Class(), AliAnalysisManager::kOutputContainer, "AODvsESDoutput.root"); diff --git a/PWG3/muon/AnalysisTrainMuonCompLocal.C b/PWG3/muon/AnalysisTrainMuonCompLocal.C index 648a6745686..ce08b2c312a 100644 --- a/PWG3/muon/AnalysisTrainMuonCompLocal.C +++ b/PWG3/muon/AnalysisTrainMuonCompLocal.C @@ -79,9 +79,9 @@ void AnalysisTrainMuonCompLocal() mgr->AddTask(AODvsESD); // Input ESD container - AliAnalysisDataContainer *esdIn = mgr->CreateContainer("input1",TChain::Class(), AliAnalysisManager::kInputContainer); + AliAnalysisDataContainer *esdIn = mgr->GetCommonInputContainer(); // Output AOD container. - AliAnalysisDataContainer *aodOut = mgr->CreateContainer("output1", TTree::Class(), AliAnalysisManager::kOutputContainer, "default"); + AliAnalysisDataContainer *aodOut = mgr->GetCommonOutputContainer(); // Output comparison AliAnalysisDataContainer *listOut = mgr->CreateContainer("output2", TList::Class(), AliAnalysisManager::kOutputContainer, "AODvsESDoutput.root"); diff --git a/PWG3/muon/AnalysisTrainMuonLocal.C b/PWG3/muon/AnalysisTrainMuonLocal.C index 2343e3f0950..2391354db11 100644 --- a/PWG3/muon/AnalysisTrainMuonLocal.C +++ b/PWG3/muon/AnalysisTrainMuonLocal.C @@ -112,11 +112,9 @@ void AnalysisTrainMuonLocal(char* filein = "AliESDs.root", mgr->AddTask(tagTask); // Input container - AliAnalysisDataContainer *cin_esd = mgr->CreateContainer("cESD",TChain::Class(), - AliAnalysisManager::kInputContainer); + AliAnalysisDataContainer *cin_esd = mgr->GetCommonInputContainer(); // Output AOD container. - AliAnalysisDataContainer *cout_aod = mgr->CreateContainer("cAOD", TTree::Class(), - AliAnalysisManager::kOutputContainer, "default"); + AliAnalysisDataContainer *cout_aod = mgr->GetCommonOutputContainer(); // Tag container AliAnalysisDataContainer *cout_tags = mgr->CreateContainer("cTag",TTree::Class(), AliAnalysisManager::kOutputContainer, "AOD.tag.root"); diff --git a/PWG3/muon/AnalysisTrigChEff.C b/PWG3/muon/AnalysisTrigChEff.C index 369fd74961e..7e6c09e5bf6 100644 --- a/PWG3/muon/AnalysisTrigChEff.C +++ b/PWG3/muon/AnalysisTrigChEff.C @@ -89,8 +89,7 @@ void AnalysisTrigChEff(Int_t mode=kMlocal) // Create containers for input/output // Top container for ESD input - AliAnalysisDataContainer *cin_esd = mgr->CreateContainer("cESD",TChain::Class(), - AliAnalysisManager::kInputContainer); + AliAnalysisDataContainer *cin_esd = mgr->GetCommonInputContainer(); // Output histograms list for single muons analysis AliAnalysisDataContainer *cout_trigChEff = mgr->CreateContainer("triggerChamberEff", TList::Class(), diff --git a/PWG3/muon/RunLinkToMCAnalysisExample.C b/PWG3/muon/RunLinkToMCAnalysisExample.C index c4eac3eb4ab..2df32f4305a 100644 --- a/PWG3/muon/RunLinkToMCAnalysisExample.C +++ b/PWG3/muon/RunLinkToMCAnalysisExample.C @@ -81,8 +81,8 @@ void RunLinkToMCAnalysisExample(const char* esdFile = "./AliESDs.root") mgr->AddTask(linktask); // Create the input and output containers and connect them up to the analysis task. - AliAnalysisDataContainer* cinEsd = mgr->CreateContainer("cESD", TChain::Class(), AliAnalysisManager::kInputContainer); - AliAnalysisDataContainer* coutAod = mgr->CreateContainer("cAOD", TTree::Class(), AliAnalysisManager::kOutputContainer, "default"); + AliAnalysisDataContainer* cinEsd = mgr->GetCommonInputContainer(); + AliAnalysisDataContainer* coutAod = mgr->GetCommonOutputContainer(); AliAnalysisDataContainer* coutHists = mgr->CreateContainer("cHists", TList::Class(), AliAnalysisManager::kOutputContainer, "hists.root"); mgr->ConnectInput(linktask, 0, cinEsd); mgr->ConnectOutput(linktask, 0, coutAod); diff --git a/PWG3/muon/RunSingleMuonAnalysisFromAOD.C b/PWG3/muon/RunSingleMuonAnalysisFromAOD.C index 8a83ef03f08..918d80f5d34 100644 --- a/PWG3/muon/RunSingleMuonAnalysisFromAOD.C +++ b/PWG3/muon/RunSingleMuonAnalysisFromAOD.C @@ -85,7 +85,7 @@ void RunSingleMuonAnalysisFromAOD(Int_t mode=kMlocal, Char_t *inputPath=".", Cha AliAnalysisTaskSingleMu *task1 = new AliAnalysisTaskSingleMu("SingleMu"); mgr->AddTask(task1); // Create containers for input/output - AliAnalysisDataContainer *cinput1 = mgr->CreateContainer("cchain1",TChain::Class(),AliAnalysisManager::kInputContainer); + AliAnalysisDataContainer *cinput1 = mgr->GetCommonInputContainer(); AliAnalysisDataContainer *coutput1 = mgr->CreateContainer("tree1", TTree::Class(),AliAnalysisManager::kOutputContainer,outFileName.Data()); //____________________________________________// diff --git a/PWG3/muon/RunSingleMuonAnalysisFromESD.C b/PWG3/muon/RunSingleMuonAnalysisFromESD.C index 38828b1be40..27adcdc41fd 100644 --- a/PWG3/muon/RunSingleMuonAnalysisFromESD.C +++ b/PWG3/muon/RunSingleMuonAnalysisFromESD.C @@ -61,7 +61,7 @@ void RunSingleMuonAnalysisFromESD(Bool_t local = kFALSE) { // Create containers for input/output // input - AliAnalysisDataContainer *cinput = mgr->CreateContainer("cchain",TChain::Class(),AliAnalysisManager::kInputContainer); + AliAnalysisDataContainer *cinput = mgr->GetCommonInputContainer(); // output AliAnalysisDataContainer *coutput1 = mgr->CreateContainer("ctree", TNtuple::Class(),AliAnalysisManager::kOutputContainer,"SingleMuESD.root"); diff --git a/PWG3/muondep/MuonTrackingEffAnalysis.C b/PWG3/muondep/MuonTrackingEffAnalysis.C index 548ac9f4719..83a2cdfc2dc 100644 --- a/PWG3/muondep/MuonTrackingEffAnalysis.C +++ b/PWG3/muondep/MuonTrackingEffAnalysis.C @@ -62,8 +62,7 @@ void MuonTrackingEffAnalysis(const Bool_t alien = false, const Int_t run = 100, mgr->AddTask(ESDTask); //Create containers for input/output - AliAnalysisDataContainer* cinput1 = - mgr->CreateContainer("cchain1",TChain::Class(),AliAnalysisManager::kInputContainer); + AliAnalysisDataContainer* cinput1 = mgr->GetCommonInputContainer(); AliAnalysisDataContainer *coutput1 = mgr->CreateContainer("chistlist1", TClonesArray::Class(),AliAnalysisManager::kOutputContainer, "MuonTrackingChamberEffHistos.root"); diff --git a/PWG3/muondep/RunRecoCheck.C b/PWG3/muondep/RunRecoCheck.C index ed888b4a0c7..362ed65907c 100644 --- a/PWG3/muondep/RunRecoCheck.C +++ b/PWG3/muondep/RunRecoCheck.C @@ -67,7 +67,7 @@ void RunRecoCheck(Bool_t local = kFALSE) { // Create containers for input/output // input - AliAnalysisDataContainer *cinput = mgr->CreateContainer("cchain",TChain::Class(),AliAnalysisManager::kInputContainer); + AliAnalysisDataContainer *cinput = mgr->GetCommonInputContainer(); // output AliAnalysisDataContainer *coutput = mgr->CreateContainer("ctree", TTree::Class(),AliAnalysisManager::kOutputContainer,"RecoCheck.root"); diff --git a/PWG3/vertexingHF/AliCFHeavyFlavourTask.C b/PWG3/vertexingHF/AliCFHeavyFlavourTask.C index c70ebc1e3ff..eef78837a17 100644 --- a/PWG3/vertexingHF/AliCFHeavyFlavourTask.C +++ b/PWG3/vertexingHF/AliCFHeavyFlavourTask.C @@ -141,7 +141,7 @@ Bool_t AliCFHeavyFlavourTask() // Create and connect containers for input/output // ------ input data ------ - AliAnalysisDataContainer *cinput0 = mgr->CreateContainer("cchain0",TChain::Class(),AliAnalysisManager::kInputContainer); + AliAnalysisDataContainer *cinput0 = mgr->GetCommonInputContainer(); // ----- output data ----- @@ -155,7 +155,7 @@ Bool_t AliCFHeavyFlavourTask() // output Correction Framework Container (for acceptance & efficiency calculations) AliAnalysisDataContainer *coutput2 = mgr->CreateContainer("ccontainer0", AliCFContainer::Class(),AliAnalysisManager::kOutputContainer,"output.root"); - cinput0->SetData(analysisChain); +// cinput0->SetData(analysisChain); mgr->AddTask(task); mgr->ConnectInput(task,0,mgr->GetCommonInputContainer()); diff --git a/PWG4/macros/AnalysisTrainCAF.C b/PWG4/macros/AnalysisTrainCAF.C index 671c31836f0..772e082763f 100644 --- a/PWG4/macros/AnalysisTrainCAF.C +++ b/PWG4/macros/AnalysisTrainCAF.C @@ -137,9 +137,6 @@ void AnalysisTrainCAF(Int_t nEvents = 10000, Int_t nOffset = 0, char *ds = "/PWG // Make the analysis manager AliAnalysisManager *mgr = new AliAnalysisManager("Analysis Train", "A test setup for the analysis train"); - // Top container for input - AliAnalysisDataContainer *cinput = mgr->CreateContainer("cInput",TChain::Class(), - AliAnalysisManager::kInputContainer); if (iAODanalysis) { // AOD input handler AliAODInputHandler *aodH = new AliAODInputHandler(); @@ -156,6 +153,8 @@ void AnalysisTrainCAF(Int_t nEvents = 10000, Int_t nOffset = 0, char *ds = "/PWG mgr->SetMCtruthEventHandler(mcHandler); mcHandler->SetReadTR(readTR); } + // Top container for input + AliAnalysisDataContainer *cinput = mgr->GetCommonInputContainer(); // This container is managed by the AOD handler AliAnalysisDataContainer *cout_aod = 0; @@ -165,8 +164,7 @@ void AnalysisTrainCAF(Int_t nEvents = 10000, Int_t nOffset = 0, char *ds = "/PWG aodHandler->SetFillAOD(kFALSE); mgr->SetOutputEventHandler(aodHandler); aodHandler->SetOutputFileName(Form("AliAODs_pwg4_%07d-%07d.root",nOffset,nOffset+nEvents)); - cout_aod = mgr->CreateContainer("cAOD", TTree::Class(), - AliAnalysisManager::kOutputContainer, "default"); + cout_aod = mgr->GetCommonOutputContainer(); cout_aod->SetSpecialOutput(); } diff --git a/PWG4/macros/ConfigGammaConversion.C b/PWG4/macros/ConfigGammaConversion.C index 851fc510884..4de085316b4 100644 --- a/PWG4/macros/ConfigGammaConversion.C +++ b/PWG4/macros/ConfigGammaConversion.C @@ -643,10 +643,10 @@ void ConfigGammaConversion(TString arguments){ mgr->SetDebugLevel(10); // Declare Common Input Tchain - AliAnalysisDataContainer *cinput1 = mgr->CreateContainer("Chain",TChain::Class(),AliAnalysisManager::kInputContainer); + AliAnalysisDataContainer *cinput1 = mgr->GetCommonInputContainer(); // Common Output Tree in common ‘default’ output file - AliAnalysisDataContainer *coutput1 = mgr->CreateContainer("tree", TTree::Class(),AliAnalysisManager::kOutputContainer, "default"); + AliAnalysisDataContainer *coutput1 = mgr->GetCommonOutputContainer(); // Private output objects outputFileName.ReplaceAll(".root",""); diff --git a/PWG4/macros/ana.C b/PWG4/macros/ana.C index 7c159c4f56c..226e86fa97f 100644 --- a/PWG4/macros/ana.C +++ b/PWG4/macros/ana.C @@ -108,10 +108,8 @@ void ana(Int_t mode=mLocal, TString configName = "ConfigAnalysisPhoton") mgr->AddTask(taskpwg4); // Create containers for input/output - AliAnalysisDataContainer *cinput1 = mgr->CreateContainer("cchain",TChain::Class(), - AliAnalysisManager::kInputContainer); - AliAnalysisDataContainer *coutput1 = mgr->CreateContainer("tree", TTree::Class(), - AliAnalysisManager::kOutputContainer, "default"); + AliAnalysisDataContainer *cinput1 = mgr->GetCommonInputContainer(); + AliAnalysisDataContainer *coutput1 = mgr->GetCommonOutputContainer(); AliAnalysisDataContainer *coutput2 = mgr->CreateContainer("histos", TList::Class(), AliAnalysisManager::kOutputContainer, "histos.root"); diff --git a/PWG4/macros/anaExampleTask.C b/PWG4/macros/anaExampleTask.C index 57f4216e69c..eb29e3e0221 100644 --- a/PWG4/macros/anaExampleTask.C +++ b/PWG4/macros/anaExampleTask.C @@ -106,10 +106,8 @@ void anaExampleTask(Int_t mode=mLocal) mgr->AddTask(taskex); // Create containers for input/output - AliAnalysisDataContainer *cinput1 = mgr->CreateContainer("cchain",TChain::Class(), - AliAnalysisManager::kInputContainer); - AliAnalysisDataContainer *coutput1 = mgr->CreateContainer("tree", TTree::Class(), - AliAnalysisManager::kOutputContainer, "default"); + AliAnalysisDataContainer *cinput1 = mgr->GetCommonInputContainer(); + AliAnalysisDataContainer *coutput1 = mgr->GetCommonOutputContainer(); AliAnalysisDataContainer *coutput2 = mgr->CreateContainer("histos", TList::Class(), AliAnalysisManager::kOutputContainer, "histos.root"); diff --git a/PWG4/macros/anaPartCorrJetAn.C b/PWG4/macros/anaPartCorrJetAn.C index 1100a45125a..5fb2317c880 100644 --- a/PWG4/macros/anaPartCorrJetAn.C +++ b/PWG4/macros/anaPartCorrJetAn.C @@ -105,10 +105,8 @@ void anaPartCorrJetAn(Int_t mode=mLocal, TString configName = "ConfigAnalysisGam mgr->AddTask(taskpwg4); // Create containers for input/output - AliAnalysisDataContainer *cinput1 = mgr->CreateContainer("cchain",TChain::Class(), - AliAnalysisManager::kInputContainer); - AliAnalysisDataContainer *coutput1 = mgr->CreateContainer("tree", TTree::Class(), - AliAnalysisManager::kOutputContainer, "default"); + AliAnalysisDataContainer *cinput1 = mgr->GetCommonInputContainer(); + AliAnalysisDataContainer *coutput1 = mgr->GetCommonOutputContainer(); AliAnalysisDataContainer *coutput2 = mgr->CreateContainer("corrhistos", TList::Class(), AliAnalysisManager::kOutputContainer, "histos.root"); diff --git a/PWG4/macros/runESDQA.C b/PWG4/macros/runESDQA.C index b7d8c7cb0cd..5ca49067a36 100644 --- a/PWG4/macros/runESDQA.C +++ b/PWG4/macros/runESDQA.C @@ -85,8 +85,7 @@ void runESDQA() // Create containers for input/output // Top ESD container - AliAnalysisDataContainer *cin_esd = mgr->CreateContainer("cchain",TChain::Class(), - AliAnalysisManager::kInputContainer); + AliAnalysisDataContainer *cin_esd = mgr->GetCommonInputContainer(); // Histos //AliAnalysisDataContainer *cout_hist = mgr->CreateContainer("qa_hists", TObjArray::Class(), diff --git a/PWG4/macros/runESDQA_CAF.C b/PWG4/macros/runESDQA_CAF.C index 73103445676..0de276efa4b 100644 --- a/PWG4/macros/runESDQA_CAF.C +++ b/PWG4/macros/runESDQA_CAF.C @@ -82,8 +82,7 @@ void runESDQA_CAF(Char_t *dataset = "/PWG0/COMMON/LHC08c11_10TeV_0.5T", Int_t ma // Create containers for input/output // Top ESD container - AliAnalysisDataContainer *cin_esd = mgr->CreateContainer("cchain",TChain::Class(), - AliAnalysisManager::kInputContainer); + AliAnalysisDataContainer *cin_esd = mgr->GetCommonInputContainer(); //AliAnalysisDataContainer *cout_aodex = mgr->CreateContainer("cAodEx", TTree::Class(), // AliAnalysisManager::kExchangeContainer, "default");