update add macros for the PWG1 location

diff --git a/PWG1/TRD/macros/AddTRDcheckDET.C b/PWG1/TRD/macros/AddTRDcheckDET.C
index 720783e58efb50e24342158387cf18342ac96987..b2c2be57647859219060576f15a3680033ea6f2e 100644 (file)
--- a/PWG1/TRD/macros/AddTRDcheckDET.C
+++ b/PWG1/TRD/macros/AddTRDcheckDET.C
@@ -1,12 +1,12 @@
 #if ! defined (__CINT__) || defined (__MAKECINT__)
 #include "AliAnalysisManager.h"
 #include "AliAnalysisDataContainer.h"
-#include "TRD/qaRec/macros/AliTRDperformanceTrain.h"
-#include "TRD/qaRec/AliTRDcheckDET.h"
-#include "TRD/qaRec/AliTRDcalibration.h"
+#include "PWG1/TRD/macros/AliTRDperformanceTrain.h"
+#include "PWG1/TRD/AliTRDcheckDET.h"
+#include "PWG1/TRD/AliTRDcalibration.h"
 #endif
 
-#include "TRD/qaRec/macros/helper.C"
+#include "PWG1/TRD/macros/helper.C"
 void AddTRDcheckDET(AliAnalysisManager *mgr, Char_t *trd, AliAnalysisDataContainer **ci/*, AliAnalysisDataContainer **co*/)
 {
   Int_t map = ParseOptions(trd);

diff --git a/PWG1/TRD/macros/AddTRDcheckESD.C b/PWG1/TRD/macros/AddTRDcheckESD.C
index b0b2d899b96bf701e91f691217af7a80f354ed8e..8c2db812fd63c9195f8ee1d06258f3ed45ce5668 100644 (file)
--- a/PWG1/TRD/macros/AddTRDcheckESD.C
+++ b/PWG1/TRD/macros/AddTRDcheckESD.C
@@ -1,7 +1,7 @@
 #if ! defined (__CINT__) || defined (__MAKECINT__)
 #include "AliAnalysisManager.h"
 #include "AliAnalysisDataContainer.h"
-#include "TRD/qaRec/AliTRDcheckESD.h"
+#include "PWG1/TRD/AliTRDcheckESD.h"
 #endif
 
 void AddTRDcheckESD(AliAnalysisManager *mgr)

diff --git a/PWG1/TRD/macros/AddTRDcheckPID.C b/PWG1/TRD/macros/AddTRDcheckPID.C
index dc737c542561d6edf48af38c56635d37f426e5d7..a8e43dfe455446b2cbcb35715e9d72858dd3c3c9 100644 (file)
--- a/PWG1/TRD/macros/AddTRDcheckPID.C
+++ b/PWG1/TRD/macros/AddTRDcheckPID.C
@@ -3,12 +3,12 @@
 #include "AliLog.h"
 #include "AliAnalysisManager.h"
 #include "AliAnalysisDataContainer.h"
-#include "TRD/qaRec/macros/AliTRDperformanceTrain.h"
-#include "TRD/qaRec/AliTRDcheckPID.h"
-#include "TRD/qaRec/AliTRDpidRefMaker.h"
+#include "PWG1/TRD/macros/AliTRDperformanceTrain.h"
+#include "PWG1/TRD/AliTRDcheckPID.h"
+#include "PWG1/TRD/AliTRDpidRefMaker.h"
 #endif
 
-#include "TRD/qaRec/macros/helper.C"
+#include "PWG1/TRD/macros/helper.C"
 void AddTRDcheckPID(AliAnalysisManager *mgr, Char_t *trd, AliAnalysisDataContainer **ci/*, AliAnalysisDataContainer **co*/)
 {
   Int_t map = ParseOptions(trd);

diff --git a/PWG1/TRD/macros/AddTRDefficiency.C b/PWG1/TRD/macros/AddTRDefficiency.C
index 6064653b5a51c2bd3265b52b58f446feb4e519c1..d3ddd5443e79126423d3c29e3e09897a44d617c0 100644 (file)
--- a/PWG1/TRD/macros/AddTRDefficiency.C
+++ b/PWG1/TRD/macros/AddTRDefficiency.C
@@ -1,13 +1,13 @@
 #if ! defined (__CINT__) || defined (__MAKECINT__)
 #include "AliAnalysisManager.h"
 #include "AliAnalysisDataContainer.h"
-#include "TRD/qaRec/macros/AliTRDperformanceTrain.h"
-#include "TRD/qaRec/AliTRDefficiency.h"
-#include "TRD/qaRec/AliTRDefficiencyMC.h"
-#include "TRD/qaRec/AliTRDmultiplicity.h"
+#include "PWG1/TRD/macros/AliTRDperformanceTrain.h"
+#include "PWG1/TRD/AliTRDefficiency.h"
+#include "PWG1/TRD/AliTRDefficiencyMC.h"
+#include "PWG1/TRD/AliTRDmultiplicity.h"
 #endif
 
-#include "TRD/qaRec/macros/helper.C"
+#include "PWG1/TRD/macros/helper.C"
 void AddTRDefficiency(AliAnalysisManager *mgr, Char_t *trd, AliAnalysisDataContainer **ci/*, AliAnalysisDataContainer **co*/)
 {
   Int_t map = ParseOptions(trd);

diff --git a/PWG1/TRD/macros/AddTRDinfoGen.C b/PWG1/TRD/macros/AddTRDinfoGen.C
index 5d52275b65ad87610cc754ca7779ef08091948ae..194d9920dacf74db15068e4aa404f81b25363ca8 100644 (file)
--- a/PWG1/TRD/macros/AddTRDinfoGen.C
+++ b/PWG1/TRD/macros/AddTRDinfoGen.C
@@ -1,12 +1,12 @@
 #if ! defined (__CINT__) || defined (__MAKECINT__)
 #include "AliAnalysisManager.h"
 #include "AliAnalysisDataContainer.h"
-#include "TRD/qaRec/AliTRDinfoGen.h"
-#include "TRD/qaRec/info/AliTRDeventInfo.h"
-#include "TRD/qaRec/macros/AliTRDperformanceTrain.h"
+#include "PWG1/TRD/AliTRDinfoGen.h"
+#include "PWG1/TRD/info/AliTRDeventInfo.h"
+#include "PWG1/TRD/macros/AliTRDperformanceTrain.h"
 #endif
 
-#include "TRD/qaRec/macros/helper.C"
+#include "PWG1/TRD/macros/helper.C"
 void AddTRDinfoGen(AliAnalysisManager *mgr, Char_t *trd, AliAnalysisDataContainer **/*ci*/, AliAnalysisDataContainer **co)
 {
   Int_t map = ParseOptions(trd);

diff --git a/PWG1/TRD/macros/AddTRDresolution.C b/PWG1/TRD/macros/AddTRDresolution.C
index 24f3698bfb0246a7ba0acbb3b0378dbd968eb72b..ef618ac4d1211501329f0e178b3a7eaf2fa86614 100644 (file)
--- a/PWG1/TRD/macros/AddTRDresolution.C
+++ b/PWG1/TRD/macros/AddTRDresolution.C
@@ -2,13 +2,13 @@
 #include "TTree.h"
 #include "AliAnalysisManager.h"
 #include "AliAnalysisDataContainer.h"
-#include "TRD/qaRec/macros/AliTRDperformanceTrain.h"
-#include "TRD/qaRec/AliTRDresolution.h"
-#include "TRD/qaRec/AliTRDclusterResolution.h"
-#include "TRD/qaRec/AliTRDalignmentTask.h"
+#include "PWG1/TRD/macros/AliTRDperformanceTrain.h"
+#include "PWG1/TRD/AliTRDresolution.h"
+#include "PWG1/TRD/AliTRDclusterResolution.h"
+#include "PWG1/TRD/AliTRDalignmentTask.h"
 #endif
 
-#include "TRD/qaRec/macros/helper.C"
+#include "PWG1/TRD/macros/helper.C"
 void AddTRDresolution(AliAnalysisManager *mgr, Char_t *trd, AliAnalysisDataContainer **ci/*, AliAnalysisDataContainer **co*/)
 {
   Int_t map = ParseOptions(trd);

diff --git a/PWG1/TRD/run.C b/PWG1/TRD/run.C
index 7a731cf248ff27e8a06696058d2102f1612b3332..c29d9834cb3cf8d6615a04c7d924fe62b002928d 100644 (file)
--- a/PWG1/TRD/run.C
+++ b/PWG1/TRD/run.C
@@ -23,7 +23,6 @@
 // gSystem->Load("libMemStatGui.so")
 // gSystem->Load("libANALYSIS.so")
 // gSystem->Load("libANALYSISalice.so")
-// gSystem->Load("libTRDqaRec.so")
 // gSystem->Load("libPWG1.so");
 // gSystem->Load("libNetx.so") ;
 // gSystem->Load("libRAliEn.so");
@@ -65,26 +64,24 @@
 #include "TRD/AliTRDtrackerV1.h"
 #include "TRD/AliTRDcalibDB.h"
 
-#include "TRD/qaRec/macros/AliTRDperformanceTrain.h"
-#include "TRD/qaRec/macros/AddTRDcheckESD.C"
-#include "TRD/qaRec/macros/AddTRDinfoGen.C"
-#include "TRD/qaRec/macros/AddTRDcheckDET.C"
-#include "TRD/qaRec/macros/AddTRDefficiency.C"
-#include "TRD/qaRec/macros/AddTRDresolution.C"
-#include "TRD/qaRec/macros/AddTRDcheckPID.C"
+#include "PWG1/TRD/macros/AliTRDperformanceTrain.h"
+#include "PWG1/TRD/macros/AddTRDcheckESD.C"
+#include "PWG1/TRD/macros/AddTRDinfoGen.C"
+#include "PWG1/TRD/macros/AddTRDcheckDET.C"
+#include "PWG1/TRD/macros/AddTRDefficiency.C"
+#include "PWG1/TRD/macros/AddTRDresolution.C"
+#include "PWG1/TRD/macros/AddTRDcheckPID.C"
 
-#include "PWG1/macros/AddPerformanceTask.C"
 #endif
 
-#include "../../TRD/qaRec/macros/AliTRDperformanceTrain.h"
-#include "../../PWG1/macros/AddPerformanceTask.h"
+#include "macros/AliTRDperformanceTrain.h"
 
 
 Bool_t MEM = kFALSE;
 
 TChain* MakeChainLST(const char* filename = 0x0);
 TChain* MakeChainXML(const char* filename = 0x0);
-void run(Char_t *trd="ALL", Char_t *tpc="ALL", const Char_t *files=0x0, Long64_t nev=1234567890, Long64_t first = 0)
+void run(Char_t *trd="ALL", const Char_t *files=0x0, Long64_t nev=1234567890, Long64_t first = 0)
 {
   TMemStat *mem = 0x0;
   if(MEM){ 
@@ -102,9 +99,10 @@ void run(Char_t *trd="ALL", Char_t *tpc="ALL", const Char_t *files=0x0, Long64_t
   AliLog::SetGlobalLogLevel(AliLog::kError);
   if(gSystem->Load("libANALYSIS.so")<0) return;
   if(gSystem->Load("libANALYSISalice.so")<0) return;
+  if(gSystem->Load("libPWG1.so")<0) return;
 
-  Bool_t fHasMCdata = 1;//HasReadMCData(trd);
-  //Bool_t fHasFriends = HasReadFriendData(trd);
+  Bool_t fHasMCdata =  HasReadMCData(trd);
+  Bool_t fHasFriends = HasReadFriendData(trd);
   
   // INITIALIZATION OF RUNNING ENVIRONMENT
   //TODO We should use the GRP if available similar to AliReconstruction::InitGRP()!
@@ -147,60 +145,10 @@ void run(Char_t *trd="ALL", Char_t *tpc="ALL", const Char_t *files=0x0, Long64_t
   if(fHasMCdata) mgr->SetMCtruthEventHandler(mcH = new AliMCEventHandler());
   //mgr->SetDebugLevel(10);
 
-
-
-///////////////////////////////////////////////////////////
-///////////////         TRD                     ///////////
-///////////////////////////////////////////////////////////
-  // TRD specific library
-  if(gSystem->Load("libTRDqaRec.so")<0) return;
-  // TRD data containers
-  AliAnalysisDataContainer *ci[] = {0x0, 0x0, 0x0};
-
-
-  // initialize TRD settings
-  AliTRDcalibDB *cal = AliTRDcalibDB::Instance();
-  AliTRDtrackerV1::SetNTimeBins(cal->GetNumberOfTimeBins());
-
-  // plug (set of) TRD wagons in the train
-  if(trd){
-    for(Int_t it=0; it<NTRDQATASKS; it++){
-      if(gROOT->LoadMacro(Form("$ALICE_ROOT/TRD/qaRec/macros/Add%s.C+", TString(fgkTRDtaskClassName[it])(3,20).Data()))) {
-        Error("run.C", Form("Error loading %s task.", fgkTRDtaskClassName[it]));
-        return;
-      } 
-  
-      switch(it){
-      case kCheckESD:
-        AddTRDcheckESD(mgr); break;
-      case kInfoGen:
-        AddTRDinfoGen(mgr, trd, 0x0, ci); break;
-      case kCheckDET:
-        AddTRDcheckDET(mgr, trd, ci); break;
-      case kEfficiency:
-        AddTRDefficiency(mgr, trd, ci); break;
-      case kResolution:
-        AddTRDresolution(mgr, trd, ci); break;
-      case kCheckPID:
-        AddTRDcheckPID(mgr, trd, ci); break;
-      default:
-        Warning("run.C", Form("No performance task registered at slot %d.", it)); 
-      }
-    }
-  }
-
-///////////////////////////////////////////////////////////
-///////////////         TPC                     ///////////
-///////////////////////////////////////////////////////////
-  if(gSystem->Load("libPWG1.so")<0) return;
-  
-  // BUILD STEERING TASK FOR TPC
-  if(tpc){
-    if(gROOT->LoadMacro("$ALICE_ROOT/PWG1/macros/AddPerformanceTask.C+")) {
-      Error("run.C", "Error loading AliPerformanceTask task.");
-      return;
-    } 
-    AddPerformanceTask(mgr, tpc);
+  gROOT->LoadMacro("$ALICE_ROOT/PWG1/macros/AddTrainPerformanceTRD.C");
+  if(! AddTrainPerformanceTRD(fHasMCdata, fHasFriends, trd)) {
+    Error("run.C", "Error loading TRD train.");
+    return;
   }
 
   if (!mgr->InitAnalysis()) return;
@@ -214,7 +162,6 @@ void run(Char_t *trd="ALL", Char_t *tpc="ALL", const Char_t *files=0x0, Long64_t
   timer.Stop();
   timer.Print();  
 
-  cal->Terminate();
   TGeoGlobalMagField::Instance()->SetField(NULL);
   delete cdbManager;