Completion of previous checkin
authorfca <fca@f7af4fe6-9843-0410-8265-dc069ae4e863>
Wed, 18 Feb 2009 12:56:20 +0000 (12:56 +0000)
committerfca <fca@f7af4fe6-9843-0410-8265-dc069ae4e863>
Wed, 18 Feb 2009 12:56:20 +0000 (12:56 +0000)
35 files changed:
PWG2/AOD/runPWG2AODCreation.C
PWG2/AOD/runPWG2AODUpdate.C
PWG2/AnalysisMacros/Batch/runBatch.C
PWG2/AnalysisMacros/Interactive/runInteractive.C
PWG2/AnalysisMacros/Kine/runKine.C
PWG2/AnalysisMacros/Local/runLocal.C
PWG2/AnalysisMacros/Proof/runProof.C
PWG2/FEMTOSCOPY/macros/Batch/runBatch.C
PWG2/FEMTOSCOPY/macros/Local/runLocal.C
PWG2/FEMTOSCOPY/macros/Proof/runProof.C
PWG2/FLOW/macros/runAliAnalysisTaskFlow.C
PWG2/RESONANCES/macros/AddRsnAnalysisTask.C
PWG2/runAODAnalysisExample.C
PWG2/runProtonAnalysis.C
PWG2/runProtonAnalysisQA.C
PWG2/runProtonCorrection.C
PWG3/muon/AnalysisTrainFromStandardToMuonAODLocal.C
PWG3/muon/AnalysisTrainMuonCAF.C
PWG3/muon/AnalysisTrainMuonComp.C
PWG3/muon/AnalysisTrainMuonCompLocal.C
PWG3/muon/AnalysisTrainMuonLocal.C
PWG3/muon/AnalysisTrigChEff.C
PWG3/muon/RunLinkToMCAnalysisExample.C
PWG3/muon/RunSingleMuonAnalysisFromAOD.C
PWG3/muon/RunSingleMuonAnalysisFromESD.C
PWG3/muondep/MuonTrackingEffAnalysis.C
PWG3/muondep/RunRecoCheck.C
PWG3/vertexingHF/AliCFHeavyFlavourTask.C
PWG4/macros/AnalysisTrainCAF.C
PWG4/macros/ConfigGammaConversion.C
PWG4/macros/ana.C
PWG4/macros/anaExampleTask.C
PWG4/macros/anaPartCorrJetAn.C
PWG4/macros/runESDQA.C
PWG4/macros/runESDQA_CAF.C

index 3737547..fab5b0b 100644 (file)
@@ -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 );
index 7f3e73c..d301654 100644 (file)
@@ -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 );
index bc6f068..0717106 100644 (file)
@@ -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");
   
   //____________________________________________//
index 48dd03b..491ae75 100644 (file)
@@ -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");
   
   //____________________________________________//
index ffb70d2..af9c69a 100644 (file)
@@ -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");
   
   //____________________________________________//
index 238eabe..bcc3d1c 100644 (file)
@@ -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");
   
   //____________________________________________//
index 1a151b8..dcde338 100644 (file)
@@ -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);
index cf9994a..56620f5 100644 (file)
@@ -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);
 
index 7e26b8f..1f052db 100644 (file)
@@ -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");
   
   //____________________________________________//
index a0b9329..04fa308 100644 (file)
@@ -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");
   
   //____________________________________________//
index 709c6c7..28961d8 100644 (file)
@@ -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); 
index af4277a..da1c160 100644 (file)
@@ -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);
 
index 1af7df3..e6172b4 100644 (file)
@@ -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");
index 4cd6646..45bd87b 100644 (file)
@@ -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,
index db4fd03..75bc7ba 100644 (file)
@@ -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,
index 9c30281..a2ef53b 100755 (executable)
@@ -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)
index cf012ff..f3dd2f9 100644 (file)
@@ -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);
index 8e27c33..63d63a9 100644 (file)
@@ -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  );
index 6bff019..d58a67f 100644 (file)
@@ -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");
 
index 648a674..ce08b2c 100644 (file)
@@ -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");
 
index 2343e3f..2391354 100644 (file)
@@ -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");
index 369fd74..7e6c09e 100644 (file)
@@ -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(),
index c4eac3e..2df32f4 100644 (file)
@@ -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);
index 8a83ef0..918d80f 100644 (file)
@@ -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());
   
   //____________________________________________//
index 38828b1..27adcdc 100644 (file)
@@ -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");
index 548ac9f..83a2cdf 100644 (file)
@@ -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"); 
 
index ed888b4..362ed65 100644 (file)
@@ -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");
index c70ebc1..eef7883 100644 (file)
@@ -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());
index 671c318..772e082 100644 (file)
@@ -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();
     }   
 
index 851fc51..4de0853 100644 (file)
@@ -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","");
index 7c159c4..226e86f 100644 (file)
@@ -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");
     
index 57f4216..eb29e3e 100644 (file)
@@ -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");
     
index 1100a45..5fb2317 100644 (file)
@@ -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");
     
index b7d8c7c..5ca4906 100644 (file)
@@ -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(),
index 7310344..0de276e 100644 (file)
@@ -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");