From 6f025d2ba16fd95ff35b02dbcc137ab2647509ef Mon Sep 17 00:00:00 2001
From: lmilano <lmilano@cern.ch>
Date: Thu, 13 Feb 2014 14:44:45 +0100
Subject: [PATCH] update from Alice

---
 .../DPhi/PhiEffMC/AliAnalysisTaskPhiEffMc.cxx  | 18 +++++++++---------
 .../DPhi/PhiEffMC/AliAnalysisTaskPhiEffMc.h    |  6 ++++--
 .../macros/phieffmc/AddTaskPhiEffMc.C          |  5 ++++-
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/PWGCF/Correlations/DPhi/PhiEffMC/AliAnalysisTaskPhiEffMc.cxx b/PWGCF/Correlations/DPhi/PhiEffMC/AliAnalysisTaskPhiEffMc.cxx
index ab2718a62c2..c2ad8cc1095 100644
--- a/PWGCF/Correlations/DPhi/PhiEffMC/AliAnalysisTaskPhiEffMc.cxx
+++ b/PWGCF/Correlations/DPhi/PhiEffMC/AliAnalysisTaskPhiEffMc.cxx
@@ -61,7 +61,8 @@ AliAnalysisTaskPhiEffMc::AliAnalysisTaskPhiEffMc(const char *name) : AliAnalysis
   fHelperPID(0x0),
   fTrackCuts(0x0),
   fEventCuts(0x0),
-  fPtCut(0.)
+  fPtCut(0.),
+  fDoPID(kTRUE)
 {
   // Default constructor
   
@@ -306,12 +307,12 @@ void AliAnalysisTaskPhiEffMc::UserExec(Option_t *)
 	  nMc++;
 
 	  Int_t mcID = fHelperPID->GetParticleSpecies(partMC);
-	  if(mcID>3 || mcID < -3) continue;
+	  if(fDoPID && (mcID>3 || mcID < -3)) continue;
 	  // PID ID, pt, y, eta, phi
 	  Double_t varfill2[6] = {(partMC->Charge() > 0 ? mcID+1 : -1*(mcID+1)), partMC->Pt(), partMC->Y(), cent, partMC->Eta(), partMC->Phi()};
 	  hTrackMc->Fill(varfill2);
 
-	  if(mcID == 1)
+	  if(!fDoPID || mcID == 1)
 	    {
 	      if(partMC->Charge() > 0) kaonsPosMc->Add(partMC);
 	      else if(partMC->Charge() < 0) kaonsNegMc->Add(partMC);
@@ -327,7 +328,7 @@ void AliAnalysisTaskPhiEffMc::UserExec(Option_t *)
   //track loop
   for (Int_t iTracks = 0; iTracks < fAOD->GetNumberOfTracks(); iTracks++) {
     AliAODTrack* track = fAOD->GetTrack(iTracks);
-    if (!fTrackCuts->IsSelected(track,kTRUE)) continue; //track selection (rapidity selection NOT in the standard cuts?)
+    if (!fTrackCuts->IsSelected(track,kTRUE)) continue;
     if(track->Charge()==0) continue;
     if(track->Pt()<fPtCut) continue;
     if(track->Eta()>fTrackCuts->GetEtaMax() || track->Eta()<fTrackCuts->GetEtaMin()) continue;
@@ -335,13 +336,13 @@ void AliAnalysisTaskPhiEffMc::UserExec(Option_t *)
     nReco++;
 
     Int_t dataID=fHelperPID->GetParticleSpecies(track,kTRUE);
-    if(dataID>3 || dataID < -3) continue;
+    if(fDoPID && (dataID>3 || dataID < -3)) continue;
 
     // PID ID, pt, y, eta, phi
     Double_t varfill3[6] = {(track->Charge() > 0 ? dataID+1 : -1*(dataID+1)), track->Pt(), track->Y(), cent, track->Eta(), track->Phi()};
     hTrackReco->Fill(varfill3);
 
-    if(dataID==1)
+    if(!fDoPID || dataID==1)
       {
 	if(track->Charge() > 0) kaonsPosData->Add(track);
 	else if(track->Charge() < 0) kaonsNegData->Add(track);
@@ -358,8 +359,8 @@ void AliAnalysisTaskPhiEffMc::UserExec(Option_t *)
 	  }
 	
 	Int_t genID = fHelperPID->GetParticleSpecies(tempMC);
-	if(genID != dataID) continue;
-	if(genID>3 || genID < -3) continue;
+	if(fDoPID && (genID != dataID)) continue;
+	if(fDoPID && (genID>3 || genID < -3)) continue;
 
 	// PID ID, pt, y, eta, phi
 	Double_t varfill4[6] = {(track->Charge() > 0 ? genID+1 : -1*(genID+1)), track->Pt(), track->Y(), cent, track->Eta(), track->Phi()};
@@ -544,4 +545,3 @@ TLorentzVector* AliAnalysisTaskPhiEffMc::makePhi(AliVParticle* p1, AliVParticle*
   return c;
 }
 
-
diff --git a/PWGCF/Correlations/DPhi/PhiEffMC/AliAnalysisTaskPhiEffMc.h b/PWGCF/Correlations/DPhi/PhiEffMC/AliAnalysisTaskPhiEffMc.h
index af22e493017..595ec650b31 100644
--- a/PWGCF/Correlations/DPhi/PhiEffMC/AliAnalysisTaskPhiEffMc.h
+++ b/PWGCF/Correlations/DPhi/PhiEffMC/AliAnalysisTaskPhiEffMc.h
@@ -51,7 +51,9 @@ class AliAnalysisTaskPhiEffMc : public AliAnalysisTaskSE
   TLorentzVector* makePhi(AliVParticle* p1, AliVParticle* p2);
 
   void SetPtCut(Double_t ptcut){fPtCut = ptcut;}
+  void SetDoPID(Bool_t dopid){fDoPID = dopid;}
   Double_t GetPtCut(){return fPtCut;}
+  Bool_t GetDoPID(){return fDoPID;}
 
  private:
   
@@ -63,12 +65,12 @@ class AliAnalysisTaskPhiEffMc : public AliAnalysisTaskSE
   AliSpectraAODEventCuts      * fEventCuts;     // Event Cuts
 
   Double_t fPtCut;  // min pt cut on tracks (pt cut in AliSpectraAODTrackCuts is max pt)
+  Bool_t fDoPID; // true -- do PID to select kaons, false -- no PID
 
   AliAnalysisTaskPhiEffMc(const AliAnalysisTaskPhiEffMc&);
   AliAnalysisTaskPhiEffMc& operator=(const AliAnalysisTaskPhiEffMc&);
   
-  ClassDef(AliAnalysisTaskPhiEffMc, 2);
+  ClassDef(AliAnalysisTaskPhiEffMc, 3);
 };
 
 #endif
-
diff --git a/PWGCF/Correlations/macros/phieffmc/AddTaskPhiEffMc.C b/PWGCF/Correlations/macros/phieffmc/AddTaskPhiEffMc.C
index a1ac1aa474e..de0f04aae19 100644
--- a/PWGCF/Correlations/macros/phieffmc/AddTaskPhiEffMc.C
+++ b/PWGCF/Correlations/macros/phieffmc/AddTaskPhiEffMc.C
@@ -1,4 +1,4 @@
-AliAnalysisTaskPhiEffMc* AddTaskPhiEffMc(Bool_t mc=kFALSE){
+AliAnalysisTaskPhiEffMc* AddTaskPhiEffMc(Bool_t mc=kFALSE,TString foldername){
   
   AliAnalysisManager *mgr = AliAnalysisManager::GetAnalysisManager();
   if (!mgr) 
@@ -25,6 +25,9 @@ AliAnalysisTaskPhiEffMc* AddTaskPhiEffMc(Bool_t mc=kFALSE){
   AliAnalysisTaskPhiEffMc *task = new AliAnalysisTaskPhiEffMc("PhiEffMc");
   
   TString outputFileName = AliAnalysisManager::GetCommonFileName();
+  outputFileName += ":";
+  outputFileName += foldername;
+
   cout<<"-------------- outputFileName:  "<<outputFileName<<endl;
   
   AliAnalysisDataContainer *cinput = mgr->GetCommonInputContainer();      
-- 
2.43.5