Bug fixes - new aliroot structure and others (Cynthia)
authorpcrochet <pcrochet@f7af4fe6-9843-0410-8265-dc069ae4e863>
Fri, 20 Apr 2012 13:39:13 +0000 (13:39 +0000)
committerpcrochet <pcrochet@f7af4fe6-9843-0410-8265-dc069ae4e863>
Fri, 20 Apr 2012 13:39:13 +0000 (13:39 +0000)
PWGPP/MUON/lite/PlotMuonQA.C
PWGPP/MUON/lite/runQA.sh
PWGPP/MUON/lite/terminateQA.C

index 181c5e0..9a2be58 100644 (file)
@@ -449,8 +449,6 @@ void PlotMuonQA(const char* baseDir, const char* runList = 0x0, const char * tri
     for(k = 0; k < triggersB->GetEntriesFast(); k++){
       //skip sum of all triggers
       if(k == (triggersB->GetEntriesFast()-1)) continue;
-      //skip some triggers
-      if ( !IsTriggerSelectedForMuonPhysics(triggersB,k) ) continue;
 
       canvasName = "PhysSel_trigger";
       canvasName += ( (TObjString*) triggersShortName->At(k) )->GetString();
@@ -480,8 +478,6 @@ void PlotMuonQA(const char* baseDir, const char* runList = 0x0, const char * tri
     for(k = 0; k < triggersB->GetEntriesFast(); k++){
       //skip sum of all triggers
       if(k == (triggersB->GetEntriesFast()-1)) continue;
-      //skip some triggers
-      if ( !IsTriggerSelectedForMuonPhysics(triggersB,k) ) continue;
                        
       canvasName = "CentralityCheck_trigger";
       canvasName +=( (TObjString*) triggersShortName->At(k) )->GetString();
@@ -521,8 +517,6 @@ void PlotMuonQA(const char* baseDir, const char* runList = 0x0, const char * tri
     for(k = 0; k < triggersB->GetEntriesFast(); k++){
       //skip sum of all triggers
       if(k == (triggersB->GetEntriesFast()-1)) continue;
-      //skip some triggers
-      //if ( !IsTriggerSelectedForMuonPhysics(triggersB,k) ) continue;
 
       ( (TDirectoryFile*) dirCent->At( k*centBinMaxLoop+centBin ) )->cd();
 
@@ -574,8 +568,6 @@ void PlotMuonQA(const char* baseDir, const char* runList = 0x0, const char * tri
     for(k = 0; k < triggersB->GetEntriesFast(); k++){
       //skip sum of all triggers
       if(k == (triggersB->GetEntriesFast()-1)) continue;
-      //skip some triggers
-      //if ( !IsTriggerSelectedForMuonPhysics(triggersB,k) ) continue;
 
       ( (TDirectoryFile*) dirCent->At( k*centBinMaxLoop+centBin ) )->cd();
  
@@ -602,8 +594,6 @@ void PlotMuonQA(const char* baseDir, const char* runList = 0x0, const char * tri
   for(k = 0; k < triggersB->GetEntriesFast(); k++){
     //skip sum of all triggers
     if(k == (triggersB->GetEntriesFast()-1)) continue;
-    //skip some triggers
-    //if ( !IsTriggerSelectedForMuonPhysics(triggersB,k) ) continue;
 
     ( (TDirectoryFile*) dirTrigger->At(k) )->cd();
  
@@ -636,8 +626,6 @@ void PlotMuonQA(const char* baseDir, const char* runList = 0x0, const char * tri
     for(k = 0; k < triggersB->GetEntriesFast(); k++){
       //skip sum of all triggers
       if(k == (triggersB->GetEntriesFast()-1)) continue;
-      //skip some triggers
-      //if ( !IsTriggerSelectedForMuonPhysics(triggersB,k) ) continue;
        
       ( (TDirectoryFile*) dirCent->At( k*centBinMaxLoop+centBin ) )->cd();
 
index 0a2e57b..0d0bc0e 100755 (executable)
@@ -63,9 +63,10 @@ function mergePerRun()
     runListName="$1"
     prodDir="$2"
     alienBaseDir="$3"
+
     aliroot -b <<EOF &> $mergeLog
 .L $qaMacroDir/mergeGridFiles.C+
-completeProd("${runListName}","${prodDir}","${alienBaseDir}","${outTaskName}",50,"MUON_QA MTR_ChamberEffMap",${mergeFast});
+completeProd("${runListName}","${prodDir}","${alienBaseDir}","${outTaskName}",50,"MUON_QA MTR_ChamberEffMap MUON.TrigEfficiencyMap MUON.TriggerEfficiencyMap",${mergeFast});
 .q
 EOF
 }
index 2ae5eef..cad84d8 100644 (file)
@@ -86,13 +86,12 @@ AliAnalysisAlien* CreateAlienHandler()
   plugin->SetRunMode("terminate");
 
   // Declare all libraries
-  plugin->SetAdditionalLibs("libCORRFW.so libPWGHFbase.so libPWGmuon.so");
+  plugin->SetAdditionalLibs("libCORRFW.so libPWGHFbase.so libPWGmuon.so libPWGPPMUONlite.so");
 
   plugin->SetAdditionalRootLibs("libXMLParser.so libGui.so libProofPlayer.so");
 
   plugin->AddIncludePath("-I.");
-  plugin->AddIncludePath("-I$ALICE_ROOT/PWG3/base");
-  plugin->AddIncludePath("-I$ALICE_ROOT/PWG3/muon");
+  plugin->AddIncludePath("-I$ALICE_ROOT/PWGPP/MUON/lite");
   
   return plugin;
 }
@@ -110,7 +109,7 @@ void terminateQA(TString outfilename = "QAresults.root", Bool_t force = kFALSE)
   gSystem->Load("libPhysics");
   gSystem->Load("libProof");
 
-  TString libsList = "libANALYSIS.so libOADB.so libANALYSISalice.so libCORRFW.so libPWGHFbase.so libPWGmuon.so";
+  TString libsList = "libANALYSIS.so libOADB.so libANALYSISalice.so libCORRFW.so libPWGHFbase.so libPWGmuon.so libPWGPPMUONlite.so";
 
   TObjArray* libsArray = libsList.Tokenize(" ");
   libsArray->SetOwner();
@@ -132,11 +131,10 @@ void terminateQA(TString outfilename = "QAresults.root", Bool_t force = kFALSE)
   mgr->SetInputEventHandler(esdH); 
 
  #ifndef COMPILEMACRO
-  gROOT->LoadMacro("$ALICE_ROOT/PWG3/muon/AddTaskMuonQA.C");
+
+  gROOT->LoadMacro("$ALICE_ROOT/PWGPP/PilotTrain/AddTaskMuonQA.C");
   AliAnalysisTaskMuonQA* muonQATask = AddTaskMuonQA();
 
-  gROOT->LoadMacro("$ALICE_ROOT/PWGPP/macros/AddTaskMTRchamberEfficiency.C");
-  AliAnalysisTaskTrigChEff* trigChEffTask = AddTaskMTRchamberEfficiency();
 #endif
 
   // Check if terminate was already performed