QAMC: minor bug fix

diff --git a/PWG4/JetTasks/AliAnalysisTaskJetServices.cxx b/PWG4/JetTasks/AliAnalysisTaskJetServices.cxx
index 89810b11852476e55f69ac52f4638f62d7890625..322bebe82086d12469ce6e2df4d9481bb17110c5 100644 (file)
--- a/PWG4/JetTasks/AliAnalysisTaskJetServices.cxx
+++ b/PWG4/JetTasks/AliAnalysisTaskJetServices.cxx
@@ -1097,7 +1097,7 @@ Bool_t AliAnalysisTaskJetServices::CalculateReactionPlaneAngleVZERO(AliAODEvent
 
   if(fDebug)Printf("%s:%d iFoundBin %d",(char*)__FILE__,__LINE__,iFoundBin);
 
-  if(iFoundBin>0){
+  if(iFoundBin>0&&(fp1CalibRPYA)){
     meanXA = fp1CalibRPXA->GetBinContent(iFoundBin);
     meanYA = fp1CalibRPYA->GetBinContent(iFoundBin);
     meanXC = fp1CalibRPXC->GetBinContent(iFoundBin);

diff --git a/PWG4/JetTasks/AliPWG4HighPtQAMC.cxx b/PWG4/JetTasks/AliPWG4HighPtQAMC.cxx
index 2b340496cba6f33f3659af1b81eaf893589f89cc..e5206b77730095185a04322334396453f8164ef1 100644 (file)
--- a/PWG4/JetTasks/AliPWG4HighPtQAMC.cxx
+++ b/PWG4/JetTasks/AliPWG4HighPtQAMC.cxx
@@ -106,8 +106,8 @@ AliPWG4HighPtQAMC::AliPWG4HighPtQAMC()
   fPtBinEdges[0][1] = 1.;
   fPtBinEdges[1][0] = 20.;
   fPtBinEdges[1][1] = 2.;
-  fPtBinEdges[2][0] = 50.;
-  fPtBinEdges[2][1] = 5.;
+  fPtBinEdges[2][0] = 100.;
+  fPtBinEdges[2][1] = 10.;
 
 }
 //________________________________________________________________________
@@ -166,8 +166,8 @@ AliPWG4HighPtQAMC::AliPWG4HighPtQAMC(const char *name):
   fPtBinEdges[0][1] = 1.;
   fPtBinEdges[1][0] = 20.;
   fPtBinEdges[1][1] = 2.;
-  fPtBinEdges[2][0] = 50.;
-  fPtBinEdges[2][1] = 5.;
+  fPtBinEdges[2][0] = 100.;
+  fPtBinEdges[2][1] = 10.;
 
   // Input slot #0 works with a TChain ESD
   DefineInput(0, TChain::Class());
@@ -711,11 +711,8 @@ void AliPWG4HighPtQAMC::Exec(Option_t *) {
       if (itsMap & (1 << i))
        nPointITS ++;
     }
-    nSigmaToVertex = fTrackCuts->GetSigmaToVertex(track);// Calculates the number of sigma to the vertex for a track.
-    chi2C = track->GetConstrainedChi2();
-    relUncertainty1Pt = TMath::Sqrt(track->GetSigma1Pt2())*pt;
     
-    fPtAll->Fill(pt);
+    //    fPtAll->Fill(pt);
     fPtAllMC->Fill(ptMC);
 
     if (fTrackCuts->AcceptTrack(track)) {
@@ -733,6 +730,10 @@ void AliPWG4HighPtQAMC::Exec(Option_t *) {
       pt  = track->Pt();
       phi = track->Phi();
 
+      nSigmaToVertex = fTrackCuts->GetSigmaToVertex(track);// Calculates the number of sigma to the vertex for a track.
+      chi2C = track->GetConstrainedChi2();
+      relUncertainty1Pt = TMath::Sqrt(track->GetSigma1Pt2())*pt;
+
       fPtSel->Fill(pt);
       if(track->GetLabel()<0) {
         fPtSelFakes->Fill(pt);

diff --git a/PWG4/JetTasks/AliPWG4HighPtTrackQA.cxx b/PWG4/JetTasks/AliPWG4HighPtTrackQA.cxx
index 5ac14ae1227dbb4ac2b076126a9c52b7e13ae138..04ea72187f4c8885c44c6bfc048c1f50c04e5190 100644 (file)
--- a/PWG4/JetTasks/AliPWG4HighPtTrackQA.cxx
+++ b/PWG4/JetTasks/AliPWG4HighPtTrackQA.cxx
@@ -73,7 +73,7 @@ AliPWG4HighPtTrackQA::AliPWG4HighPtTrackQA()
   fPtMax(100.),
   fIsPbPb(0),
   fCentClass(10),
-  fNVariables(20),
+  fNVariables(21),
   fVariables(0x0),
   fAvgTrials(1),
   fNEventAll(0),
@@ -95,6 +95,8 @@ AliPWG4HighPtTrackQA::AliPWG4HighPtTrackQA()
   fPtDCAZ(0x0),
   fPtNClustersTPC(0x0),
   fPtNClustersTPCIter1(0x0),
+  fPtNClustersTPCShared(0x0),
+  fPtNClustersTPCSharedFrac(0x0),
   fPtNPointITS(0x0),
   fPtChi2C(0x0),
   fPtNSigmaToVertex(0x0),
@@ -126,7 +128,7 @@ AliPWG4HighPtTrackQA::AliPWG4HighPtTrackQA()
   fSystTrackCuts(0x0),
   fHistList(0)
 {
-  SetNVariables(20);
+  SetNVariables(21);
 
   fPtBinEdges[0][0] = 10.;
   fPtBinEdges[0][1] = 1.;
@@ -152,7 +154,7 @@ AliPWG4HighPtTrackQA::AliPWG4HighPtTrackQA(const char *name):
   fPtMax(100.),
   fIsPbPb(0),
   fCentClass(10),
-  fNVariables(20),
+  fNVariables(21),
   fVariables(0x0),
   fAvgTrials(1),
   fNEventAll(0),
@@ -174,6 +176,8 @@ AliPWG4HighPtTrackQA::AliPWG4HighPtTrackQA(const char *name):
   fPtDCAZ(0x0),
   fPtNClustersTPC(0x0),
   fPtNClustersTPCIter1(0x0),
+  fPtNClustersTPCShared(0x0),
+  fPtNClustersTPCSharedFrac(0x0),
   fPtNPointITS(0x0),
   fPtChi2C(0x0),
   fPtNSigmaToVertex(0x0),
@@ -210,7 +214,7 @@ AliPWG4HighPtTrackQA::AliPWG4HighPtTrackQA(const char *name):
   //
   AliDebug(2,Form("AliPWG4HighPtTrackQA Calling Constructor"));
 
-  SetNVariables(20);
+  SetNVariables(21);
 
   fPtBinEdges[0][0] = 10.;
   fPtBinEdges[0][1] = 1.;
@@ -496,6 +500,12 @@ void AliPWG4HighPtTrackQA::UserCreateOutputObjects() {
 
   fPtNClustersTPCIter1 = new TH2F("fPtNClustersTPCIter1","fPtNClustersTPCIter1",fgkNPtBins,binsPt,fgkNNClustersTPCBins,binsNClustersTPC);
   fHistList->Add(fPtNClustersTPCIter1);
+
+  fPtNClustersTPCShared = new TH2F("fPtNClustersTPCShared","fPtNClustersTPCShared",fgkNPtBins,binsPt,fgkNNClustersTPCBins,binsNClustersTPC);
+  fHistList->Add(fPtNClustersTPCShared);
+
+  fPtNClustersTPCSharedFrac = new TH2F("fPtNClustersTPCSharedFrac","fPtNClustersTPCSharedFrac",fgkNPtBins,binsPt,fgkNSigma1Pt2Bins,binsSigma1Pt2);
+  fHistList->Add(fPtNClustersTPCSharedFrac);
  
   fPtNPointITS = new TH2F("fPtNPointITS","fPtNPointITS",fgkNPtBins,binsPt,fgkNNPointITSBins,binsNPointITS);
   fHistList->Add(fPtNPointITS);
@@ -881,6 +891,7 @@ void AliPWG4HighPtTrackQA::DoAnalysisESD() {
     17: Sigma1Pt2
     18: NClustersTPCIter1
     19: Chi2TPCIter1
+    20: nClustersTPCShared
   */
 
   for (Int_t iTrack = 0; iTrack < nTracks; iTrack++) {
@@ -1048,6 +1059,8 @@ void AliPWG4HighPtTrackQA::DoAnalysisESD() {
 
     fVariables->SetAt(track->GetTPCNclsIter1(),18);
     fVariables->SetAt(track->GetTPCchi2Iter1(),19);
+
+    fVariables->SetAt(track->GetTPCnclsS(),20);
     
     FillHistograms();
   
@@ -1114,6 +1127,9 @@ void AliPWG4HighPtTrackQA::DoAnalysisAOD() {
 
     fVariables->SetAt(0.,18);
     fVariables->SetAt(0.,19);
+
+    TBits sharedClusterMap = aodtrack->GetTPCSharedMap();
+    fVariables->SetAt(sharedClusterMap.CountBits(),20);
     
     fPtAll->Fill(fVariables->At(0));
 
@@ -1136,6 +1152,10 @@ void AliPWG4HighPtTrackQA::FillHistograms() {
 
   
   fPtNClustersTPCIter1->Fill(fVariables->At(0),fVariables->At(18));
+  fPtNClustersTPCShared->Fill(fVariables->At(0),fVariables->At(20));
+  if(fVariables->At(5)>0.)
+    fPtNClustersTPCSharedFrac->Fill(fVariables->At(0),fVariables->At(20)/fVariables->At(5));
+
   if(fVariables->At(18)>0.)
     fPtChi2PerClusterTPCIter1->Fill(fVariables->At(0),fVariables->At(19)/fVariables->At(18));
   
@@ -1169,6 +1189,7 @@ void AliPWG4HighPtTrackQA::FillHistograms() {
   fPtNCrossedRows->Fill(fVariables->At(0),fVariables->At(11));
   fPtNCrossedRowsNClusF->Fill(fVariables->At(0),fVariables->At(12));
   fPtNCrRNCrRNClusF->Fill(fVariables->At(0),fVariables->At(11),fVariables->At(12));
+
 }
 
 //________________________________________________________________________

diff --git a/PWG4/JetTasks/AliPWG4HighPtTrackQA.h b/PWG4/JetTasks/AliPWG4HighPtTrackQA.h
index 0a92edca577b2382bc590c6997b6181e6fef81b5..ccd7a804a4704d87786bc01dfdba5d99842c89c0 100644 (file)
--- a/PWG4/JetTasks/AliPWG4HighPtTrackQA.h
+++ b/PWG4/JetTasks/AliPWG4HighPtTrackQA.h
@@ -160,6 +160,8 @@ class AliPWG4HighPtTrackQA: public AliAnalysisTaskSE {
   TH2F *fPtDCAZ;                               //! Pt vs DCAZ
   TH2F *fPtNClustersTPC;                       //! Pt vs nClustersTPC
   TH2F *fPtNClustersTPCIter1;                  //! Pt vs nClustersTPCIter1
+  TH2F *fPtNClustersTPCShared;                 //! Pt vs nClustersTPCShared
+  TH2F *fPtNClustersTPCSharedFrac;             //! Pt vs nClustersTPCSharedFrac
   TH2F *fPtNPointITS;                          //! Pt vs nPointITS
   TH2F *fPtChi2C;                              //! Pt vs Chi2C
   TH2F *fPtNSigmaToVertex;                     //! Pt vs nSigmaToVertex

diff --git a/PWG4/macros/AddTaskPWG4HighPtTrackQA.C b/PWG4/macros/AddTaskPWG4HighPtTrackQA.C
index 1ff8920c5fa0b72577e5199994f3b599804d4b58..8e6dd2b8f8975bf6470c05098543df0f28aac71f 100644 (file)
--- a/PWG4/macros/AddTaskPWG4HighPtTrackQA.C
+++ b/PWG4/macros/AddTaskPWG4HighPtTrackQA.C
@@ -10,7 +10,7 @@ void AddTaskPWG4HighPtTrackQAAll(char *prodType = "LHC10h",Bool_t isPbPb=kTRUE,
   // AliPWG4HighPtTrackQA *taskTrackQA11cent10 = AddTaskPWG4HighPtTrackQA(prodType,isPbPb,iAODanalysis,cent,1,1);
   //  AliPWG4HighPtTrackQA *taskTrackQA20cent10 = AddTaskPWG4HighPtTrackQA(prodType,isPbPb,iAODanalysis,cent,2,0);
   //  AliPWG4HighPtTrackQA *taskTrackQA21cent10 = AddTaskPWG4HighPtTrackQA(prodType,isPbPb,iAODanalysis,cent,2,1);
-  AliPWG4HighPtTrackQA *taskTrackQA40cent10 = AddTaskPWG4HighPtTrackQA(prodType,isPbPb,iAODanalysis,cent,4,0);
+  //  AliPWG4HighPtTrackQA *taskTrackQA40cent10 = AddTaskPWG4HighPtTrackQA(prodType,isPbPb,iAODanalysis,cent,4,0);
   //  AliPWG4HighPtTrackQA *taskTrackQA41cent10 = AddTaskPWG4HighPtTrackQA(prodType,isPbPb,iAODanalysis,cent,4,1);
   //  AliPWG4HighPtTrackQA *taskTrackQA50cent10 = AddTaskPWG4HighPtTrackQA(prodType,isPbPb,iAODanalysis,cent,5,0);
   //  AliPWG4HighPtTrackQA *taskTrackQA60cent10 = AddTaskPWG4HighPtTrackQA(prodType,isPbPb,iAODanalysis,cent,6,0);
@@ -27,7 +27,7 @@ void AddTaskPWG4HighPtTrackQAAll(char *prodType = "LHC10h",Bool_t isPbPb=kTRUE,
       // AliPWG4HighPtTrackQA *taskTrackQA11 = AddTaskPWG4HighPtTrackQA(prodType,isPbPb,iAODanalysis,cent,1,1);
       //      AliPWG4HighPtTrackQA *taskTrackQA20 = AddTaskPWG4HighPtTrackQA(prodType,isPbPb,iAODanalysis,cent,2,0);
       //      AliPWG4HighPtTrackQA *taskTrackQA21 = AddTaskPWG4HighPtTrackQA(prodType,isPbPb,iAODanalysis,cent,2,1);
-      AliPWG4HighPtTrackQA *taskTrackQA40 = AddTaskPWG4HighPtTrackQA(prodType,isPbPb,iAODanalysis,cent,4,0);
+      //      AliPWG4HighPtTrackQA *taskTrackQA40 = AddTaskPWG4HighPtTrackQA(prodType,isPbPb,iAODanalysis,cent,4,0);
       //      AliPWG4HighPtTrackQA *taskTrackQA41 = AddTaskPWG4HighPtTrackQA(prodType,isPbPb,iAODanalysis,cent,4,1);
       //      AliPWG4HighPtTrackQA *taskTrackQA50 = AddTaskPWG4HighPtTrackQA(prodType,isPbPb,iAODanalysis,cent,5,0);
       //      AliPWG4HighPtTrackQA *taskTrackQA60 = AddTaskPWG4HighPtTrackQA(prodType,isPbPb,iAODanalysis,cent,6,0);