Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion PWGJE/Core/JetBkgSubUtils.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
#include <fastjet/contrib/ConstituentSubtractor.hh>
#include <fastjet/tools/Subtractor.hh>

#include <algorithm>
#include <tuple>
#include <vector>

Expand All @@ -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<double, double> JetBkgSubUtils::estimateRhoAreaMedian(const std::vector<fastjet::PseudoJet>& inputParticles, bool doSparseSub)
Expand Down
14 changes: 5 additions & 9 deletions PWGJE/TableProducer/rhoEstimator.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,6 @@ struct RhoEstimatorTask {
Configurable<int> jetAlgorithm{"jetAlgorithm", 0, "jet clustering algorithm. 0 = kT, 1 = C/A, 2 = Anti-kT"};
Configurable<int> jetRecombScheme{"jetRecombScheme", 0, "jet recombination scheme. 0 = E-scheme, 1 = pT-scheme, 2 = pT2-scheme"};
Configurable<float> bkgjetR{"bkgjetR", 0.2, "jet resolution parameter for determining background density"};
Configurable<float> bkgEtaMin{"bkgEtaMin", -0.7, "minimim pseudorapidity for determining background density"};
Configurable<float> bkgEtaMax{"bkgEtaMax", 0.7, "maximum pseudorapidity for determining background density"};
Configurable<float> bkgPhiMin{"bkgPhiMin", -6.283, "minimim phi for determining background density"};
Configurable<float> bkgPhiMax{"bkgPhiMax", 6.283, "maximum phi for determining background density"};
Configurable<bool> doSparse{"doSparse", false, "perfom sparse estimation"};
Configurable<double> ghostRapMax{"ghostRapMax", 0.9, "Ghost rapidity max"};
Configurable<int> ghostRepeat{"ghostRepeat", 1, "Ghost tiling repeats"};
Expand Down Expand Up @@ -127,13 +123,13 @@ struct RhoEstimatorTask {

bkgSub.setJetAlgorithmAndScheme(static_cast<fastjet::JetAlgorithm>(static_cast<int>(config.jetAlgorithm)), static_cast<fastjet::RecombinationScheme>(static_cast<int>(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_);
Expand Down
Loading