Update

diff --git a/PWGHF/hfe/AliAnalysisTaskHFEFlow.cxx b/PWGHF/hfe/AliAnalysisTaskHFEFlow.cxx
index 8ac3ab36f43618731a241f284e8a44f2607d1df7..7174f2f5f6766ddba1e36e9168d035e872f895c6 100644 (file)
--- a/PWGHF/hfe/AliAnalysisTaskHFEFlow.cxx
+++ b/PWGHF/hfe/AliAnalysisTaskHFEFlow.cxx
@@ -30,6 +30,7 @@
 #include "TProfile2D.h"\r
 #include "TLorentzVector.h"\r
 #include "TParticle.h"\r
+#include "TF1.h"\r
 \r
 #include "AliVEventHandler.h"\r
 #include "AliAnalysisTaskSE.h"\r
@@ -135,6 +136,7 @@ AliAnalysisTaskHFEFlow::AliAnalysisTaskHFEFlow() :
   fHistEV(0),\r
   fEventPlane(0x0),\r
   fEventPlaneaftersubtraction(0x0),\r
+  fFractionContamination(0x0),\r
   fCosSin2phiep(0x0),\r
   fCos2phie(0x0),\r
   fSin2phie(0x0),\r
@@ -156,12 +158,12 @@ AliAnalysisTaskHFEFlow::AliAnalysisTaskHFEFlow() :
   fDeltaPhiMapsContamination(0x0),\r
   fCosPhiMaps(0x0),\r
   fProfileCosPhiMaps(0x0),\r
-  fDeltaPhiMapsTaggedPhotonic(0x0),\r
-  fCosPhiMapsTaggedPhotonic(0x0),\r
-  fDeltaPhiMapsTaggedNonPhotonic(0x0),\r
-  fCosPhiMapsTaggedNonPhotonic(0x0),\r
-  fDeltaPhiMapsTaggedPhotonicLS(0x0),\r
-  fCosPhiMapsTaggedPhotonicLS(0x0),\r
+  //fDeltaPhiMapsTaggedPhotonic(0x0),\r
+  //fCosPhiMapsTaggedPhotonic(0x0),\r
+  //fDeltaPhiMapsTaggedNonPhotonic(0x0),\r
+  //fCosPhiMapsTaggedNonPhotonic(0x0),\r
+  //fDeltaPhiMapsTaggedPhotonicLS(0x0),\r
+  //fCosPhiMapsTaggedPhotonicLS(0x0),\r
   fMCSourceDeltaPhiMaps(0x0),\r
   fOppSignDeltaPhiMaps(0x0),\r
   fSameSignDeltaPhiMaps(0x0),\r
@@ -173,7 +175,10 @@ AliAnalysisTaskHFEFlow::AliAnalysisTaskHFEFlow() :
   for(Int_t k = 0; k < 10; k++) {\r
     fBinCentralityLess[k] = 0.0;\r
   }\r
-  \r
+  for(Int_t k = 0; k < 11; k++) {\r
+    fContamination[k] = NULL;\r
+  }\r
+   \r
 }\r
 //______________________________________________________________________________\r
 AliAnalysisTaskHFEFlow:: AliAnalysisTaskHFEFlow(const char *name) :\r
@@ -235,6 +240,7 @@ AliAnalysisTaskHFEFlow:: AliAnalysisTaskHFEFlow(const char *name) :
   fHistEV(0),\r
   fEventPlane(0x0),\r
   fEventPlaneaftersubtraction(0x0),\r
+  fFractionContamination(0x0),\r
   fCosSin2phiep(0x0),\r
   fCos2phie(0x0),\r
   fSin2phie(0x0),\r
@@ -256,12 +262,12 @@ AliAnalysisTaskHFEFlow:: AliAnalysisTaskHFEFlow(const char *name) :
   fDeltaPhiMapsContamination(0x0),\r
   fCosPhiMaps(0x0),\r
   fProfileCosPhiMaps(0x0),\r
-  fDeltaPhiMapsTaggedPhotonic(0x0),\r
-  fCosPhiMapsTaggedPhotonic(0x0),\r
-  fDeltaPhiMapsTaggedNonPhotonic(0x0),\r
-  fCosPhiMapsTaggedNonPhotonic(0x0),\r
-  fDeltaPhiMapsTaggedPhotonicLS(0x0),\r
-  fCosPhiMapsTaggedPhotonicLS(0x0),\r
+  //fDeltaPhiMapsTaggedPhotonic(0x0),\r
+  //fCosPhiMapsTaggedPhotonic(0x0),\r
+  //fDeltaPhiMapsTaggedNonPhotonic(0x0),\r
+  //fCosPhiMapsTaggedNonPhotonic(0x0),\r
+  //fDeltaPhiMapsTaggedPhotonicLS(0x0),\r
+  //fCosPhiMapsTaggedPhotonicLS(0x0),\r
   fMCSourceDeltaPhiMaps(0x0),\r
   fOppSignDeltaPhiMaps(0x0),\r
   fSameSignDeltaPhiMaps(0x0),\r
@@ -280,6 +286,10 @@ AliAnalysisTaskHFEFlow:: AliAnalysisTaskHFEFlow(const char *name) :
   fBinCentralityLess[2] = 40.0;\r
   fBinCentralityLess[3] = 60.0;\r
   fBinCentralityLess[4] = 80.0;\r
+\r
+  for(Int_t k = 0; k < 11; k++) {\r
+    fContamination[k] = NULL;\r
+  }\r
   \r
   fPID = new AliHFEpid("hfePid");\r
   fPIDqa = new AliHFEpidQAmanager;\r
@@ -356,6 +366,7 @@ AliAnalysisTaskHFEFlow::AliAnalysisTaskHFEFlow(const AliAnalysisTaskHFEFlow &ref
   fHistEV(NULL),\r
   fEventPlane(NULL),\r
   fEventPlaneaftersubtraction(NULL),\r
+  fFractionContamination(NULL),\r
   fCosSin2phiep(NULL),\r
   fCos2phie(NULL),\r
   fSin2phie(NULL),\r
@@ -377,12 +388,12 @@ AliAnalysisTaskHFEFlow::AliAnalysisTaskHFEFlow(const AliAnalysisTaskHFEFlow &ref
   fDeltaPhiMapsContamination(NULL),\r
   fCosPhiMaps(NULL),\r
   fProfileCosPhiMaps(NULL),\r
-  fDeltaPhiMapsTaggedPhotonic(NULL),\r
-  fCosPhiMapsTaggedPhotonic(NULL),\r
-  fDeltaPhiMapsTaggedNonPhotonic(NULL),\r
-  fCosPhiMapsTaggedNonPhotonic(NULL),\r
-  fDeltaPhiMapsTaggedPhotonicLS(NULL),\r
-  fCosPhiMapsTaggedPhotonicLS(NULL),\r
+  //fDeltaPhiMapsTaggedPhotonic(NULL),\r
+  //fCosPhiMapsTaggedPhotonic(NULL),\r
+  //fDeltaPhiMapsTaggedNonPhotonic(NULL),\r
+  //fCosPhiMapsTaggedNonPhotonic(NULL),\r
+  //fDeltaPhiMapsTaggedPhotonicLS(NULL),\r
+  //fCosPhiMapsTaggedPhotonicLS(NULL),\r
   fMCSourceDeltaPhiMaps(NULL),\r
   fOppSignDeltaPhiMaps(NULL),\r
   fSameSignDeltaPhiMaps(NULL),\r
@@ -458,6 +469,9 @@ void AliAnalysisTaskHFEFlow::Copy(TObject &o) const {
   target.fPID = fPID;\r
   target.fPIDqa = fPIDqa;\r
   target.fHFEVZEROEventPlane = fHFEVZEROEventPlane;\r
+  for(Int_t k = 0; k < 11; k++) {\r
+    target.fContamination[k] = fContamination[k];\r
+  }\r
  \r
 }\r
 //____________________________________________________________\r
@@ -757,18 +771,27 @@ void AliAnalysisTaskHFEFlow::UserCreateOutputObjects()
   AliDebug(2,"AliAnalysisTaskHFEFlow: histev");\r
 \r
   // Event plane as function of phiep, centrality\r
-  const Int_t nDima=5;\r
-  Int_t nBina[nDima] = {nBinsPhi,nBinsPhi,nBinsPhi,nBinsPhi,nBinsC};\r
+  const Int_t nDima=4;\r
+  Int_t nBina[nDima] = {nBinsPhi,nBinsPhi,nBinsPhi,nBinsC};\r
   fEventPlane = new THnSparseF("EventPlane","EventPlane",nDima,nBina);\r
   fEventPlane->SetBinEdges(0,binLimPhi);\r
   fEventPlane->SetBinEdges(1,binLimPhi);\r
   fEventPlane->SetBinEdges(2,binLimPhi);\r
-  fEventPlane->SetBinEdges(3,binLimPhi);\r
-  fEventPlane->SetBinEdges(4,binLimC);\r
+  fEventPlane->SetBinEdges(3,binLimC);\r
   fEventPlane->Sumw2();\r
 \r
   AliDebug(2,"AliAnalysisTaskHFEFlow: eventplane");\r
 \r
+  // Fraction of contamination, centrality\r
+  const Int_t nDimcont=2;\r
+  Int_t nBincont[nDimcont] = {nBinsPt,nBinsC};\r
+  fFractionContamination = new THnSparseF("Contamination","Contamination",nDimcont,nBincont);\r
+  fFractionContamination->SetBinEdges(0,binLimPt);\r
+  fFractionContamination->SetBinEdges(1,binLimC);\r
+  fFractionContamination->Sumw2();\r
+\r
+  AliDebug(2,"AliAnalysisTaskHFEFlow: fraction of contamination");\r
+\r
   // Resolution cosres_abc centrality\r
   const Int_t nDimfbis=4;\r
   Int_t nBinfbis[nDimfbis] = {nBinsCos,nBinsCos,nBinsCos,nBinsCMore};\r
@@ -984,6 +1007,7 @@ void AliAnalysisTaskHFEFlow::UserCreateOutputObjects()
   //\r
 \r
   if(fMonitorPhotonic) {\r
+    /*\r
     const Int_t nDimgbp=3;\r
     Int_t nBingbp[nDimgbp] = {nBinsPhi,nBinsC,nBinsPt};\r
     \r
@@ -1031,7 +1055,7 @@ void AliAnalysisTaskHFEFlow::UserCreateOutputObjects()
     fCosPhiMapsTaggedPhotonicLS->SetBinEdges(2,binLimPt);\r
     fCosPhiMapsTaggedPhotonicLS->Sumw2();\r
     AliDebug(2,"AliAnalysisTaskHFEFlow: cosphimapstaggedphotonicls");\r
-    \r
+    */\r
     const Int_t nDimMCSource=3;\r
     Int_t nBinMCSource[nDimMCSource] = {nBinsC,nBinsPt,nBinsSource};\r
     fMCSourceDeltaPhiMaps = new THnSparseF("MCSourceDeltaPhiMaps","MCSourceDeltaPhiMaps",nDimMCSource,nBinMCSource);\r
@@ -1093,6 +1117,7 @@ void AliAnalysisTaskHFEFlow::UserCreateOutputObjects()
 \r
   fListHist->Add(fHistEV);\r
   fListHist->Add(fEventPlane);\r
+  fListHist->Add(fFractionContamination);\r
   fListHist->Add(fCosRes);\r
   fListHist->Add(fCosResabc);\r
   fListHist->Add(fCosPhiMaps);\r
@@ -1134,12 +1159,12 @@ void AliAnalysisTaskHFEFlow::UserCreateOutputObjects()
 \r
   if(fMonitorPhotonic) {\r
   fListHist->Add(fPIDBackgroundqa->MakeList("HFEpidBackgroundQA"));\r
-  fListHist->Add(fDeltaPhiMapsTaggedPhotonic);\r
-  fListHist->Add(fCosPhiMapsTaggedPhotonic);\r
-  fListHist->Add(fDeltaPhiMapsTaggedNonPhotonic);\r
-  fListHist->Add(fCosPhiMapsTaggedNonPhotonic);\r
-  fListHist->Add(fDeltaPhiMapsTaggedPhotonicLS);\r
-  fListHist->Add(fCosPhiMapsTaggedPhotonicLS);\r
+  //fListHist->Add(fDeltaPhiMapsTaggedPhotonic);\r
+  //fListHist->Add(fCosPhiMapsTaggedPhotonic);\r
+  //fListHist->Add(fDeltaPhiMapsTaggedNonPhotonic);\r
+  //fListHist->Add(fCosPhiMapsTaggedNonPhotonic);\r
+  //fListHist->Add(fDeltaPhiMapsTaggedPhotonicLS);\r
+  //fListHist->Add(fCosPhiMapsTaggedPhotonicLS);\r
   fListHist->Add(fMCSourceDeltaPhiMaps);\r
   fListHist->Add(fOppSignDeltaPhiMaps);\r
   fListHist->Add(fSameSignDeltaPhiMaps);\r
@@ -1181,7 +1206,7 @@ void AliAnalysisTaskHFEFlow::UserExec(Option_t */*option*/)
   Float_t binctt = -1.0;\r
   \r
   Double_t valuecossinephiep[3];\r
-  Double_t valuensparsea[5];\r
+  Double_t valuensparsea[4];\r
   Double_t valuensparseabis[5];\r
   Double_t valuensparsee[4];\r
   Double_t valuensparsef[2];\r
@@ -1194,6 +1219,7 @@ void AliAnalysisTaskHFEFlow::UserExec(Option_t */*option*/)
   Double_t valuensparseMCSourceDeltaPhiMaps[3];\r
   Double_t valuetrackingcuts[2];\r
   Double_t valuedeltaphicontamination[4];\r
+  Double_t valuefractioncont[2];\r
    \r
   AliMCEvent *mcEvent = MCEvent();\r
   AliMCParticle *mctrack = NULL;\r
@@ -1251,7 +1277,7 @@ void AliAnalysisTaskHFEFlow::UserExec(Option_t */*option*/)
   if(binct > 11.0) return;\r
  \r
   // centrality\r
-  valuensparsea[4] = binct;  \r
+  valuensparsea[3] = binct;  \r
   valuensparseabis[1] = binct;  \r
   valuensparsee[1] = binct;    \r
   valuensparsef[1] = binctMore;  \r
@@ -1260,6 +1286,7 @@ void AliAnalysisTaskHFEFlow::UserExec(Option_t */*option*/)
   valuensparsefbissin[3] = binct;  \r
   valuensparseg[1] = binct;\r
   valuensparseh[1] = binct; \r
+  valuefractioncont[1] = binct;\r
   valuensparsehprofile[1] = binct; \r
   valuecossinephiep[2] = binctMore;\r
   valuensparseMCSourceDeltaPhiMaps[0] = binct;\r
@@ -1407,16 +1434,7 @@ void AliAnalysisTaskHFEFlow::UserExec(Option_t */*option*/)
   Double_t diffsubasubcsin = -100.0;\r
   Double_t diffsubbsubcsin = -100.0;\r
 \r
-  //if(fVZEROEventPlane) {\r
-  diffsubasubb = TMath::Cos(2.*(eventPlaneV0A - eventPlaneV0C));\r
-  diffsubasubc = TMath::Cos(2.*(eventPlaneV0A - eventPlaneTPC));\r
-  diffsubbsubc = TMath::Cos(2.*(eventPlaneV0C - eventPlaneTPC));\r
-\r
-  diffsubasubbsin = TMath::Sin(2.*(eventPlaneV0A - eventPlaneV0C));\r
-  diffsubasubcsin = TMath::Sin(2.*(eventPlaneV0A - eventPlaneTPC));\r
-  diffsubbsubcsin = TMath::Sin(2.*(eventPlaneV0C - eventPlaneTPC));\r
-  //}\r
-  //else {\r
+  // two sub event TPC\r
   qsub1a = vEPa->GetQsub1();\r
   qsub2a = vEPa->GetQsub2();\r
   if(qsub1a) eventPlanesub1a = TVector2::Phi_0_2pi(qsub1a->Phi())/2.;\r
@@ -1425,7 +1443,25 @@ void AliAnalysisTaskHFEFlow::UserExec(Option_t */*option*/)
     diffsub1sub2a = TMath::Cos(2.*TVector2::Phi_0_2pi(qsub1a->Phi()/2.- qsub2a->Phi()/2.));\r
     diffsub1sub2asin = TMath::Sin(2.*TVector2::Phi_0_2pi(qsub1a->Phi()/2.- qsub2a->Phi()/2.));\r
   }\r
-  //}\r
+\r
+  // three sub events in case of VZEROA and VZEROC\r
+  diffsubasubb = TMath::Cos(2.*(eventPlaneV0A - eventPlaneV0C));\r
+  diffsubasubc = TMath::Cos(2.*(eventPlaneV0A - eventPlaneTPC));\r
+  diffsubbsubc = TMath::Cos(2.*(eventPlaneV0C - eventPlaneTPC));\r
+\r
+  diffsubasubbsin = TMath::Sin(2.*(eventPlaneV0A - eventPlaneV0C));\r
+  diffsubasubcsin = TMath::Sin(2.*(eventPlaneV0A - eventPlaneTPC));\r
+  diffsubbsubcsin = TMath::Sin(2.*(eventPlaneV0C - eventPlaneTPC));\r
+  // three sub events in case of VZERO all\r
+  if(fVZEROEventPlane && (!fVZEROEventPlaneA) && (!fVZEROEventPlaneC)) {\r
+    diffsubasubb = TMath::Cos(2.*(eventPlaneV0 - eventPlanesub1a));\r
+    diffsubasubc = TMath::Cos(2.*(eventPlaneV0 - eventPlanesub2a));\r
+    diffsubbsubc = TMath::Cos(2.*(eventPlanesub1a - eventPlanesub2a));\r
+    \r
+    diffsubasubbsin = TMath::Sin(2.*(eventPlaneV0 - eventPlanesub1a));\r
+    diffsubasubcsin = TMath::Sin(2.*(eventPlaneV0 - eventPlanesub2a));\r
+    diffsubbsubcsin = TMath::Sin(2.*(eventPlanesub1a - eventPlanesub2a));\r
+  }\r
   \r
 \r
   /////////////////////////////////////////////////////////\r
@@ -1494,7 +1530,12 @@ void AliAnalysisTaskHFEFlow::UserExec(Option_t */*option*/)
     valuensparsea[0] = eventPlaneV0A;\r
     valuensparsea[1] = eventPlaneV0C;\r
     valuensparsea[2] = eventPlaneTPC;\r
-    valuensparsea[3] = eventPlaneV0;  \r
+    if(fVZEROEventPlane && (!fVZEROEventPlaneA) && (!fVZEROEventPlaneC)) {\r
+      // case VZERO all\r
+      valuensparsea[0] = eventPlaneV0;\r
+      valuensparsea[1] = eventPlanesub1a;\r
+      valuensparsea[2] = eventPlanesub2a;\r
+    } \r
     fEventPlane->Fill(&valuensparsea[0]);\r
 \r
     // Fill\r
@@ -1781,6 +1822,7 @@ void AliAnalysisTaskHFEFlow::UserExec(Option_t */*option*/)
     valuensparsee[3] = track->Eta();    \r
     valuensparseg[2] = track->Pt();\r
     valuensparseh[2] = track->Pt();\r
+    valuefractioncont[0] = track->Pt();\r
     valuensparsehprofile[2] = track->Pt();\r
     valuensparseMCSourceDeltaPhiMaps[1] = track->Pt();\r
     if(track->Charge() > 0.0) {\r
@@ -1912,6 +1954,14 @@ void AliAnalysisTaskHFEFlow::UserExec(Option_t */*option*/)
     valuensparseh[0] = TMath::Cos(2*TVector2::Phi_mpi_pi(phitrack-eventplanesubtracted));\r
     if(fillEventPlane) {\r
       fCosPhiMaps->Fill(&valuensparseh[0]);\r
+      if((valuefractioncont[1] >=0) && (valuefractioncont[1] < 11)){\r
+       if(fContamination[((Int_t)valuefractioncont[1])]){\r
+         Double_t weight = fContamination[((Int_t)valuefractioncont[1])]->Eval(track->P());\r
+         if(weight<0.0) weight=0.0;\r
+         if(weight>1.0) weight=1.0;\r
+         fFractionContamination->Fill(&valuefractioncont[0],weight);\r
+       }     \r
+      }\r
       if(fMonitorEventPlane) {\r
        fProfileCosPhiMaps->Fill(valuensparsehprofile[1],valuensparsehprofile[2],valuensparseh[0]);\r
       }\r
@@ -1924,7 +1974,9 @@ void AliAnalysisTaskHFEFlow::UserExec(Option_t */*option*/)
       source = FindMother(TMath::Abs(track->GetLabel()),mcEvent, indexmother);\r
       valuensparseMCSourceDeltaPhiMaps[2] = source;\r
       if(mcEvent) fMCSourceDeltaPhiMaps->Fill(&valuensparseMCSourceDeltaPhiMaps[0]);\r
-      Int_t taggedvalue = LookAtNonHFE(k,track,fInputEvent,mcEvent,binct,deltaphi,source,indexmother);\r
+      LookAtNonHFE(k,track,fInputEvent,mcEvent,binct,deltaphi,source,indexmother);\r
+      //Int_t taggedvalue = LookAtNonHFE(k,track,fInputEvent,mcEvent,binct,deltaphi,source,indexmother);\r
+      /*\r
       if(fillEventPlane) {\r
        // No opposite charge partner found in the invariant mass choosen\r
        if((taggedvalue!=2) && (taggedvalue!=6)) {\r
@@ -1942,6 +1994,7 @@ void AliAnalysisTaskHFEFlow::UserExec(Option_t */*option*/)
          fCosPhiMapsTaggedPhotonicLS->Fill(&valuensparseh[0]);\r
        }\r
       }\r
+      */\r
     }\r
     \r
   }\r

diff --git a/PWGHF/hfe/AliAnalysisTaskHFEFlow.h b/PWGHF/hfe/AliAnalysisTaskHFEFlow.h
index 37e60baa1fe4cf79d22769cc5cf1a95fbec85187..40f56f5ba2ec787e970dd170184d5c7d66570087 100644 (file)
--- a/PWGHF/hfe/AliAnalysisTaskHFEFlow.h
+++ b/PWGHF/hfe/AliAnalysisTaskHFEFlow.h
@@ -36,6 +36,7 @@ class AliHFEcuts;
 class AliHFEpid;\r
 class TH1D;\r
 class TH2D;\r
+class TF1;\r
 class TProfile;\r
 class TProfile2D;\r
 class THnSparse;\r
@@ -92,6 +93,7 @@ public:
   AliHFEpidQAmanager *GetPIDBackgroundQAManager() const { return fPIDBackgroundqa; }\r
 \r
 \r
+  void SetContamination(TF1 * const function,Int_t k) { fContamination[k] = function; };\r
   void SetHFECuts(AliHFEcuts * const cuts) { fHFECuts = cuts; };\r
   void SetHFEBackgroundCuts(AliESDtrackCuts * const cuts) { fHFEBackgroundCuts = cuts; };\r
   void SetSubEtaGapTPC(Bool_t  subEtaGapTPC) { fSubEtaGapTPC = subEtaGapTPC; };\r
@@ -200,6 +202,9 @@ private:
   AliHFEpidQAmanager *fPIDqa;     // QA Manager\r
   AliFlowEvent *fflowEvent;       //! Flow event \r
 \r
+  // Hadron Contamination\r
+  TF1 *fContamination[11];        // Parametrization of the contamination (0-5,5-10,10-20,20-30,30-40,40-50,50-60,60-70,70-80,80-90,90-100)\r
+\r
   // Cuts for background study\r
   AliESDtrackCuts *fHFEBackgroundCuts;    // HFE background cuts\r
   AliHFEpid  *fPIDBackground;             // PID background cuts \r
@@ -217,12 +222,15 @@ private:
   TH2D *fHistEV;               //! Number of events\r
   \r
   // A Event plane as function of phiepa, phiepb, phiepc, phiepd centrality \r
-  // a V0A, b V0C, c TPC, d V0\r
+  // a V0A, b V0C, c TPC,\r
   THnSparseF *fEventPlane;     //! Event plane\r
   \r
   // B Event Plane after subtraction as function of phiep, centrality \r
   THnSparseF *fEventPlaneaftersubtraction; //! Event plane\r
 \r
+  // Contamination\r
+  THnSparseF *fFractionContamination;//! Fraction of contamination as function of pt\r
+\r
   // Monitoring Event plane: cos2phi, sin2phi, centrality\r
   THnSparseF *fCosSin2phiep;        //! Cos(2phi), Sin(2phi)\r
   \r
@@ -263,12 +271,12 @@ private:
   TProfile2D *fProfileCosPhiMaps;  //! Profile Cos\r
 \r
   // Background study: not statistic but tagged \r
-  THnSparseF *fDeltaPhiMapsTaggedPhotonic; //! Delta phi\r
-  THnSparseF *fCosPhiMapsTaggedPhotonic; //! Cos\r
-  THnSparseF *fDeltaPhiMapsTaggedNonPhotonic; //! Delta phi\r
-  THnSparseF *fCosPhiMapsTaggedNonPhotonic; //! Cos\r
-  THnSparseF *fDeltaPhiMapsTaggedPhotonicLS; //! Delta phi\r
-  THnSparseF *fCosPhiMapsTaggedPhotonicLS; //! Cos\r
+  //THnSparseF *fDeltaPhiMapsTaggedPhotonic; //! Delta phi\r
+  //THnSparseF *fCosPhiMapsTaggedPhotonic; //! Cos\r
+  //THnSparseF *fDeltaPhiMapsTaggedNonPhotonic; //! Delta phi\r
+  //THnSparseF *fCosPhiMapsTaggedNonPhotonic; //! Cos\r
+  //THnSparseF *fDeltaPhiMapsTaggedPhotonicLS; //! Delta phi\r
+  //THnSparseF *fCosPhiMapsTaggedPhotonicLS; //! Cos\r
 \r
   // Background study: centrality, pt, source\r
   THnSparseF *fMCSourceDeltaPhiMaps; //! Source MC\r

diff --git a/PWGHF/hfe/macros/AddTaskHFEtpctofv2.C b/PWGHF/hfe/macros/AddTaskHFEtpctofv2.C
index bc5b1306f4a1b78307e279716c66f51ab1283dce..1534c193bbacc718eb037121173a1e5bc731f7ed 100644 (file)
--- a/PWGHF/hfe/macros/AddTaskHFEtpctofv2.C
+++ b/PWGHF/hfe/macros/AddTaskHFEtpctofv2.C
@@ -1,4 +1,4 @@
-AliAnalysisTask *AddTaskHFEtpctofv2(Int_t tpcCls=110, Double_t tpcClsr=50, Int_t tpcClspid=60, Double_t tpcsharedfraction=10, Int_t itsCls=4, Double_t chi2peritscl=36, Int_t pixellayer=2, Double_t dcaxy=100,Double_t dcaz=200, Double_t tofsig=30., Double_t tpceff=50., Int_t vzero=3, Int_t debuglevel=0, Bool_t algorithmMA=kFALSE, Bool_t massconstraint=kFALSE){
+AliAnalysisTask *AddTaskHFEtpctofv2(Int_t tpcCls=110, Double_t tpcClsr=50, Int_t tpcClspid=60, Double_t tpcsharedfraction=10, Int_t itsCls=4, Double_t chi2peritscl=36, Int_t pixellayer=2, Double_t dcaxy=100,Double_t dcaz=200, Double_t tofsig=30., Double_t tpceff=50., Int_t vzero=1, Int_t debuglevel=3, Bool_t algorithmMA=kFALSE, Bool_t massconstraint=kFALSE){
 
   //
   // Define TPC cut for 2011 data

diff --git a/PWGHF/hfe/macros/configs/PbPb/ConfigHFE_FLOW_TOFTPC.C b/PWGHF/hfe/macros/configs/PbPb/ConfigHFE_FLOW_TOFTPC.C
index ddffc1bc5cb9022ce9d4a30d84cc66a1f1ba79fb..b6de3ae1c6b50dcab85a19a7bde8595375d866ee 100644 (file)
--- a/PWGHF/hfe/macros/configs/PbPb/ConfigHFE_FLOW_TOFTPC.C
+++ b/PWGHF/hfe/macros/configs/PbPb/ConfigHFE_FLOW_TOFTPC.C
@@ -153,6 +153,21 @@ AliAnalysisTaskHFEFlow* ConfigHFE_FLOW_TOFTPC(Bool_t useMC, TString appendix, In
       }
   }
 
+  // Define hadron contamination
+  TF1 *hBackground = new TF1("hadronicBackgroundFunction","[0]+[1]*x+[2]*x*x+[3]*x*x*x", 0., 200.);
+  // 20-30%
+  hBackground->SetParameter(0, -0.165789);
+  hBackground->SetParameter(1, 0.218694);
+  hBackground->SetParameter(2, -0.076635);
+  hBackground->SetParameter(3, 0.00947502);
+  task->SetContamination(hBackground,3);
+  // 30-40%
+  hBackground->SetParameter(0, -0.072222);
+  hBackground->SetParameter(1, 0.132098);
+  hBackground->SetParameter(2, -0.0561759);
+  hBackground->SetParameter(3, 0.00789356);
+  task->SetContamination(hBackground,4);
+
   // Define PID TOF Only
   AliHFEpid *pidTOFOnly = task->GetPIDTOFOnly();
   if(useMC) pidTOFOnly->SetHasMCData(kTRUE);

diff --git a/PWGHF/hfe/macros/configs/PbPb/VZerocalib_update.root b/PWGHF/hfe/macros/configs/PbPb/VZerocalib_update.root
new file mode 100644 (file)
index 0000000..49a0737
Binary files /dev/null and b/PWGHF/hfe/macros/configs/PbPb/VZerocalib_update.root differ

diff --git a/PWGHF/hfe/macros/test/runGridPbPb.C b/PWGHF/hfe/macros/test/runGridPbPb.C
index 76643324486bf0c00b4c57ad2696e93d1acee512..b4d3b8ce07acc6807e652c54628337af70a4d8a6 100644 (file)
--- a/PWGHF/hfe/macros/test/runGridPbPb.C
+++ b/PWGHF/hfe/macros/test/runGridPbPb.C
@@ -82,6 +82,14 @@ void runGridPbPb()
    //===== ADD CENTRALITY: ===
    gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
    AddTaskCentrality();
+
+   //===== ADD VZERO event plane: ===
+   gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskVZEROEPSelection.C");
+   AddTaskVZEROEPSelection();
+
+   //===== ADD TPC event plane: ===
+   gROOT->LoadMacro("$ALICE_ROOT/PWGHF/hfe/macros/AddTaskEventPlaneTPC.C");
+   AddTaskEventPlaneTPC();
    
 
    //===== ADD TASK::