diff --git a/PWGJE/Tasks/statPromptPhoton.cxx b/PWGJE/Tasks/statPromptPhoton.cxx index 23cd388f547..f28a5f107b9 100644 --- a/PWGJE/Tasks/statPromptPhoton.cxx +++ b/PWGJE/Tasks/statPromptPhoton.cxx @@ -93,7 +93,7 @@ struct statPromptPhoton { Configurable cfgEMChighPSphi{"cfgEMChighPSphi", 3.26, "higher limit of the EMC acceptance if Rec PS is required"}; Configurable cfgEMChighPSeta{"cfgEMChighPSeta", 0.62, "symmetric eta cut if Rec PS is required"}; Configurable cfgDClowPSphi{"cfgDClowPSphi", 4.56, "lower limit of the DCal acceptance if Rec PS is required"}; - Configurable cfgDChighPSphi{"cfgDChighPSphi", 5.70, "higher limit of the DCal acceptance if Rec PS is required"}; + Configurable cfgDChighPSphi{"cfgDChighPSphi", 5.70, "higher limit of the DCal acceptance if Rec PS is required"}; Configurable cfgMCptNbins{"cfgMCptNbins", 200, "number of ptbins in MC QA plots"}; Configurable cfgMCptbinLow{"cfgMCptbinLow", 5, "lower limit of ptbins in MC QA plots"}; Configurable cfgMCptbinHigh{"cfgMCptbinHigh", 200, "upper limit of ptbins in MC QA plots"}; @@ -113,7 +113,6 @@ struct statPromptPhoton { const AxisSpec MCptAxis = {cfgMCptNbins, cfgMCptbinLow, cfgMCptbinHigh}; - triggerMaskBits = jetderiveddatautilities::initialiseTriggerMaskBits(cfgTriggerMasks); if (cfgJETracks) { trackFilter = jetderiveddatautilities::initialiseTrackSelection(static_cast(cfgTrackFilter)); @@ -1526,16 +1525,15 @@ struct statPromptPhoton { continue; if (std::fabs(mcParticle.getGenStatusCode()) >= 81 || !mcParticle.isPhysicalPrimary()) continue; - if(cfgReqRecPS_GEN){ - if(std::fabs(mcParticle.eta())>cfgEMChighPSeta) - continue; - bool insideCalPhi = false; - if((mcParticle.phi()> cfgEMClowPSphi && mcParticle.phi() cfgDClowPSphi && mcParticle.phi() cfgEMChighPSeta) + continue; + bool insideCalPhi = false; + if ((mcParticle.phi() > cfgEMClowPSphi && mcParticle.phi() < cfgEMChighPSphi) || (mcParticle.phi() > cfgDClowPSphi && mcParticle.phi() < cfgDChighPSphi)) + insideCalPhi = true; + if (!insideCalPhi) + continue; + } // Chase this final-state photon upward int chaseindex = -1; @@ -1651,17 +1649,17 @@ struct statPromptPhoton { if (clusterparticle.getGenStatusCode() < 0) continue; if (std::fabs(clusterparticle.getGenStatusCode()) >= 81) - continue; - if(cfgReqRecPS_REC){ - if(std::fabs(clusterparticle.eta())>cfgEMChighPSeta) - continue; - bool insideCalPhi = false; - if((clusterparticle.phi()> cfgEMClowPSphi && clusterparticle.phi() cfgDClowPSphi && clusterparticle.phi() cfgEMChighPSeta) + continue; + bool insideCalPhi = false; + if ((clusterparticle.phi() > cfgEMClowPSphi && clusterparticle.phi() < cfgEMChighPSphi) || (clusterparticle.phi() > cfgDClowPSphi && clusterparticle.phi() < cfgDChighPSphi)) + insideCalPhi = true; + if (!insideCalPhi) + continue; + } + int chaseindex = -1; for (auto& mom : clusterparticle.mothers_as()) { chaseindex = mom.globalIndex();