Completion of previous checkin

diff --git a/PWG2/AOD/runPWG2AODCreation.C b/PWG2/AOD/runPWG2AODCreation.C
index 3737547f6292eadcd52ace4a7efd7b04bc5d9baa..fab5b0b75dd7b4e96f65ddf2c4efcd636542456b 100644 (file)
--- 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 7f3e73c1160c5704304239c4294572cda521a0dc..d301654a001a2fcf30c353a34f6b9a8d18f04add 100644 (file)
--- 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 bc6f068ea3c764bf414c0da492fd5bb14f251235..07171061b6706c42209e204779d5becd18a2d28f 100644 (file)
--- 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 48dd03bfbaa4113dcb1226d26c3d43bedb752ba2..491ae754dbd207873a461972f12da6d75917f94b 100644 (file)
--- 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 ffb70d2406cd03261206d6271314522d715b97e6..af9c69a4b0a771b2d703e7eb230b4d64cb48c606 100644 (file)
--- 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 238eabefc78d3a8839e7b222c6be6e86c3d236d5..bcc3d1c7b817ab88649fd0c6fb966f91f8eba102 100644 (file)
--- 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 1a151b8c6cd23819d35057b71e87dea50ed20444..dcde338ab614337a882e3eb426233f1de823ceb0 100644 (file)
--- 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 cf9994a5fccb80c8fcc12c09a29792ec4310aeec..56620f56ed5e7c34d49a97d44e3430c88afeffb5 100644 (file)
--- 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 7e26b8ff4c3872744535f8a020f6f9e800972ac0..1f052db30350ecb696baf2f55dcef3044b1fc116 100644 (file)
--- 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 a0b93296644b024a6c7466c2e74d7f861cc53aea..04fa308c054c569c7c36c37777586c29f44ebda9 100644 (file)
--- 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 709c6c7c54f42b85732e6735e05c42d8cd819628..28961d8bc561812df5d64d3de544688a7463eb01 100644 (file)
--- 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 af4277a8c7cf808d449f2857309115f8b34ca7fa..da1c160ccc7d0621eb8d42afec9c3b93bb5773e5 100644 (file)
--- 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 1af7df38c9751c0510f7b8fcad5998dda8bdb7dd..e6172b41f10919bec3f58e89d1845bc887f22241 100644 (file)
--- 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 4cd6646df91e47b00a674162fab57f4f0a1be37b..45bd87b4e225864635f35912aec39d9402ef53cf 100644 (file)
--- 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 db4fd03c14b71cf4253fd4d32185088b618126ee..75bc7ba4a62637dd3f00c6895e3a87b4417be6eb 100644 (file)
--- 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 9c302817b2746f328373839d380b921dfb88ff88..a2ef53b7f8083101a5ce4bd88a4f3c472e33805b 100755 (executable)
--- 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 cf012ff00ec306a4983a04410e4f3a5855437d5b..f3dd2f94c4016a701c493a284fc954a3b597024f 100644 (file)
--- 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 8e27c339993637ee54479e2d6f4dbc755419a434..63d63a9ad47fcd51e9970900bbcf6c2dc33d2ebd 100644 (file)
--- 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 6bff0199d418347f55aac27ddbc9843735b5a9aa..d58a67fae5cb6b40b94b0f37a6bf372c6433c0b3 100644 (file)
--- 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 648a67456865ed7b68020e361b74761cf8c380e0..ce08b2c312ac0c5effd74962fbf8ac781a49d17a 100644 (file)
--- 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 2343e3f0950267932135bc5d05c6d1744bab85c1..2391354db112adec1e445244d496a783d1175fc0 100644 (file)
--- 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 369fd74961ebb7f0157b71404951cd87b2f9c052..7e6c09e5bf670b32e5cb2d5d215074bc3ffc6bb4 100644 (file)
--- 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 c4eac3eb4ab5bc855160bd69a7264f0f80951281..2df32f4305ac163e98c7ad0d5ccd05823fb4746f 100644 (file)
--- 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 8a83ef03f0813f96c5838b559f1252f338beb183..918d80f5d347af9b0ffcb61d89c277ac7a6dcbd0 100644 (file)
--- 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 38828b1be4061c1365d3f6fbda0346518eed6207..27adcdc41fd296b8bddf6ff935fc49558fba767b 100644 (file)
--- 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 548ac9f4719c9041484aead4c64da895a9ea5bbf..83a2cdfc2dc2f446800080f7ef98e19065aebe8b 100644 (file)
--- 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 ed888b4a0c74433393f1e2804cec538962188ca6..362ed65907cdfc7c33f7b7ff20c0bad3a05c09b8 100644 (file)
--- 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 c70ebc1e3ff12278443d45870f33e09d6a07be06..eef78837a171aba77ca3464754e402cd14c6f369 100644 (file)
--- 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 671c31836f0339cdf7f6c8815c1da0d1f5350932..772e082763f228e5190177069515ae4cb92827ab 100644 (file)
--- 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 851fc51088453935e8ad221fe290947ae29aae3b..4de085316b491a610368f0cdc51dc8013e0e1642 100644 (file)
--- 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 â\80\98defaultâ\80\99 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 7c159c4f56c95066830aad85a890943da6cd1f36..226e86fa97ff2e45f5df9acf1a9331d3149ce3b6 100644 (file)
--- 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 57f4216e69cbda8b18e1c4bf20d925b5b1c14b16..eb29e3e0221b0e11f806973405f3f2c48f5a6ef3 100644 (file)
--- 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 1100a45125a0c89e04953e02f4650498e7ca1ce8..5fb2317c8808a4b07c2ec70e322122ba33258bf7 100644 (file)
--- 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 b7d8c7cb0cd43d465cc9e14f69d194ae864d4601..5ca49067a362fb74af849bc9a9f92845dcfcddd4 100644 (file)
--- 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 731034456761ea2d5c1477232e4411cabeb70c03..0de276efa4bbd8e4a045b214e59c2c23ad62692b 100644 (file)
--- 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");