reduce isolated photon fiducial area

diff --git a/PWGGA/CaloTrackCorrelations/macros/AddTaskIsoPhoton.C b/PWGGA/CaloTrackCorrelations/macros/AddTaskIsoPhoton.C
index 66c06e8a0a1c9828711b9da5194bb144da26c869..cc5d44a01fec81ab2a3a7a39ae8fb1cd6d431277 100644 (file)
--- a/PWGGA/CaloTrackCorrelations/macros/AddTaskIsoPhoton.C
+++ b/PWGGA/CaloTrackCorrelations/macros/AddTaskIsoPhoton.C
@@ -463,13 +463,19 @@ AliAnaParticleIsolation* ConfigureIsolationAnalysis(TString calorimeter = "EMCAL
   //Avoid borders of EMCal
   if(calorimeter=="EMCAL")
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> f177d5e... reduce isolated photon fiducial area
   {
     //ana->GetFiducialCut()->SetSimpleEMCALFiducialCut(0.6, 86, 174) ;
     ana->GetFiducialCut()->SetSimpleEMCALFiducialCut(0.27, 103, 157) ;
   }
+<<<<<<< HEAD
 =======
     ana->GetFiducialCut()->SetSimpleEMCALFiducialCut(0.6, 86, 174) ;
 >>>>>>> 02f44ef... wagon for photon isolation spectra analysis with CaloTrackCorr frame
+=======
+>>>>>>> f177d5e... reduce isolated photon fiducial area
   
   ana->SetMinPt(5);