diff --git a/PWGJE/Core/JetBkgSubUtils.cxx b/PWGJE/Core/JetBkgSubUtils.cxx index 32a2a0ed3bc..45f79a9fe97 100644 --- a/PWGJE/Core/JetBkgSubUtils.cxx +++ b/PWGJE/Core/JetBkgSubUtils.cxx @@ -28,6 +28,7 @@ #include #include +#include #include #include @@ -51,7 +52,7 @@ void JetBkgSubUtils::initialise() // Note: recommended to use R=0.2 jetDefBkg = fastjet::JetDefinition(algorithmBkg, jetBkgR, recombSchemeBkg, fastjet::Best); areaDefBkg = fastjet::AreaDefinition(fastjet::active_area_explicit_ghosts, ghostAreaSpec); - selRho = fastjet::SelectorEtaRange(bkgEtaMin, bkgEtaMax) && fastjet::SelectorPhiRange(bkgPhiMin, bkgPhiMax) && !fastjet::SelectorNHardest(nHardReject); // here we have to put rap range, to be checked! + selRho = fastjet::SelectorEtaRange(bkgEtaMin + jetBkgR, bkgEtaMax - jetBkgR) && fastjet::SelectorPhiRange(bkgPhiMin, bkgPhiMax) && !fastjet::SelectorNHardest(nHardReject); // here we have to put rap range, to be checked! } std::tuple JetBkgSubUtils::estimateRhoAreaMedian(const std::vector& inputParticles, bool doSparseSub) diff --git a/PWGJE/TableProducer/rhoEstimator.cxx b/PWGJE/TableProducer/rhoEstimator.cxx index 6f94e1e8785..a7a05e5ebe7 100644 --- a/PWGJE/TableProducer/rhoEstimator.cxx +++ b/PWGJE/TableProducer/rhoEstimator.cxx @@ -79,10 +79,6 @@ struct RhoEstimatorTask { Configurable jetAlgorithm{"jetAlgorithm", 0, "jet clustering algorithm. 0 = kT, 1 = C/A, 2 = Anti-kT"}; Configurable jetRecombScheme{"jetRecombScheme", 0, "jet recombination scheme. 0 = E-scheme, 1 = pT-scheme, 2 = pT2-scheme"}; Configurable bkgjetR{"bkgjetR", 0.2, "jet resolution parameter for determining background density"}; - Configurable bkgEtaMin{"bkgEtaMin", -0.7, "minimim pseudorapidity for determining background density"}; - Configurable bkgEtaMax{"bkgEtaMax", 0.7, "maximum pseudorapidity for determining background density"}; - Configurable bkgPhiMin{"bkgPhiMin", -6.283, "minimim phi for determining background density"}; - Configurable bkgPhiMax{"bkgPhiMax", 6.283, "maximum phi for determining background density"}; Configurable doSparse{"doSparse", false, "perfom sparse estimation"}; Configurable ghostRapMax{"ghostRapMax", 0.9, "Ghost rapidity max"}; Configurable ghostRepeat{"ghostRepeat", 1, "Ghost tiling repeats"}; @@ -127,13 +123,13 @@ struct RhoEstimatorTask { bkgSub.setJetAlgorithmAndScheme(static_cast(static_cast(config.jetAlgorithm)), static_cast(static_cast(config.jetRecombScheme))); bkgSub.setJetBkgR(config.bkgjetR); - bkgSub.setEtaMinMax(config.bkgEtaMin, config.bkgEtaMax); - bkgPhiMax_ = config.bkgPhiMax; - bkgPhiMin_ = config.bkgPhiMin; - if (config.bkgPhiMax > 98.0) { + bkgSub.setEtaMinMax(config.trackEtaMin, config.trackEtaMax); + bkgPhiMax_ = config.trackPhiMax; + bkgPhiMin_ = config.trackPhiMin; + if (config.trackPhiMax > 98.0) { bkgPhiMax_ = 2.0 * M_PI; } - if (config.bkgPhiMin < -98.0) { + if (config.trackPhiMin < -98.0) { bkgPhiMin_ = -2.0 * M_PI; } bkgSub.setPhiMinMax(bkgPhiMin_, bkgPhiMax_);