bug fix and small changed in the macros

diff --git a/PWG1/TPC/AliPerformanceEff.cxx b/PWG1/TPC/AliPerformanceEff.cxx
index 6fe9d730fc50c5702c234318a3abee01bbcd42ea..24231c49e531ad46d8fd89ecb2d336f3e4afa33d 100644 (file)
--- a/PWG1/TPC/AliPerformanceEff.cxx
+++ b/PWG1/TPC/AliPerformanceEff.cxx
@@ -226,6 +226,7 @@ void AliPerformanceEff::ProcessTPC(AliMCEvent* const mcEvent, AliESDEvent *const
   {\r
     TParticle* particle = stack->Particle(iMc);\r
     if (!particle) continue;\r
+    if (!particle->GetPDG()) continue; \r
     if (particle->GetPDG()->Charge() == 0.0) continue;\r
       \r
     // physical primary\r
@@ -323,6 +324,7 @@ void AliPerformanceEff::ProcessTPCSec(AliMCEvent* const mcEvent, AliESDEvent *co
   {\r
     TParticle* particle = stack->Particle(iMc);\r
     if (!particle) continue;\r
+    if (!particle->GetPDG()) continue; \r
     if (particle->GetPDG()->Charge() == 0.0) continue;\r
       \r
     // physical primary\r
@@ -437,6 +439,7 @@ void AliPerformanceEff::ProcessTPCITS(AliMCEvent* const mcEvent, AliESDEvent *co
   {\r
     TParticle* particle = stack->Particle(iMc);\r
     if (!particle) continue;\r
+    if (!particle->GetPDG()) continue; \r
     if (particle->GetPDG()->Charge() == 0.0) continue;\r
       \r
     // physical primary\r
@@ -530,6 +533,7 @@ void AliPerformanceEff::ProcessConstrained(AliMCEvent* const mcEvent, AliESDEven
   {\r
     TParticle* particle = stack->Particle(iMc);\r
     if (!particle) continue;\r
+    if (!particle->GetPDG()) continue; \r
     if (particle->GetPDG()->Charge() == 0.0) continue;\r
       \r
     // physical primary\r

diff --git a/PWG1/TPC/AliPerformanceRes.cxx b/PWG1/TPC/AliPerformanceRes.cxx
index 8689250677e4ae88f125ca911c0f68c341f5f9b7..5a1e0d3eb9898f8f1ad75a8e79f4be407f3e190d 100644 (file)
--- a/PWG1/TPC/AliPerformanceRes.cxx
+++ b/PWG1/TPC/AliPerformanceRes.cxx
@@ -295,6 +295,7 @@ void AliPerformanceRes::ProcessTPCITS(AliStack* const stack, AliESDtrack *const
   Int_t label = TMath::Abs(esdTrack->GetLabel()); 
   TParticle* particle = stack->Particle(label);
   if(!particle) return;
+  if(!particle->GetPDG()) return;
   if(particle->GetPDG()->Charge()==0) return;
   //printf("charge %d \n",particle->GetPDG()->Charge());
 
@@ -402,6 +403,7 @@ void AliPerformanceRes::ProcessConstrained(AliStack* const stack, AliESDtrack *c
   Int_t label = TMath::Abs(esdTrack->GetLabel()); 
   TParticle* particle = stack->Particle(label);
   if(!particle) return;
+  if(!particle->GetPDG()) return;
   if(particle->GetPDG()->Charge()==0) return;
   //printf("charge %d \n",particle->GetPDG()->Charge());
 

diff --git a/PWG1/TPC/macros/AddTaskPerformanceTPCQA.C b/PWG1/TPC/macros/AddTaskPerformanceTPCQA.C
index 2fd2daf0c5e5032c2a26153220587912693d8f8e..51ac4937f41f4ea42f756c26d0d3276e63f74df3 100644 (file)
--- a/PWG1/TPC/macros/AddTaskPerformanceTPCQA.C
+++ b/PWG1/TPC/macros/AddTaskPerformanceTPCQA.C
@@ -81,7 +81,7 @@ AliPerformanceTask* AddTaskPerformanceTPCQA(Bool_t bUseMCInfo=kFALSE, Bool_t bUs
     pRecInfoCutsTPC->SetRequireSigmaToVertex(kFALSE);
     pRecInfoCutsTPC->SetRequireTPCRefit(kFALSE);
     pRecInfoCutsTPC->SetAcceptKinkDaughters(kTRUE);
-    pRecInfoCutsTPC->SetMinNClustersTPC(50);
+    pRecInfoCutsTPC->SetMinNClustersTPC(70);
     pRecInfoCutsTPC->SetMaxChi2PerClusterTPC(1000000.);
     pRecInfoCutsTPC->SetDCAToVertex2D(kFALSE);
 

diff --git a/PWG1/TPC/macros/LoadMyLibs.C b/PWG1/TPC/macros/LoadMyLibs.C
index 22e457ce6a83bb0c582cd3f549b73fe3b1fe1fa8..5921309608fa2c726cab4cd8e2eea0b541743c43 100644 (file)
--- a/PWG1/TPC/macros/LoadMyLibs.C
+++ b/PWG1/TPC/macros/LoadMyLibs.C
@@ -10,7 +10,6 @@ void LoadMyLibs() {
   
   // Load AliRoot libraries
   
-  
   CheckLoadLibrary("libSTEERBase");
   CheckLoadLibrary("libESD");
   CheckLoadLibrary("libCDB");
@@ -19,24 +18,27 @@ void LoadMyLibs() {
   CheckLoadLibrary("libSTEER");
   CheckLoadLibrary("libRAWDatasim");
 
+  CheckLoadLibrary("libANALYSIS");
+  CheckLoadLibrary("libAOD");
+  CheckLoadLibrary("libANALYSISalice");
+  CheckLoadLibrary("libTENDER");
+  CheckLoadLibrary("libSTAT");
+
   CheckLoadLibrary("libTPCbase");
-  CheckLoadLibrary("libTPCrec");
   CheckLoadLibrary("libTPCsim");
+  CheckLoadLibrary("libTPCrec");
+  CheckLoadLibrary("libTPCcalib");
   CheckLoadLibrary("libITSbase");
   CheckLoadLibrary("libITSsim");
   CheckLoadLibrary("libITSrec");
+  CheckLoadLibrary("libTRDcalib");
   CheckLoadLibrary("libTRDbase");
-  CheckLoadLibrary("libTRDsim");
   CheckLoadLibrary("libTRDrec");
+  CheckLoadLibrary("libTRDsim");
   CheckLoadLibrary("libTOFbase");
   CheckLoadLibrary("libTOFrec");
   CheckLoadLibrary("libTOFsim");
 
-  CheckLoadLibrary("libANALYSIS");
-  CheckLoadLibrary("libAOD");
-  CheckLoadLibrary("libANALYSISalice");
-  CheckLoadLibrary("libTENDER");
-  CheckLoadLibrary("libTPCcalib");
   CheckLoadLibrary("libPWG1");
 }
 

diff --git a/PWG1/TPC/macros/ProofEnableAliRoot.C b/PWG1/TPC/macros/ProofEnableAliRoot.C
index 882ea1a673004deb34894946bd8a82e796bd0daa..bede8868bc5a864ed9aef936c5f5d421887c7948 100644 (file)
--- a/PWG1/TPC/macros/ProofEnableAliRoot.C
+++ b/PWG1/TPC/macros/ProofEnableAliRoot.C
@@ -6,6 +6,8 @@ void ProofEnableAliRoot(const char* location = "/usr/local/grid/AliRoot/v4-05-Re
 
   gProof->AddIncludePath(Form("%s/include", location));
   gProof->AddIncludePath(Form("%s/TPC", location));
+  gProof->AddIncludePath(Form("%s/TRD", location));
+  gProof->AddIncludePath(Form("%s/TRD/Cal", location));
   gProof->AddIncludePath(Form("%s/PWG1", location));
   gProof->AddIncludePath(Form("%s/ANALYSIS", location));
 

diff --git a/PWG1/TPC/macros/RunPerformanceTask.C b/PWG1/TPC/macros/RunPerformanceTask.C
index 3d61fd5cc20c5116df7e72c5dc90d47491143b74..7d449f9879cfa835ff2c4853e3e4e27fc90021e5 100644 (file)
--- a/PWG1/TPC/macros/RunPerformanceTask.C
+++ b/PWG1/TPC/macros/RunPerformanceTask.C
@@ -5,23 +5,24 @@
 //
 
 /*
+ 
   //1. Run locally e.g.
 
   gROOT->LoadMacro("$ALICE_ROOT/PWG1/TPC/macros/LoadMyLibs.C");
 
   gROOT->LoadMacro("$ALICE_ROOT/PWG0/CreateESDChain.C");
-  TChain* chain = CreateESDChain("list_flatP_JB.txt",10, 0);
+  TChain* chain = CreateESDChain("esds_test.txt",10, 0);
   chain->Lookup();
 
   gROOT->LoadMacro("$ALICE_ROOT/PWG1/TPC/macros/RunPerformanceTask.C");
-  RunPerformanceTask(chain, kTRUE, kTRUE, kFALSE);
+  RunPerformanceTask(chain, kFALSE, kTRUE, kFALSE);
 
   //2. Run on PROOF Lite e.g.
 
   TProof::Open(""); 
 
   gROOT->LoadMacro("$ALICE_ROOT/PWG1/TPC/macros/ProofEnableAliRoot.C");
-  ProofEnableAliRoot("/d/alice11/jacek/alice/x86_64/AliRoot/trunkJB/");
+  ProofEnableAliRoot("/u/jacek/alice/AliRoot/trunk");
 
   gROOT->LoadMacro("$ALICE_ROOT/PWG0/CreateESDChain.C");
   TChain* chain = CreateESDChain("list_flatP_JB.txt",20, 0);
@@ -112,8 +113,9 @@ void RunPerformanceTask(TChain *chain, Bool_t bUseMCInfo=kTRUE, Bool_t bUseESDfr
   //
   // Add task to AliAnalysisManager
   //
-  gROOT->LoadMacro("$ALICE_ROOT/PWG1/macros/AddTaskPerformanceTPC.C");
-  AliPerformanceTask *tpcQA = AddTaskPerformanceTPC(bUseMCInfo,bUseESDfriend);
+  //gROOT->LoadMacro("$ALICE_ROOT/PWG1/macros/AddTaskPerformanceTPC.C");
+  gROOT->LoadMacro("$ALICE_ROOT/PWG1/TPC/macros/AddTaskPerformanceTPCQA.C");
+  AliPerformanceTask *tpcQA = AddTaskPerformanceTPCQA(bUseMCInfo,bUseESDfriend);
   if(!tpcQA) { 
       Error("runTPCQA","TaskPerformanceTPC not created!");
       return;