including switch to set on/off iso-track core removal, cleaning and bug fix

diff --git a/PWGGA/EMCALTasks/AliAnalysisTaskEMCALIsoPhoton.cxx b/PWGGA/EMCALTasks/AliAnalysisTaskEMCALIsoPhoton.cxx
index 3ee19b33a9591894a673d231b829552a2b385a66..93010dd725a96670e3cfd9f4445c032cfa61db9e 100644 (file)
--- a/PWGGA/EMCALTasks/AliAnalysisTaskEMCALIsoPhoton.cxx
+++ b/PWGGA/EMCALTasks/AliAnalysisTaskEMCALIsoPhoton.cxx
@@ -85,7 +85,7 @@ AliAnalysisTaskEMCALIsoPhoton::AliAnalysisTaskEMCALIsoPhoton() :
   fRemMatchClus(kFALSE),
   fMinIsoClusE(0),
   fNCuts(5),
-  fCuts(""),
+  fTrCoreRem(kTRUE),
   fESD(0),
   fAOD(0),
   fVEvent(0),
@@ -189,7 +189,7 @@ AliAnalysisTaskEMCALIsoPhoton::AliAnalysisTaskEMCALIsoPhoton(const char *name) :
   fRemMatchClus(kFALSE),
   fMinIsoClusE(0),
   fNCuts(5),
-  fCuts(""),
+  fTrCoreRem(kTRUE),
   fESD(0),
   fAOD(0),
   fVEvent(0),
@@ -738,12 +738,12 @@ void AliAnalysisTaskEMCALIsoPhoton::FillClusHists()
       }
     }
     Bool_t isCPV = kFALSE;
-    if(TMath::Abs(c->GetTrackDx())<0.03 && TMath::Abs(c->GetTrackDz())<0.02)
+    if(TMath::Abs(c->GetTrackDx())>0.03 || TMath::Abs(c->GetTrackDz())>0.02)
       isCPV = kTRUE;
     if(c->GetM02()>0.1 && c->GetM02()<0.3 && isCPV)
       fClusEtCPVSBGISO->Fill(Et,alliso - trcore);
     if(c->GetM02()>0.5 && c->GetM02()<2.0 && isCPV)
-      fClusEtCPVSBGISO->Fill(Et,alliso - trcore);
+      fClusEtCPVBGISO->Fill(Et,alliso - trcore);
     const Int_t ndims =   fNDimensions;
     Double_t outputValues[ndims];
     if(mcptsum<2)
@@ -907,7 +907,7 @@ void AliAnalysisTaskEMCALIsoPhoton::GetTrIso(TVector3 vec, Float_t &iso, Float_t
       fHigherPtCone = pt;
     if(R<fIsoConeR){
       totiso += track->Pt();
-      if(R<0.04)
+      if(R<0.04 && this->fTrCoreRem)
        totcore += pt;
     }
     else{

diff --git a/PWGGA/EMCALTasks/AliAnalysisTaskEMCALIsoPhoton.h b/PWGGA/EMCALTasks/AliAnalysisTaskEMCALIsoPhoton.h
index a077fbaeb43f439d5907a139f12df5c40bfc256d..25e14cc42bcdb39ddc67be4ff38264a87a934a04 100644 (file)
--- a/PWGGA/EMCALTasks/AliAnalysisTaskEMCALIsoPhoton.h
+++ b/PWGGA/EMCALTasks/AliAnalysisTaskEMCALIsoPhoton.h
@@ -72,6 +72,7 @@ class AliAnalysisTaskEMCALIsoPhoton : public AliAnalysisTaskSE {
                                            Double_t highx)     { fNBinsPt = n; fPtBinLowEdge = lowx; fPtBinHighEdge = highx; }
   void                  SetRemoveMatchClus(Bool_t b)            { fRemMatchClus       = b;       }
   void                  SetMinIsoClusE(Double_t emin)           { fMinIsoClusE        = emin;    }
+  void                  SetTrCoreRemoval(Bool_t b)              { fTrCoreRem          = b;       }
 
  protected:
   TObjArray             *fESDClusters;           //!pointer to EMCal clusters
@@ -115,8 +116,7 @@ class AliAnalysisTaskEMCALIsoPhoton : public AliAnalysisTaskSE {
   Bool_t                 fRemMatchClus;          // flag to remove completely a cluster matched from the isolation
   Double_t               fMinIsoClusE;           // minimum energy for a cluster to be counted in the iso cone
   Int_t                  fNCuts;                 // number of cuts (QA purposes)
-  TString                fCuts;                  //string to hol cuts names
-
+  Bool_t                 fTrCoreRem;             // flag to set the removal of the core in track isolation (true removes it, default)
 
   
  private: