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
4 changes: 2 additions & 2 deletions PWGJE/Core/JetFinder.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ void JetFinder::setParams()
}
float jetRForClustering = isReclustering ? 5.0 * jetR : jetR;

selGhosts = fastjet::SelectorEtaRange(ghostEtaMin, ghostEtaMax) && fastjet::SelectorPhiRange(phiMin, phiMax);
selGhosts = fastjet::SelectorRapRange(etaMin, etaMax) && fastjet::SelectorPhiRange(phiMin, phiMax); // note that this is rapidity not eta but since ghosts are effectively massless this is ok
// ghostAreaSpec=fastjet::GhostedAreaSpec(selGhosts,ghostRepeatN,ghostArea,gridScatter,ktScatter,ghostktMean);
ghostAreaSpec = fastjet::GhostedAreaSpec(selGhosts, ghostRepeatN, ghostArea, gridScatter, ktScatter, ghostktMean); // the first argument is rapidity not pseudorapidity, to be checked
ghostAreaSpec = fastjet::GhostedAreaSpec(selGhosts, ghostRepeatN, ghostArea, gridScatter, ktScatter, ghostktMean);
jetDef = fastjet::JetDefinition(fastjet::antikt_algorithm, jetRForClustering, recombScheme, strategy);
if (fastjetExtraParam > -98.0) {
jetDef.set_extra_param(fastjetExtraParam);
Expand Down
6 changes: 2 additions & 4 deletions PWGJE/Core/JetFinder.h
Original file line number Diff line number Diff line change
Expand Up @@ -48,22 +48,20 @@ class JetFinder
/// \return ClusterSequenceArea object needed to access constituents
// fastjet::ClusterSequenceArea findJets(std::vector<fastjet::PseudoJet> &inputParticles, std::vector<fastjet::PseudoJet> &jets);

float phiMin = 0.;
float phiMin = -2. * M_PI;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't use M_PI.

float phiMax = 2. * M_PI;
float etaMin = -.9;
float etaMax = .9;

float jetR = .4;
float jetPtMin = 0.;
float jetPtMax = 1000.;
float jetPhiMin = 0.;
float jetPhiMin = -2. * M_PI;
float jetPhiMax = 2. * M_PI;
float jetEtaMin = -99.;
float jetEtaMax = 99.;
bool jetEtaDefault = false;

float ghostEtaMin = -.9;
float ghostEtaMax = .9;
float ghostArea = .005;
int ghostRepeatN = 1;
double ghostktMean = 1.e-100;
Expand Down
7 changes: 7 additions & 0 deletions PWGJE/JetFinders/jetFinder.h
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,8 @@ struct JetFinderTask {
o2::framework::Configurable<std::vector<double>> jetRadius{"jetRadius", {0.4}, "jet resolution parameters"};
o2::framework::Configurable<float> jetPtMin{"jetPtMin", 0.0, "minimum jet pT"};
o2::framework::Configurable<float> jetPtMax{"jetPtMax", 1000.0, "maximum jet pT"};
o2::framework::Configurable<float> jetPhiMin{"jetPhiMin", -99.0, "minimum jet phi"};
o2::framework::Configurable<float> jetPhiMax{"jetPhiMax", 99.0, "maximum jet phi"};
o2::framework::Configurable<float> jetEWSPtMin{"jetEWSPtMin", 0.0, "minimum event-wise subtracted jet pT"};
o2::framework::Configurable<float> jetEWSPtMax{"jetEWSPtMax", 1000.0, "maximum event-wise subtracted jet pT"};
o2::framework::Configurable<float> jetEtaMin{"jetEtaMin", -99.0, "minimum jet pseudorapidity"};
Expand Down Expand Up @@ -135,11 +137,16 @@ struct JetFinderTask {
jetFinder.etaMax = trackEtaMax;
jetFinder.phiMin = trackPhiMin;
jetFinder.phiMax = trackPhiMax;
if (jetPhiMin < -98.0) {
jetFinder.jetPhiMin = -2. * M_PI;
jetFinder.jetPhiMax = 2. * M_PI;
}
jetFinder.jetEtaMin = jetEtaMin;
jetFinder.jetEtaMax = jetEtaMax;
if (jetEtaMin < -98.0) {
jetFinder.jetEtaDefault = true;
}

jetFinder.algorithm = static_cast<fastjet::JetAlgorithm>(static_cast<int>(jetAlgorithm));
jetFinder.recombScheme = static_cast<fastjet::RecombinationScheme>(static_cast<int>(jetRecombScheme));
jetFinder.ghostArea = jetGhostArea;
Expand Down
6 changes: 6 additions & 0 deletions PWGJE/JetFinders/jetFinderHF.h
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,8 @@ struct JetFinderHFTask {
o2::framework::Configurable<std::vector<double>> jetRadius{"jetRadius", {0.4}, "jet resolution parameters"};
o2::framework::Configurable<float> jetPtMin{"jetPtMin", 0.0, "minimum jet pT"};
o2::framework::Configurable<float> jetPtMax{"jetPtMax", 1000.0, "maximum jet pT"};
o2::framework::Configurable<float> jetPhiMin{"jetPhiMin", -99.0, "minimum jet phi"};
o2::framework::Configurable<float> jetPhiMax{"jetPhiMax", 99.0, "maximum jet phi"};
o2::framework::Configurable<float> jetEWSPtMin{"jetEWSPtMin", 0.0, "minimum event-wise subtracted jet pT"};
o2::framework::Configurable<float> jetEWSPtMax{"jetEWSPtMax", 1000.0, "maximum event-wise subtracted jet pT"};
o2::framework::Configurable<float> jetEtaMin{"jetEtaMin", -99.0, "minimum jet pseudorapidity"};
Expand Down Expand Up @@ -140,6 +142,10 @@ struct JetFinderHFTask {
jetFinder.etaMax = trackEtaMax;
jetFinder.jetPtMin = jetPtMin;
jetFinder.jetPtMax = jetPtMax;
if (jetPhiMin < -98.0) {
jetFinder.jetPhiMin = -2. * M_PI;
jetFinder.jetPhiMax = 2. * M_PI;
}
jetFinder.jetEtaMin = jetEtaMin;
jetFinder.jetEtaMax = jetEtaMax;
if (jetEtaMin < -98.0) {
Expand Down
6 changes: 6 additions & 0 deletions PWGJE/JetFinders/jetFinderHFHFBar.h
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,8 @@ struct JetFinderHFHFBarTask {
o2::framework::Configurable<std::vector<double>> jetRadius{"jetRadius", {0.4}, "jet resolution parameters"};
o2::framework::Configurable<float> jetPtMin{"jetPtMin", 0.0, "minimum jet pT"};
o2::framework::Configurable<float> jetPtMax{"jetPtMax", 1000.0, "maximum jet pT"};
o2::framework::Configurable<float> jetPhiMin{"jetPhiMin", -99.0, "minimum jet phi"};
o2::framework::Configurable<float> jetPhiMax{"jetPhiMax", 99.0, "maximum jet phi"};
o2::framework::Configurable<float> jetEWSPtMin{"jetEWSPtMin", 0.0, "minimum event-wise subtracted jet pT"};
o2::framework::Configurable<float> jetEWSPtMax{"jetEWSPtMax", 1000.0, "maximum event-wise subtracted jet pT"};
o2::framework::Configurable<float> jetEtaMin{"jetEtaMin", -99.0, "minimum jet pseudorapidity"};
Expand Down Expand Up @@ -137,6 +139,10 @@ struct JetFinderHFHFBarTask {
jetFinder.etaMax = trackEtaMax;
jetFinder.jetPtMin = jetPtMin;
jetFinder.jetPtMax = jetPtMax;
if (jetPhiMin < -98.0) {
jetFinder.jetPhiMin = -2. * M_PI;
jetFinder.jetPhiMax = 2. * M_PI;
}
jetFinder.jetEtaMin = jetEtaMin;
jetFinder.jetEtaMax = jetEtaMax;
if (jetEtaMin < -98.0) {
Expand Down
6 changes: 6 additions & 0 deletions PWGJE/JetFinders/jetFinderV0.h
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@ struct JetFinderV0Task {
o2::framework::Configurable<std::vector<double>> jetRadius{"jetRadius", {0.4}, "jet resolution parameters"};
o2::framework::Configurable<float> jetPtMin{"jetPtMin", 0.0, "minimum jet pT"};
o2::framework::Configurable<float> jetPtMax{"jetPtMax", 1000.0, "maximum jet pT"};
o2::framework::Configurable<float> jetPhiMin{"jetPhiMin", -99.0, "minimum jet phi"};
o2::framework::Configurable<float> jetPhiMax{"jetPhiMax", 99.0, "maximum jet phi"};
o2::framework::Configurable<float> jetEtaMin{"jetEtaMin", -99.0, "minimum jet pseudorapidity"};
o2::framework::Configurable<float> jetEtaMax{"jetEtaMax", 99.0, "maximum jet pseudorapidity"};
o2::framework::Configurable<int> jetTypeParticleLevel{"jetTypeParticleLevel", 1, "Type of stored jets. 0 = full, 1 = charged, 2 = neutral"};
Expand Down Expand Up @@ -121,6 +123,10 @@ struct JetFinderV0Task {
jetFinder.etaMax = trackEtaMax;
jetFinder.jetPtMin = jetPtMin;
jetFinder.jetPtMax = jetPtMax;
if (jetPhiMin < -98.0) {
jetFinder.jetPhiMin = -2. * M_PI;
jetFinder.jetPhiMax = 2. * M_PI;
}
jetFinder.jetEtaMin = jetEtaMin;
jetFinder.jetEtaMax = jetEtaMax;
if (jetEtaMin < -98.0) {
Expand Down
Loading