New way to set input and output containers for AliAnalysisManager

diff --git a/PWG3/vertexingHF/AliAnalysisTaskSECompareHFTest.C b/PWG3/vertexingHF/AliAnalysisTaskSECompareHFTest.C
index a893632b09d77bb6f8f280c82cb869730b0030f1..84dcc5a638ad409a4759defec90dc80ab93f82f1 100644 (file)
--- a/PWG3/vertexingHF/AliAnalysisTaskSECompareHFTest.C
+++ b/PWG3/vertexingHF/AliAnalysisTaskSECompareHFTest.C
@@ -56,14 +56,18 @@ void AliAnalysisTaskSECompareHFTest()
   \r
   //\r
   // Create containers for input/output\r
+  mgr->ConnectInput(hfTask,0,mgr->GetCommonInputContainer());\r
+  /*  \r
+  // before v4-17-Release\r
   AliAnalysisDataContainer *cinput = mgr->CreateContainer("cinput",TChain::Class(), \r
-                                                         AliAnalysisManager::kInputContainer);\r
+                                                 AliAnalysisManager::kInputContainer);\r
+  mgr->ConnectInput(hfTask,0,cinput);\r
+  */\r
   AliAnalysisDataContainer *coutput = mgr->CreateContainer("coutput",TList::Class(),\r
                                                           AliAnalysisManager::kOutputContainer, \r
                                                           "CmpHF.root");\r
-  mgr->ConnectInput(hfTask,0,cinput);\r
   mgr->ConnectOutput(hfTask,1,coutput);\r
-\r
+  \r
   //\r
   // Run the analysis\r
   //    \r

diff --git a/PWG3/vertexingHF/AliAnalysisTaskSESelectHFTest.C b/PWG3/vertexingHF/AliAnalysisTaskSESelectHFTest.C
index 3defab27ee06d9111a0ca7b4903f00a51ccded93..0507e336327670905062c326f5ca635dab5750c0 100644 (file)
--- a/PWG3/vertexingHF/AliAnalysisTaskSESelectHFTest.C
+++ b/PWG3/vertexingHF/AliAnalysisTaskSESelectHFTest.C
@@ -63,6 +63,10 @@ void AliAnalysisTaskSESelectHFTest()
   \r
   //\r
   // Create containers for input/output\r
+  mgr->ConnectInput(hfTask,0,mgr->GetCommonInputContainer());\r
+  mgr->ConnectOutput(hfTask,0,mgr->GetCommonOutputContainer());\r
+  /*\r
+  // before v4-17-Release\r
   AliAnalysisDataContainer *cinput1 = mgr->CreateContainer("cchain",TChain::Class(), \r
                                                           AliAnalysisManager::kInputContainer);\r
   AliAnalysisDataContainer *coutput1 = mgr->CreateContainer("tree", TTree::Class(),\r
@@ -70,6 +74,7 @@ void AliAnalysisTaskSESelectHFTest()
                                                            "default");\r
   mgr->ConnectInput(hfTask,0,cinput1);\r
   mgr->ConnectOutput(hfTask,0,coutput1);\r
+  */\r
 \r
   //\r
   // Run the analysis\r

diff --git a/PWG3/vertexingHF/AliAnalysisTaskSEVertexingHFTest.C b/PWG3/vertexingHF/AliAnalysisTaskSEVertexingHFTest.C
index 3924a256341281e82ef37cfd5def5baae4364a80..38707ab431230d79b05ba60bb5c1421829c9baee 100644 (file)
--- a/PWG3/vertexingHF/AliAnalysisTaskSEVertexingHFTest.C
+++ b/PWG3/vertexingHF/AliAnalysisTaskSEVertexingHFTest.C
@@ -7,7 +7,7 @@ void AliAnalysisTaskSEVertexingHFTest()
 \r
   Bool_t inputAOD=kTRUE; // otherwise, ESD\r
   TString mode="local"; // otherwise, "grid" \r
-  Bool_t useParFiles=kTRUE;\r
+  Bool_t useParFiles=kFALSE;\r
 \r
   gROOT->LoadMacro("$ALICE_ROOT/PWG3/vertexingHF/LoadLibraries.C");\r
   LoadLibraries(useParFiles);\r
@@ -84,13 +84,18 @@ void AliAnalysisTaskSEVertexingHFTest()
   \r
   //\r
   // Create containers for input/output\r
+  mgr->ConnectInput(hfTask,0,mgr->GetCommonInputContainer());\r
+  mgr->ConnectOutput(hfTask,0,mgr->GetCommonOutputContainer());\r
+  /* \r
+  // before v4-17-Release\r
   AliAnalysisDataContainer *cinput1 = mgr->CreateContainer("cchain",TChain::Class(), \r
                                                           AliAnalysisManager::kInputContainer);\r
   AliAnalysisDataContainer *coutput1 = mgr->CreateContainer("tree", TTree::Class(),\r
                                                            AliAnalysisManager::kOutputContainer, \r
-                                                           "default");\r
+                                                           "default"); \r
   mgr->ConnectInput(hfTask,0,cinput1);\r
   mgr->ConnectOutput(hfTask,0,coutput1);\r
+  */\r
 \r
   //\r
   // Run the analysis\r

diff --git a/PWG3/vertexingHF/AliCFHeavyFlavourTask.C b/PWG3/vertexingHF/AliCFHeavyFlavourTask.C
index 1584a933a35f1d37ba19c1f8680111076fdbfaf9..c70ebc1e3ff12278443d45870f33e09d6a07be06 100644 (file)
--- 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 bc1cc62e04562a1d8067fb86c06dbf48a5c98127..c13540b2961290554e6e0aa1384149b5d29fc783 100644 (file)
--- 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
   //