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: 3 additions & 0 deletions PWGJE/Core/JetFinder.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ void JetFinder::setParams()
// ghostAreaSpec=fastjet::GhostedAreaSpec(selGhosts,ghostRepeatN,ghostArea,gridScatter,ktScatter,ghostktMean);
ghostAreaSpec = fastjet::GhostedAreaSpec(ghostEtaMax, ghostRepeatN, ghostArea, gridScatter, ktScatter, ghostktMean); // the first argument is rapidity not pseudorapidity, to be checked
jetDef = fastjet::JetDefinition(algorithm, jetR, recombScheme, strategy);
if (fastjetExtraParam > -98.0) { // this is set to avoid any unintended consequences from the use of the _extra_param in fastjet
jetDef = fastjet::JetDefinition(algorithm, jetR, fastjetExtraParam, recombScheme, strategy);
}
areaDef = fastjet::AreaDefinition(areaType, ghostAreaSpec);
selJets = fastjet::SelectorPtRange(jetPtMin, jetPtMax) && fastjet::SelectorEtaRange(jetEtaMin, jetEtaMax) && fastjet::SelectorPhiRange(jetPhiMin, jetPhiMax);
}
Expand Down
1 change: 1 addition & 0 deletions PWGJE/Core/JetFinder.h
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ class JetFinder
fastjet::AreaDefinition areaDef;
fastjet::Selector selJets;
fastjet::Selector selGhosts;
double fastjetExtraParam = -99.0;

/// Sets the jet finding parameters
void setParams();
Expand Down
2 changes: 2 additions & 0 deletions PWGJE/JetFinders/jetfinder.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ struct JetFinderTask {
Configurable<float> jetAreaFractionMin{"jetAreaFractionMin", -99.0, "used to make a cut on the jet areas"};
Configurable<int> jetPtBinWidth{"jetPtBinWidth", 5, "used to define the width of the jetPt bins for the THnSparse"};
Configurable<bool> fillTHnSparse{"fillTHnSparse", false, "switch to fill the THnSparse"};
Configurable<double> jetExtraParam{"jetExtraParam", -99.0, "sets the _extra_param in fastjet"};

Service<o2::framework::O2DatabasePDG> pdgDatabase;
int trackSelection = -1;
Expand Down Expand Up @@ -111,6 +112,7 @@ struct JetFinderTask {
if (DoTriggering) {
jetFinder.isTriggering = true;
}
jetFinder.fastjetExtraParam = jetExtraParam;

auto jetRadiiBins = (std::vector<double>)jetRadius;
if (jetRadiiBins.size() > 1) {
Expand Down
6 changes: 6 additions & 0 deletions PWGJE/JetFinders/jetfinderhf.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,11 @@ struct JetFinderHFTask {
Configurable<int> jetRecombScheme{"jetRecombScheme", 0, "jet recombination scheme. 0 = E-scheme, 1 = pT-scheme, 2 = pT2-scheme"};
Configurable<float> jetGhostArea{"jetGhostArea", 0.005, "jet ghost area"};
Configurable<int> ghostRepeat{"ghostRepeat", 1, "set to 0 to gain speed if you dont need area calculation"};
Configurable<bool> DoTriggering{"DoTriggering", false, "used for the charged jet trigger to remove the eta constraint on the jet axis"};
Configurable<float> jetAreaFractionMin{"jetAreaFractionMin", -99.0, "used to make a cut on the jet areas"};
Configurable<int> jetPtBinWidth{"jetPtBinWidth", 5, "used to define the width of the jetPt bins for the THnSparse"};
Configurable<bool> fillTHnSparse{"fillTHnSparse", false, "switch to fill the THnSparse"};
Configurable<double> jetExtraParam{"jetExtraParam", -99.0, "sets the _extra_param in fastjet"};

Service<o2::framework::O2DatabasePDG> pdgDatabase;
int trackSelection = -1;
Expand Down Expand Up @@ -138,6 +140,10 @@ struct JetFinderHFTask {
jetFinder.recombScheme = static_cast<fastjet::RecombinationScheme>(static_cast<int>(jetRecombScheme));
jetFinder.ghostArea = jetGhostArea;
jetFinder.ghostRepeatN = ghostRepeat;
if (DoTriggering) {
jetFinder.isTriggering = true;
}
jetFinder.fastjetExtraParam = jetExtraParam;

auto jetRadiiBins = (std::vector<double>)jetRadius;
if (jetRadiiBins.size() > 1) {
Expand Down
6 changes: 6 additions & 0 deletions PWGJE/JetFinders/jetfinderv0.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,11 @@ struct JetFinderV0Task {
Configurable<int> jetRecombScheme{"jetRecombScheme", 0, "jet recombination scheme. 0 = E-scheme, 1 = pT-scheme, 2 = pT2-scheme"};
Configurable<float> jetGhostArea{"jetGhostArea", 0.005, "jet ghost area"};
Configurable<int> ghostRepeat{"ghostRepeat", 1, "set to 0 to gain speed if you dont need area calculation"};
Configurable<bool> DoTriggering{"DoTriggering", false, "used for the charged jet trigger to remove the eta constraint on the jet axis"};
Configurable<float> jetAreaFractionMin{"jetAreaFractionMin", -99.0, "used to make a cut on the jet areas"};
Configurable<int> jetPtBinWidth{"jetPtBinWidth", 5, "used to define the width of the jetPt bins for the THnSparse"};
Configurable<bool> fillTHnSparse{"fillTHnSparse", true, "switch to fill the THnSparse"};
Configurable<double> jetExtraParam{"jetExtraParam", -99.0, "sets the _extra_param in fastjet"};

Service<o2::framework::O2DatabasePDG> pdgDatabase;
int trackSelection = -1;
Expand Down Expand Up @@ -107,6 +109,10 @@ struct JetFinderV0Task {
jetFinder.recombScheme = static_cast<fastjet::RecombinationScheme>(static_cast<int>(jetRecombScheme));
jetFinder.ghostArea = jetGhostArea;
jetFinder.ghostRepeatN = ghostRepeat;
if (DoTriggering) {
jetFinder.isTriggering = true;
}
jetFinder.fastjetExtraParam = jetExtraParam;

if (candPDG == 310) {
candIndex = 0;
Expand Down