Most PWG1 AddTask macros used in the pilot QA train were modified to use mgr->GetComm...

diff --git a/PWG1/PilotTrain/AddSDDPoints.C b/PWG1/PilotTrain/AddSDDPoints.C
index 503e90c137ee28e3f8845d09444feddffcebd50a..c6c374aea776845e3d2e1b861c4a9cd51d1b93d0 100644 (file)
--- a/PWG1/PilotTrain/AddSDDPoints.C
+++ b/PWG1/PilotTrain/AddSDDPoints.C
@@ -12,7 +12,7 @@ AliAnalysisTaskSE* AddSDDPoints() {
     
     
     AliAnalysisDataContainer *cinput1 = mgr->GetCommonInputContainer();
-    AliAnalysisDataContainer *coutput1 = mgr->CreateContainer("coutputRP",TList::Class(),AliAnalysisManager::kOutputContainer,"SDD.Performance.root");
+    AliAnalysisDataContainer *coutput1 = mgr->CreateContainer("coutputRP",TList::Class(),AliAnalysisManager::kOutputContainer,Form("%s:SDD_Performance", mgr->GetCommonFileName()));
     
     
     

diff --git a/PWG1/PilotTrain/AddTaskSPDQA.C b/PWG1/PilotTrain/AddTaskSPDQA.C
index 14a9d5c29ac4f5222ec2ff4001408d9c8da11333..28211f7d4b74d2250267211e0a45d18bd7d22aef 100644 (file)
--- a/PWG1/PilotTrain/AddTaskSPDQA.C
+++ b/PWG1/PilotTrain/AddTaskSPDQA.C
@@ -30,7 +30,7 @@ AliAnalysisTaskSE* AddTaskSPDQA() {
   AliAnalysisDataContainer *coutput1 = mgr->CreateContainer("coutput1",
                                                            TList::Class(),
                                                            AliAnalysisManager::kOutputContainer,
-                                                           "SPD.Performance.root");
+                                                           Form("%s:SPD_Performance",mgr->GetCommonFileName()));
 
 
 

diff --git a/PWG1/PilotTrain/AddTaskVZEROQA.C b/PWG1/PilotTrain/AddTaskVZEROQA.C
index a8ed634efe27f6a72fc8df26f7df2b5da229a2d0..f6d22980c3e14c3a8badf48dff6cdc2b1aee2a92 100644 (file)
--- a/PWG1/PilotTrain/AddTaskVZEROQA.C
+++ b/PWG1/PilotTrain/AddTaskVZEROQA.C
@@ -27,7 +27,8 @@ AliAnalysisTaskSE* AddTaskVZEROQA(Int_t runNumber)
    mgr->AddTask(task);\r
   \r
    AliAnalysisDataContainer *cout  = mgr->CreateContainer("QAVZEROHists",TList::Class(),\r
-                                                       AliAnalysisManager::kOutputContainer, "VZERO.Performance.root");\r
+                                                         AliAnalysisManager::kOutputContainer, Form("%s:VZERO_Performance", \r
+                                                                                                    mgr->GetCommonFileName()));\r
 \r
    mgr->ConnectInput  (task, 0, mgr->GetCommonInputContainer());\r
    mgr->ConnectOutput (task, 1, cout);\r

diff --git a/PWG1/TPC/macros/AddTaskPerformanceTPCQA.C b/PWG1/TPC/macros/AddTaskPerformanceTPCQA.C
index a0f9e22774c4754ddf00ecdfbe854c418a99bc87..2fd2daf0c5e5032c2a26153220587912693d8f8e 100644 (file)
--- a/PWG1/TPC/macros/AddTaskPerformanceTPCQA.C
+++ b/PWG1/TPC/macros/AddTaskPerformanceTPCQA.C
@@ -133,7 +133,7 @@ AliPerformanceTask* AddTaskPerformanceTPCQA(Bool_t bUseMCInfo=kFALSE, Bool_t bUs
   //
   // Create containers for output
   //
-  AliAnalysisDataContainer *coutput_tpc = mgr->CreateContainer("TPCQA", TList::Class(), AliAnalysisManager::kOutputContainer, Form("TPC.%s.root", task->GetName()));
+  AliAnalysisDataContainer *coutput_tpc = mgr->CreateContainer("TPCQA", TList::Class(), AliAnalysisManager::kOutputContainer, Form("%s:TPC_%s", mgr->GetCommonFileName(), task->GetName()));
   mgr->ConnectOutput(task, 1, coutput_tpc);
 
 return task;  

diff --git a/PWG1/TRD/macros/AddTRDcheckDET.C b/PWG1/TRD/macros/AddTRDcheckDET.C
index accf2909e4afa40576b4c23192cfa34a9e37cc26..74dde5e850ba514ebbe5bc0734bb3a2d3946d051 100644 (file)
--- a/PWG1/TRD/macros/AddTRDcheckDET.C
+++ b/PWG1/TRD/macros/AddTRDcheckDET.C
@@ -24,7 +24,7 @@ void AddTRDcheckDET(AliAnalysisManager *mgr, Char_t *trd, AliAnalysisDataContain
   mgr->ConnectInput ( task, 0, mgr->GetCommonInputContainer());
   mgr->ConnectInput ( task, 1, ci[1]);
   mgr->ConnectInput ( task, 2, ci[0]);
-  mgr->ConnectOutput( task, 1, mgr->CreateContainer(task->GetName(), TObjArray::Class(), AliAnalysisManager::kOutputContainer, "TRD.Performance.root"));
+  mgr->ConnectOutput( task, 1, mgr->CreateContainer(task->GetName(), TObjArray::Class(), AliAnalysisManager::kOutputContainer, Form("%s:TRD_Performance",mgr->GetCommonFileName())));
   
 
   // CALIBRATION
@@ -48,5 +48,5 @@ void AddTRDcheckDET(AliAnalysisManager *mgr, Char_t *trd, AliAnalysisDataContain
   // Create containers for input/output
   mgr->ConnectInput(ctask,  0, mgr->GetCommonInputContainer());
   mgr->ConnectInput(ctask,  1, ci[1]);
-  mgr->ConnectOutput(ctask, 1, mgr->CreateContainer(ctask->GetName(), TObjArray::Class(), AliAnalysisManager::kOutputContainer, Form("TRD.Task%s.root", ctask->GetName())));
+  mgr->ConnectOutput(ctask, 1, mgr->CreateContainer(ctask->GetName(), TObjArray::Class(), AliAnalysisManager::kOutputContainer, Form("%s:TRD.Task%s", mgr->GetCommonFileName(),ctask->GetName())));
 }

diff --git a/PWG1/TRD/macros/AddTRDcheckESD.C b/PWG1/TRD/macros/AddTRDcheckESD.C
index ffbe3e5fb7373d3f2bcdaee7662c547661b7f9cd..548fab172fcb845d54da3438f06cde4ba373ebb5 100644 (file)
--- a/PWG1/TRD/macros/AddTRDcheckESD.C
+++ b/PWG1/TRD/macros/AddTRDcheckESD.C
@@ -15,6 +15,6 @@ void AddTRDcheckESD(AliAnalysisManager *mgr)
   checkESD->SetDebugLevel(0);
 
   mgr->ConnectInput(checkESD,  0, mgr->GetCommonInputContainer());  
-  mgr->ConnectOutput(checkESD, 1, mgr->CreateContainer(checkESD->GetName(), TObjArray::Class(), AliAnalysisManager::kOutputContainer, "TRD.Performance.root"));
+  mgr->ConnectOutput(checkESD, 1, mgr->CreateContainer(checkESD->GetName(), TObjArray::Class(), AliAnalysisManager::kOutputContainer, Form("%s:TRD_Performance",mgr->GetCommonFileName())));
 }
 

diff --git a/PWG1/TRD/macros/AddTRDcheckPID.C b/PWG1/TRD/macros/AddTRDcheckPID.C
index c43178bad0c81db71e76f40a088a418a5c251a38..057c5557ab1dcbabae0bf89b2c3a3d7448286d40 100644 (file)
--- a/PWG1/TRD/macros/AddTRDcheckPID.C
+++ b/PWG1/TRD/macros/AddTRDcheckPID.C
@@ -28,7 +28,7 @@ void AddTRDcheckPID(AliAnalysisManager *mgr, Char_t *trd, AliAnalysisDataContain
   mgr->ConnectInput (pid, 0, mgr->GetCommonInputContainer());
   mgr->ConnectInput (pid, 1, ci[0]);
   mgr->ConnectInput (pid, 2, ci[1]);
-  mgr->ConnectOutput(pid, 1, mgr->CreateContainer(pid->GetName(), TObjArray::Class(), AliAnalysisManager::kOutputContainer, "TRD.Performance.root"));
+  mgr->ConnectOutput(pid, 1, mgr->CreateContainer(pid->GetName(), TObjArray::Class(), AliAnalysisManager::kOutputContainer, Form("%s:TRD_Performance",mgr->GetCommonFileName())));
   mgr->ConnectOutput(pid, 2, ce);
 
   if(!TSTBIT(map, kPIDRefMaker)) return;
@@ -44,8 +44,8 @@ void AddTRDcheckPID(AliAnalysisManager *mgr, Char_t *trd, AliAnalysisDataContain
   mgr->ConnectInput( ref, 1, ci[0]);
   mgr->ConnectInput( ref, 2, ci[1]);
   mgr->ConnectInput( ref, 3, ce);
-  mgr->ConnectOutput(ref, 1, mgr->CreateContainer("MonitorNN", TObjArray::Class(), AliAnalysisManager::kOutputContainer, "TRD.CalibPIDrefMaker.root"));
-  mgr->ConnectOutput(ref, 2, mgr->CreateContainer(ref->GetName(), TTree::Class(), AliAnalysisManager::kOutputContainer, "TRD.CalibPIDrefMaker.root"));
+  mgr->ConnectOutput(ref, 1, mgr->CreateContainer("MonitorNN", TObjArray::Class(), AliAnalysisManager::kOutputContainer, Form("%s:TRD.CalibPIDrefMaker",mgr->GetCommonFileName())));
+  mgr->ConnectOutput(ref, 2, mgr->CreateContainer(ref->GetName(), TTree::Class(), AliAnalysisManager::kOutputContainer, Form("%s:TRD.CalibPIDrefMaker", mgr->GetCommonFileName())));
 
   // TRD pid reference maker LQ 
   mgr->AddTask(ref = new AliTRDpidRefMakerLQ((char*)"refMakerLQ"));
@@ -57,8 +57,8 @@ void AddTRDcheckPID(AliAnalysisManager *mgr, Char_t *trd, AliAnalysisDataContain
   mgr->ConnectInput(ref, 1, ci[0]);
   mgr->ConnectInput(ref, 2, ci[1]);
   mgr->ConnectInput(ref, 3, ce);
-  mgr->ConnectOutput(ref, 1, mgr->CreateContainer("MonitorLQ", TObjArray::Class(), AliAnalysisManager::kOutputContainer, "TRD.CalibPIDrefMaker.root"));
-  mgr->ConnectOutput(ref, 2, mgr->CreateContainer(ref->GetName(), TTree::Class(), AliAnalysisManager::kOutputContainer, "TRD.CalibPIDrefMaker.root"));
-  mgr->ConnectOutput(ref, 3, mgr->CreateContainer("PDF", TObjArray::Class(), AliAnalysisManager::kOutputContainer, "TRD.CalibPIDrefMakerLQ.root"));
+  mgr->ConnectOutput(ref, 1, mgr->CreateContainer("MonitorLQ", TObjArray::Class(), AliAnalysisManager::kOutputContainer, Form("%s:TRD.CalibPIDrefMaker", mgr->GetCommonFileName())));
+  mgr->ConnectOutput(ref, 2, mgr->CreateContainer(ref->GetName(), TTree::Class(), AliAnalysisManager::kOutputContainer, Form("%s:TRD.CalibPIDrefMaker", mgr->GetCommonFileName())));
+  mgr->ConnectOutput(ref, 3, mgr->CreateContainer("PDF", TObjArray::Class(), AliAnalysisManager::kOutputContainer, Form("%s:TRD.CalibPIDrefMakerLQ", mgr->GetCommonFileName())));
 }
 

diff --git a/PWG1/TRD/macros/AddTRDefficiency.C b/PWG1/TRD/macros/AddTRDefficiency.C
index 6b8f2b6a1cf8f01809871f8f27708ddcbab66ae0..0eb916be0b2125d7b973fb7f0bf1cfd5b8bfca25 100644 (file)
--- a/PWG1/TRD/macros/AddTRDefficiency.C
+++ b/PWG1/TRD/macros/AddTRDefficiency.C
@@ -20,7 +20,7 @@ void AddTRDefficiency(AliAnalysisManager *mgr, Char_t *trd, AliAnalysisDataConta
   //AliLog::SetClassDebugLevel("AliTRDefficiency", 5);  
   mgr->ConnectInput(eff, 0, mgr->GetCommonInputContainer());  
   mgr->ConnectInput(eff, 1, ci[0]);
-  mgr->ConnectOutput(eff,1, mgr->CreateContainer(eff->GetName(), TObjArray::Class(), AliAnalysisManager::kOutputContainer, "TRD.Performance.root"));
+  mgr->ConnectOutput(eff,1, mgr->CreateContainer(eff->GetName(), TObjArray::Class(), AliAnalysisManager::kOutputContainer, Form("%s:TRD_Performance", mgr->GetCommonFileName())));
     
 
   // TRD combined tracking efficiency
@@ -32,7 +32,7 @@ void AddTRDefficiency(AliAnalysisManager *mgr, Char_t *trd, AliAnalysisDataConta
     // Create containers for input/output
     mgr->ConnectInput(eff, 0, mgr->GetCommonInputContainer());  
     mgr->ConnectInput(eff, 1, ci[0]);
-    mgr->ConnectOutput(eff, 1, mgr->CreateContainer(eff->GetName(), TObjArray::Class(), AliAnalysisManager::kOutputContainer, Form("TRD.Performance.root", eff->GetName())));
+    mgr->ConnectOutput(eff, 1, mgr->CreateContainer(eff->GetName(), TObjArray::Class(), AliAnalysisManager::kOutputContainer, Form("%s:TRD_Performance", mgr->GetCommonFileName(),eff->GetName())));
   }
 
   // TRD single track selection
@@ -43,6 +43,6 @@ void AddTRDefficiency(AliAnalysisManager *mgr, Char_t *trd, AliAnalysisDataConta
   //AliLog::SetClassDebugLevel("AliTRDmultiplicity", 5);  
   mgr->ConnectInput(eff, 0, mgr->GetCommonInputContainer());  
   mgr->ConnectInput(eff, 1, ci[0]);
-  mgr->ConnectOutput(eff, 1, mgr->CreateContainer(eff->GetName(), TObjArray::Class(), AliAnalysisManager::kOutputContainer, Form("TRD.Calib%s.root", eff->GetName())));
+  mgr->ConnectOutput(eff, 1, mgr->CreateContainer(eff->GetName(), TObjArray::Class(), AliAnalysisManager::kOutputContainer, Form("%s:TRD.Calib%s", mgr->GetCommonFileName(),eff->GetName())));
 }
 

diff --git a/PWG1/TRD/macros/AddTRDresolution.C b/PWG1/TRD/macros/AddTRDresolution.C
index 471424d265c3d8b0313bcc4680d0a5c87e6ed4e6..824927203e941b347da9e98c122afbff20037096 100644 (file)
--- a/PWG1/TRD/macros/AddTRDresolution.C
+++ b/PWG1/TRD/macros/AddTRDresolution.C
@@ -29,7 +29,7 @@ void AddTRDresolution(AliAnalysisManager *mgr, Char_t *trd, AliAnalysisDataConta
     res->SetNameId(suffix[itq]);
     mgr->ConnectInput(res, 0, mgr->GetCommonInputContainer());  
     mgr->ConnectInput(res, 1, ci[itq]);
-    mgr->ConnectOutput(res,1, mgr->CreateContainer(res->GetName(), TObjArray::Class(), AliAnalysisManager::kOutputContainer, "TRD.Performance.root"));
+    mgr->ConnectOutput(res,1, mgr->CreateContainer(res->GetName(), TObjArray::Class(), AliAnalysisManager::kOutputContainer, Form("%s:TRD_Performance", mgr->GetCommonFileName())));
   
     // Create output containers for calibration tasks
     AliAnalysisDataContainer *co(NULL);
@@ -53,7 +53,7 @@ void AddTRDresolution(AliAnalysisManager *mgr, Char_t *trd, AliAnalysisDataConta
   
       mgr->ConnectInput(taskCl,  0, mgr->GetCommonInputContainer()); 
       mgr->ConnectInput(taskCl,  1, (AliAnalysisDataContainer*)coa->FindObject(Form("%sCl2Trk%s", res->GetName(), suffix)));
-      mgr->ConnectOutput(taskCl, 1, mgr->CreateContainer(taskCl->GetName(), TObjArray::Class(), AliAnalysisManager::kOutputContainer, "TRD.CalibClErrParam.root"));*/
+      mgr->ConnectOutput(taskCl, 1, mgr->CreateContainer(taskCl->GetName(), TObjArray::Class(), AliAnalysisManager::kOutputContainer, Form("%s:TRD.CalibClErrParam", mgr->GetCommonFileName())));*/
   
       AliLog::SetClassDebugLevel("AliTRDclusterResolution", 5);  
       mgr->AddTask(taskCl = new AliTRDclusterResolution((char*)"ClErrCalibMC"));
@@ -61,7 +61,7 @@ void AddTRDresolution(AliAnalysisManager *mgr, Char_t *trd, AliAnalysisDataConta
       taskCl->SetDebugLevel(0);
       mgr->ConnectInput(taskCl,  0, mgr->GetCommonInputContainer());  
       mgr->ConnectInput(taskCl,  1, (AliAnalysisDataContainer*)coa->FindObject(Form("%sCl2MC%s", res->GetName(), suffix)));
-      mgr->ConnectOutput(taskCl, 1, mgr->CreateContainer(taskCl->GetName(), TObjArray::Class(), AliAnalysisManager::kOutputContainer, "TRD.CalibClErrParam.root"));
+      mgr->ConnectOutput(taskCl, 1, mgr->CreateContainer(taskCl->GetName(), TObjArray::Class(), AliAnalysisManager::kOutputContainer, Form("%s:TRD.CalibClErrParam", mgr->GetCommonFileName())));
     }
   }
 
@@ -75,7 +75,7 @@ void AddTRDresolution(AliAnalysisManager *mgr, Char_t *trd, AliAnalysisDataConta
     mgr->ConnectInput(taskAlign,  0, mgr->GetCommonInputContainer());  
     mgr->ConnectInput(taskAlign,  1, (AliAnalysisDataContainer*)coa->FindObject("TRDresolutionCl2Trk"));  
     mgr->ConnectOutput(taskAlign, 1, mgr->CreateContainer(Form("h%s", taskAlign->GetName()), TObjArray::Class(), AliAnalysisManager::kExchangeContainer));
-    mgr->ConnectOutput(taskAlign, 2, mgr->CreateContainer(taskAlign->GetName(), TTree::Class(), AliAnalysisManager::kOutputContainer, Form("TRD.Calib%s.root", taskAlign->GetName())));
+    mgr->ConnectOutput(taskAlign, 2, mgr->CreateContainer(taskAlign->GetName(), TTree::Class(), AliAnalysisManager::kOutputContainer, Form("%s:TRD.Calib%s",mgr->GetCommonFileName(), taskAlign->GetName())));
   }
 }
 

diff --git a/PWG1/global/AliAnalysisTaskVertexESD.cxx b/PWG1/global/AliAnalysisTaskVertexESD.cxx
index 7608acfb75ac84c2264f56e9a8e7797d3b1aaa53..cbc71a8528b0d9aaacb4b2bd6e6388b9968a2020 100644 (file)
--- a/PWG1/global/AliAnalysisTaskVertexESD.cxx
+++ b/PWG1/global/AliAnalysisTaskVertexESD.cxx
@@ -145,6 +145,7 @@ void AliAnalysisTaskVertexESD::UserCreateOutputObjects()
 
   fNtupleBeamSpot = new TNtuple("fNtupleBeamSpot", "beamSpot", "run:tstamp:triggered:ntrklets:xTRKnc:yTRKnc:zTRKnc:ntrksTRKnc");
   fOutput->Add(fNtupleBeamSpot);
+  PostData(1, fOutput);
 
   return;
 }

diff --git a/PWG1/macros/AddTaskMTRchamberEfficiency.C b/PWG1/macros/AddTaskMTRchamberEfficiency.C
index f402eb48c8fa389534ef9303910984712d79d639..a5a2330c95451080c491a3697cb47731fea7c752 100644 (file)
--- a/PWG1/macros/AddTaskMTRchamberEfficiency.C
+++ b/PWG1/macros/AddTaskMTRchamberEfficiency.C
@@ -30,7 +30,7 @@ AliAnalysisTaskTrigChEff *AddTaskMTRchamberEfficiency(Bool_t useGhosts = kFALSE)
 
   //
   // Create containers for input/output
-  AliAnalysisDataContainer *cOutputTrigChEff = mgr->CreateContainer("triggerChamberEff", TList::Class(), AliAnalysisManager::kOutputContainer, "MUON.TriggerEfficiencyMap.root");
+  AliAnalysisDataContainer *cOutputTrigChEff = mgr->CreateContainer("triggerChamberEff", TList::Class(), AliAnalysisManager::kOutputContainer, Form("%s:MUON.TriggerEfficiencyMap", mgr->GetCommonFileName()));
 
   // Attach input
   mgr->ConnectInput(taskTrigChEff,0,mgr->GetCommonInputContainer());

diff --git a/PWG1/macros/AddTaskPerformanceITS.C b/PWG1/macros/AddTaskPerformanceITS.C
index c2551742a5bc7be29c30edff879aa90d3765bfa4..3b02b23f01b7810634b6d9e40b78260a17bcba97 100644 (file)
--- a/PWG1/macros/AddTaskPerformanceITS.C
+++ b/PWG1/macros/AddTaskPerformanceITS.C
@@ -29,7 +29,7 @@ AliAnalysisTaskITSTrackingCheck *AddTaskPerformanceITS(Bool_t readMC=kFALSE,
 
   //
   // Create containers for input/output
-  AliAnalysisDataContainer *cOutputITS = mgr->CreateContainer("cOutputITS",TList::Class(),AliAnalysisManager::kOutputContainer,"ITS.Performance.root");
+  AliAnalysisDataContainer *cOutputITS = mgr->CreateContainer("cOutputITS",TList::Class(),AliAnalysisManager::kOutputContainer,Form("%s:ITS_Performance",mgr->GetCommonFileName()));
 
 
   // Attach input

diff --git a/PWG1/macros/AddTaskV0QA.C b/PWG1/macros/AddTaskV0QA.C
index 25ac78a4bd8d680faee230771d0807efff135a67..d29d7e2ba52331104a5c940d2db0c1c393f50ee8 100644 (file)
--- a/PWG1/macros/AddTaskV0QA.C
+++ b/PWG1/macros/AddTaskV0QA.C
@@ -60,7 +60,7 @@ AliAnalysisTaskV0QA *AddTaskV0QA(Bool_t bUseMCInfo=kTRUE)
 
    AliAnalysisDataContainer *coutput_v0QA =  
    mgr->CreateContainer("V0QA", TList::Class(), 
-                       AliAnalysisManager::kOutputContainer, Form("%s.root", v0QA->GetName()));
+                       AliAnalysisManager::kOutputContainer, Form("%s:%s", mgr->GetCommonFileName(),v0QA->GetName()));
    mgr->ConnectOutput(v0QA, 1, coutput_v0QA);
        
 

diff --git a/PWG1/macros/AddTaskVertexESD.C b/PWG1/macros/AddTaskVertexESD.C
index fe003954dfdaa2e6cfbe62c7d8894cae4df44f83..84da9a34ab95e85b71079d1cc414a014ca5f9e1d 100644 (file)
--- a/PWG1/macros/AddTaskVertexESD.C
+++ b/PWG1/macros/AddTaskVertexESD.C
@@ -27,7 +27,7 @@ AliAnalysisTaskVertexESD *AddTaskVertexESD()
   // Create containers for input/output
   AliAnalysisDataContainer *cInputVtxESD = mgr->CreateContainer("cInputVtxESD",TChain::Class(),AliAnalysisManager::kInputContainer);
 
-  AliAnalysisDataContainer *cOutputVtxESD = mgr->CreateContainer("cOutputVtxESD",TList::Class(),AliAnalysisManager::kOutputContainer,"Vertex.Performance.root");
+  AliAnalysisDataContainer *cOutputVtxESD = mgr->CreateContainer("cOutputVtxESD",TList::Class(),AliAnalysisManager::kOutputContainer, Form("%s:Vertex_Performance", mgr->GetCommonFileName()));
 
 
   // Attach input