wagon for photon isolation spectra analysis with CaloTrackCorr frame

Conflicts:
	PWGGA/CaloTrackCorrelations/macros/AddTaskIsoPhoton.C

diff --git a/PWGGA/CaloTrackCorrelations/macros/AddTaskIsoPhoton.C b/PWGGA/CaloTrackCorrelations/macros/AddTaskIsoPhoton.C
index cc5d44a01fec81ab2a3a7a39ae8fb1cd6d431277..3ffa326540d4a67e2c7def42dc15ec2c41585ed4 100644 (file)
--- a/PWGGA/CaloTrackCorrelations/macros/AddTaskIsoPhoton.C
+++ b/PWGGA/CaloTrackCorrelations/macros/AddTaskIsoPhoton.C
@@ -464,6 +464,7 @@ AliAnaParticleIsolation* ConfigureIsolationAnalysis(TString calorimeter = "EMCAL
   if(calorimeter=="EMCAL")
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> f177d5e... reduce isolated photon fiducial area
   {
@@ -476,6 +477,9 @@ AliAnaParticleIsolation* ConfigureIsolationAnalysis(TString calorimeter = "EMCAL
 >>>>>>> 02f44ef... wagon for photon isolation spectra analysis with CaloTrackCorr frame
 =======
 >>>>>>> f177d5e... reduce isolated photon fiducial area
+=======
+    ana->GetFiducialCut()->SetSimpleEMCALFiducialCut(0.6, 86, 174) ;
+>>>>>>> 02f44ef... wagon for photon isolation spectra analysis with CaloTrackCorr frame
   
   ana->SetMinPt(5);