Final (?) modifications for the QA

diff --git a/PWG2/AliAnalysisTaskProtonsQA.cxx b/PWG2/AliAnalysisTaskProtonsQA.cxx
index c689d89ccf9452ac40ef5292ed5468fe9d5656a7..f286348c10edf664eda48900001fce2cada44de5 100644 (file)
--- a/PWG2/AliAnalysisTaskProtonsQA.cxx
+++ b/PWG2/AliAnalysisTaskProtonsQA.cxx
@@ -84,7 +84,6 @@ void AliAnalysisTaskProtonsQA::CreateOutputObjects() {
   //proton analysis object
   fAnalysis = new AliProtonAnalysis();
   fAnalysis->SetQAOn();
-  fAnalysis->InitQA();
 
   //Use of TPConly tracks
   /*fAnalysis->SetQAYPtBins(10, -0.5, 0.5, 12, 0.5, 0.9); //TPC only
@@ -116,6 +115,7 @@ void AliAnalysisTaskProtonsQA::CreateOutputObjects() {
   fAnalysis->SetITSRefit();
   fAnalysis->SetESDpid();
 
+  fAnalysis->InitQA();
   fAnalysis->SetPriorProbabilities(partFrac);
 
   fList = new TList();

diff --git a/PWG2/SPECTRA/AliProtonAnalysis.cxx b/PWG2/SPECTRA/AliProtonAnalysis.cxx
index a1ef5ef68bcaa653e14950dfdabc8c5ed4e9137f..b37b7a0d03ea61f7de095b594f4818a150d8335a 100644 (file)
--- a/PWG2/SPECTRA/AliProtonAnalysis.cxx
+++ b/PWG2/SPECTRA/AliProtonAnalysis.cxx
@@ -52,7 +52,8 @@ AliProtonAnalysis::AliProtonAnalysis() :
   fMaxSigmaToVertex(0), fMaxSigmaToVertexTPC(0),
   fMinTPCClustersFlag(kFALSE), fMinITSClustersFlag(kFALSE),
   fMaxChi2PerTPCClusterFlag(kFALSE), fMaxChi2PerITSClusterFlag(kFALSE),
-  fMaxCov11Flag(kFALSE), fMaxCov22Flag(kFALSE), fMaxCov33Flag(kFALSE), fMaxCov44Flag(kFALSE), fMaxCov55Flag(kFALSE),
+  fMaxCov11Flag(kFALSE), fMaxCov22Flag(kFALSE), 
+  fMaxCov33Flag(kFALSE), fMaxCov44Flag(kFALSE), fMaxCov55Flag(kFALSE),
   fMaxSigmaToVertexFlag(kFALSE), fMaxSigmaToVertexTPCFlag(kFALSE),
   fITSRefitFlag(kFALSE), fTPCRefitFlag(kFALSE),
   fESDpidFlag(kFALSE), fTPCpidFlag(kFALSE),
@@ -92,7 +93,8 @@ AliProtonAnalysis::AliProtonAnalysis(Int_t nbinsY, Float_t fLowY, Float_t fHighY
   fMaxSigmaToVertex(0), fMaxSigmaToVertexTPC(0),
   fMinTPCClustersFlag(kFALSE), fMinITSClustersFlag(kFALSE),
   fMaxChi2PerTPCClusterFlag(kFALSE), fMaxChi2PerITSClusterFlag(kFALSE),
-  fMaxCov11Flag(kFALSE), fMaxCov22Flag(kFALSE), fMaxCov33Flag(kFALSE), fMaxCov44Flag(kFALSE), fMaxCov55Flag(kFALSE),
+  fMaxCov11Flag(kFALSE), fMaxCov22Flag(kFALSE), 
+  fMaxCov33Flag(kFALSE), fMaxCov44Flag(kFALSE), fMaxCov55Flag(kFALSE),
   fMaxSigmaToVertexFlag(kFALSE), fMaxSigmaToVertexTPCFlag(kFALSE),
   fITSRefitFlag(kFALSE), fTPCRefitFlag(kFALSE),
   fESDpidFlag(kFALSE), fTPCpidFlag(kFALSE),
@@ -1659,6 +1661,58 @@ Bool_t AliProtonAnalysis::ReadCorrectionContainer(const char* filename) {
 
   return status;
 }
+ 
+//____________________________________________________________________//
+void AliProtonAnalysis::SetQAOn() {
+  //initializes the QA lists
+  fQAHistograms = kTRUE;
+  fGlobalQAList = new TList();
+  fQA2DList = new TList();
+  fQA2DList->SetName("fQA2DList");
+  fGlobalQAList->Add(fQA2DList);
+  
+  fQAPrimaryProtonsAcceptedList = new TList();
+  fQAPrimaryProtonsAcceptedList->SetName("fQAPrimaryProtonsAcceptedList");
+  fGlobalQAList->Add(fQAPrimaryProtonsAcceptedList);
+  
+  fQAPrimaryProtonsRejectedList = new TList();
+  fQAPrimaryProtonsRejectedList->SetName("fQAPrimaryProtonsRejectedList");
+  fGlobalQAList->Add(fQAPrimaryProtonsRejectedList);
+  
+  fQASecondaryProtonsAcceptedList = new TList();
+  fQASecondaryProtonsAcceptedList->SetName("fQASecondaryProtonsAcceptedList");
+  fGlobalQAList->Add(fQASecondaryProtonsAcceptedList);
+  
+  fQASecondaryProtonsRejectedList = new TList();
+  fQASecondaryProtonsRejectedList->SetName("fQASecondaryProtonsRejectedList");
+  fGlobalQAList->Add(fQASecondaryProtonsRejectedList);
+  
+  fQAPrimaryAntiProtonsAcceptedList = new TList();
+  fQAPrimaryAntiProtonsAcceptedList->SetName("fQAPrimaryAntiProtonsAcceptedList");
+  fGlobalQAList->Add(fQAPrimaryAntiProtonsAcceptedList);
+  
+  fQAPrimaryAntiProtonsRejectedList = new TList();
+  fQAPrimaryAntiProtonsRejectedList->SetName("fQAPrimaryAntiProtonsRejectedList");
+  fGlobalQAList->Add(fQAPrimaryAntiProtonsRejectedList);
+  
+  fQASecondaryAntiProtonsAcceptedList = new TList();
+  fQASecondaryAntiProtonsAcceptedList->SetName("fQASecondaryAntiProtonsAcceptedList");
+  fGlobalQAList->Add(fQASecondaryAntiProtonsAcceptedList);
+  
+  fQASecondaryAntiProtonsRejectedList = new TList();
+  fQASecondaryAntiProtonsRejectedList->SetName("fQASecondaryAntiProtonsRejectedList");
+  fGlobalQAList->Add(fQASecondaryAntiProtonsRejectedList);
+}
+
+//____________________________________________________________________//
+void AliProtonAnalysis::SetQAYPtBins(Int_t nbinsY, Double_t minY, Double_t maxY,
+                                     Int_t nbinsPt, Double_t minPt, Double_t maxPt) {
+  //Initializes the QA binning
+  fNBinsY = nbinsY;
+  fMinY = minY; fMaxY = maxY;
+  fNBinsPt = nbinsPt;
+  fMinPt = minPt; fMaxPt = maxPt;
+}
 
 //____________________________________________________________________//
 void AliProtonAnalysis::InitQA() {

diff --git a/PWG2/SPECTRA/AliProtonAnalysis.h b/PWG2/SPECTRA/AliProtonAnalysis.h
index a35aafb704a349db96fc2e340449a86037d4143b..fe4138fa9e9aed99d72c4899d82c3482b30d1a62 100644 (file)
--- a/PWG2/SPECTRA/AliProtonAnalysis.h
+++ b/PWG2/SPECTRA/AliProtonAnalysis.h
@@ -23,8 +23,8 @@ class TF1;
 class TH2D;
 class TH1F;
 
+#include "AliCFContainer.h"
 class AliCFDataGrid;
-class AliCFContainer;
 class AliAODEvent;
 class AliAODtrack;
 class AliESDEvent;
@@ -61,6 +61,7 @@ class AliProtonAnalysis : public TObject {
   TH1D *GetAntiProtonCorrectedYHistogram();
   TH1D *GetProtonCorrectedPtHistogram();
   TH1D *GetAntiProtonCorrectedPtHistogram();
+  
   TH1D *GetYRatioHistogram();
   TH1D *GetPtRatioHistogram();
   TH1D *GetYAsymmetryHistogram();
@@ -113,52 +114,9 @@ class AliProtonAnalysis : public TObject {
   void    SetTPCpid() {fTPCpidFlag = kTRUE;}
 
   //QA histograms
-  void SetQAOn() {
-    fQAHistograms = kTRUE;
-    fGlobalQAList = new TList();
-    fQA2DList = new TList();
-    fQA2DList->SetName("fQA2DList");
-    fGlobalQAList->Add(fQA2DList);
-
-    fQAPrimaryProtonsAcceptedList = new TList();
-    fQAPrimaryProtonsAcceptedList->SetName("fQAPrimaryProtonsAcceptedList");
-    fGlobalQAList->Add(fQAPrimaryProtonsAcceptedList);
-
-    fQAPrimaryProtonsRejectedList = new TList();
-    fQAPrimaryProtonsRejectedList->SetName("fQAPrimaryProtonsRejectedList");
-    fGlobalQAList->Add(fQAPrimaryProtonsRejectedList);
-
-    fQASecondaryProtonsAcceptedList = new TList();
-    fQASecondaryProtonsAcceptedList->SetName("fQASecondaryProtonsAcceptedList");
-    fGlobalQAList->Add(fQASecondaryProtonsAcceptedList);
-
-    fQASecondaryProtonsRejectedList = new TList();
-    fQASecondaryProtonsRejectedList->SetName("fQASecondaryProtonsRejectedList");
-    fGlobalQAList->Add(fQASecondaryProtonsRejectedList);
-
-    fQAPrimaryAntiProtonsAcceptedList = new TList();
-    fQAPrimaryAntiProtonsAcceptedList->SetName("fQAPrimaryAntiProtonsAcceptedList");
-    fGlobalQAList->Add(fQAPrimaryAntiProtonsAcceptedList);
-
-    fQAPrimaryAntiProtonsRejectedList = new TList();
-    fQAPrimaryAntiProtonsRejectedList->SetName("fQAPrimaryAntiProtonsRejectedList");
-    fGlobalQAList->Add(fQAPrimaryAntiProtonsRejectedList);
-
-    fQASecondaryAntiProtonsAcceptedList = new TList();
-    fQASecondaryAntiProtonsAcceptedList->SetName("fQASecondaryAntiProtonsAcceptedList");
-    fGlobalQAList->Add(fQASecondaryAntiProtonsAcceptedList);
-
-    fQASecondaryAntiProtonsRejectedList = new TList();
-    fQASecondaryAntiProtonsRejectedList->SetName("fQASecondaryAntiProtonsRejectedList");
-    fGlobalQAList->Add(fQASecondaryAntiProtonsRejectedList);
-  }
+  void SetQAOn();
   void SetQAYPtBins(Int_t nbinsY, Double_t minY, Double_t maxY,
-                   Int_t nbinsPt, Double_t minPt, Double_t maxPt) {
-    fNBinsY = nbinsY;
-    fMinY = minY; fMaxY = maxY;
-    fNBinsPt = nbinsPt;
-    fMinPt = minPt; fMaxPt = maxPt;
-  }
+                   Int_t nbinsPt, Double_t minPt, Double_t maxPt);
   void InitQA();
   void RunQA(AliStack *stack, AliESDEvent *esd);
   TList *GetGlobalQAList() {return fGlobalQAList;}
@@ -185,6 +143,12 @@ class AliProtonAnalysis : public TObject {
   TList *GetCorrectionListAntiProtons2D() {return fCorrectionListAntiProtons2D;} 
   TList *GetEfficiencyListAntiProtons1D() {return fEfficiencyListAntiProtons1D;} 
   TList *GetCorrectionListAntiProtons1D() {return fCorrectionListAntiProtons1D;} 
+  
+  //iStep=0->MC - iStep=1->Acceptance - iStep=2->Reconstruction - iStep=3->PID
+  TH1D  *GetUncorrectedProtonYHistogram(Int_t iStep) {return fProtonContainer->ShowProjection(0, iStep);}
+  TH1D  *GetUncorrectedProtonPtHistogram(Int_t iStep) {return fProtonContainer->ShowProjection(1, iStep);}
+  TH1D  *GetUncorrectedAntiProtonYHistogram(Int_t iStep) {return fAntiProtonContainer->ShowProjection(0, iStep);}
+  TH1D  *GetUncorrectedAntiProtonPtHistogram(Int_t iStep) {return fAntiProtonContainer->ShowProjection(1, iStep);}
 
  private:
   AliProtonAnalysis(const AliProtonAnalysis&); // Not implemented