Skip to content

[PWGJE] removing std::optional #11188

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nzardosh merged 1 commit into from
May 14, 2025
Merged

[PWGJE] removing std::optional #11188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 9 additions & 13 deletions PWGJE/Core/JetFindingUtilities.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
#include <array>
#include <vector>
#include <string>
#include <optional>
#include <cmath>
#include <memory>
#include <TRandom3.h>
Expand Down Expand Up @@ -99,19 +98,18 @@
*/

template <typename T, typename U>
void analyseTracks(std::vector<fastjet::PseudoJet>& inputParticles, T const& tracks, int trackSelection, double trackingEfficinecy, std::optional<U> const& candidate = std::nullopt)
void analyseTracks(std::vector<fastjet::PseudoJet>& inputParticles, T const& tracks, int trackSelection, double trackingEfficinecy, const U* candidate = nullptr)
{
for (auto& track : tracks) {

Check failure on line 103 in PWGJE/Core/JetFindingUtilities.h

View workflow job for this annotation

GitHub Actions / O2 linter

[const-ref-in-for-loop] 

Use constant references for non-modified iterators in range-based for loops.
if (!jetderiveddatautilities::selectTrack(track, trackSelection)) {
continue;
}
if (candidate != std::nullopt) {
auto cand = candidate.value();
if (jetcandidateutilities::isDaughterTrack(track, cand, tracks)) {
if (candidate != nullptr) {
if (jetcandidateutilities::isDaughterTrack(track, *candidate, tracks)) {
continue;
}
}
if (trackingEfficinecy < 0.999) { // this code is a bit ugly but it stops us needing to do the random generation unless asked for

Check failure on line 112 in PWGJE/Core/JetFindingUtilities.h

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
TRandom3 randomNumber(0);
if (randomNumber.Rndm() > trackingEfficinecy) { // Is Rndm ok to use?
continue;
Expand All @@ -133,16 +131,16 @@
template <typename T, typename U>
void analyseTracksMultipleCandidates(std::vector<fastjet::PseudoJet>& inputParticles, T const& tracks, int trackSelection, double trackingEfficinecy, U const& candidates)
{
for (auto& track : tracks) {

Check failure on line 134 in PWGJE/Core/JetFindingUtilities.h

View workflow job for this annotation

GitHub Actions / O2 linter

[const-ref-in-for-loop] 

Use constant references for non-modified iterators in range-based for loops.
if (!jetderiveddatautilities::selectTrack(track, trackSelection)) {
continue;
}
for (auto& candidate : candidates) {

Check failure on line 138 in PWGJE/Core/JetFindingUtilities.h

View workflow job for this annotation

GitHub Actions / O2 linter

[const-ref-in-for-loop] 

Use constant references for non-modified iterators in range-based for loops.
if (jetcandidateutilities::isDaughterTrack(track, candidate, tracks)) {
continue;
}
}
if (trackingEfficinecy < 0.999) { // this code is a bit ugly but it stops us needing to do the random generation unless asked for

Check failure on line 143 in PWGJE/Core/JetFindingUtilities.h

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
TRandom3 randomNumber(0);
if (randomNumber.Rndm() > trackingEfficinecy) { // Is Rndm ok to use?
continue;
Expand All @@ -161,7 +159,7 @@
template <typename T>
void analyseClusters(std::vector<fastjet::PseudoJet>& inputParticles, T const& clusters, int hadronicCorrectionType = 0)
{
for (auto& cluster : *clusters) {

Check failure on line 162 in PWGJE/Core/JetFindingUtilities.h

View workflow job for this annotation

GitHub Actions / O2 linter

[const-ref-in-for-loop] 

Use constant references for non-modified iterators in range-based for loops.
// add cluster selections
fastjetutilities::fillClusters(cluster, inputParticles, cluster.globalIndex(), hadronicCorrectionType);
}
Expand Down Expand Up @@ -281,12 +279,12 @@
auto jetRValues = static_cast<std::vector<double>>(jetRadius);
jetFinder.jetPtMin = jetPtMin;
jetFinder.jetPtMax = jetPtMax;
for (auto R : jetRValues) {

Check failure on line 282 in PWGJE/Core/JetFindingUtilities.h

View workflow job for this annotation

GitHub Actions / O2 linter

[const-ref-in-for-loop] 

Use constant references for non-modified iterators in range-based for loops.
jetFinder.jetR = R;
std::vector<fastjet::PseudoJet> jets;
fastjet::ClusterSequenceArea clusterSeq(jetFinder.findJets(inputParticles, jets));
for (const auto& jet : jets) {
if (jet.has_area() && jet.area() < jetAreaFractionMin * M_PI * R * R) {

Check failure on line 287 in PWGJE/Core/JetFindingUtilities.h

View workflow job for this annotation

GitHub Actions / O2 linter

[external-pi] 

Use the PI constant (and its multiples and fractions) defined in o2::constants::math.
continue;
}
if (fillThnSparse) {
Expand Down Expand Up @@ -337,9 +335,9 @@
* @param candidate optional hf candidiate
*/
template <bool checkIsDaughter, typename T, typename U>
void analyseParticles(std::vector<fastjet::PseudoJet>& inputParticles, std::string particleSelection, int jetTypeParticleLevel, T const& particles, o2::framework::Service<o2::framework::O2DatabasePDG> pdgDatabase, std::optional<U> const& candidate = std::nullopt)
void analyseParticles(std::vector<fastjet::PseudoJet>& inputParticles, std::string particleSelection, int jetTypeParticleLevel, T const& particles, o2::framework::Service<o2::framework::O2DatabasePDG> pdgDatabase, const U* candidate = nullptr)
{
for (auto& particle : particles) {

Check failure on line 340 in PWGJE/Core/JetFindingUtilities.h

View workflow job for this annotation

GitHub Actions / O2 linter

[const-ref-in-for-loop] 

Use constant references for non-modified iterators in range-based for loops.
if (particleSelection == "PhysicalPrimary" && !particle.isPhysicalPrimary()) { // CHECK : Does this exclude the HF hadron?
continue;
} else if (particleSelection == "HepMCStatus" && particle.getHepMCStatusCode() != 1) { // do we need isPhysicalPrimary as well? Note: Might give unforseen results if the generator isnt PYTHIA
Expand All @@ -354,30 +352,28 @@
}
auto pdgParticle = pdgDatabase->GetParticle(particle.pdgCode());
auto pdgCharge = pdgParticle ? std::abs(pdgParticle->Charge()) : -1.0;
if (jetTypeParticleLevel == static_cast<int>(JetType::charged) && pdgCharge < 3.0) {

Check failure on line 355 in PWGJE/Core/JetFindingUtilities.h

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
continue;
}
if (jetTypeParticleLevel == static_cast<int>(JetType::neutral) && pdgCharge != 0.0) {
continue;
}
if constexpr (jetcandidateutilities::isMcCandidate<U>() && !jetv0utilities::isV0McCandidate<U>()) {
if (candidate != std::nullopt) {
auto cand = candidate.value();
if (cand.mcParticleId() == particle.globalIndex()) {
if (candidate != nullptr) {
if ((*candidate).mcParticleId() == particle.globalIndex()) {
continue;
}
if constexpr (checkIsDaughter) {
auto hfParticle = cand.template mcParticle_as<T>();
auto hfParticle = (*candidate).template mcParticle_as<T>();
if (jetcandidateutilities::isDaughterParticle(hfParticle, particle.globalIndex())) {
continue;
}
}
}
}
if constexpr (jetv0utilities::isV0McTable<U>()) { // note that for V0s the candidate table is given to this function, not a single candidate
if (candidate != std::nullopt) {
auto cands = candidate.value();
for (auto const& cand : cands) {
if (candidate != nullptr) {
for (auto const& cand : (*candidate)) {
if (cand.mcParticleId() == particle.globalIndex()) {
continue;
}
Expand Down
6 changes: 3 additions & 3 deletions PWGJE/JetFinders/jetFinderHF.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ struct JetFinderHFTask {
if constexpr (isEvtWiseSub) {
jetfindingutilities::analyseTracks<U, typename U::iterator>(inputParticles, tracks, trackSelection, trackingEfficiency);
} else {
jetfindingutilities::analyseTracks(inputParticles, tracks, trackSelection, trackingEfficiency, std::optional{candidate});
jetfindingutilities::analyseTracks(inputParticles, tracks, trackSelection, trackingEfficiency, &candidate);
}
jetfindingutilities::findJets(jetFinder, inputParticles, minJetPt, maxJetPt, jetRadius, jetAreaFractionMin, collision, jetsTableInput, constituentsTableInput, registry.get<THn>(HIST("hJet")), fillTHnSparse, true);
}
Expand All @@ -212,9 +212,9 @@ struct JetFinderHFTask {
return;
}
if constexpr (checkIsDaughter) {
jetfindingutilities::analyseParticles<true>(inputParticles, particleSelection, jetTypeParticleLevel, particles, pdgDatabase, std::optional{candidate});
jetfindingutilities::analyseParticles<true>(inputParticles, particleSelection, jetTypeParticleLevel, particles, pdgDatabase, &candidate);
} else {
jetfindingutilities::analyseParticles<false>(inputParticles, particleSelection, jetTypeParticleLevel, particles, pdgDatabase, std::optional{candidate});
jetfindingutilities::analyseParticles<false>(inputParticles, particleSelection, jetTypeParticleLevel, particles, pdgDatabase, &candidate);
}
jetfindingutilities::findJets(jetFinder, inputParticles, minJetPt, maxJetPt, jetRadius, jetAreaFractionMin, collision, jetsTable, constituentsTable, registry.get<THn>(HIST("hJetMCP")), fillTHnSparse, true);
}
Expand Down
2 changes: 1 addition & 1 deletion PWGJE/JetFinders/jetFinderV0.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ struct JetFinderV0Task {
if (!jetfindingutilities::analyseV0s(inputParticles, candidates, candPtMin, candPtMax, candYMin, candYMax, candIndex)) {
return;
}
jetfindingutilities::analyseParticles<true>(inputParticles, particleSelection, jetTypeParticleLevel, particles, pdgDatabase, std::optional{candidates});
jetfindingutilities::analyseParticles<true>(inputParticles, particleSelection, jetTypeParticleLevel, particles, pdgDatabase, &candidates);
jetfindingutilities::findJets(jetFinder, inputParticles, minJetPt, maxJetPt, jetRadius, jetAreaFractionMin, collision, jetsTable, constituentsTable, registry.get<THn>(HIST("hJetMCP")), fillTHnSparse, true);
}

Expand Down
4 changes: 2 additions & 2 deletions PWGJE/TableProducer/eventwiseConstituentSubtractor.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ struct eventWiseConstituentSubtractorTask {
for (auto& candidate : candidates) {
inputParticles.clear();
tracksSubtracted.clear();
jetfindingutilities::analyseTracks(inputParticles, tracks, trackSelection, trackingEfficiency, std::optional{candidate});
jetfindingutilities::analyseTracks(inputParticles, tracks, trackSelection, trackingEfficiency, &candidate);

tracksSubtracted = eventWiseConstituentSubtractor.JetBkgSubUtils::doEventConstSub(inputParticles, candidate.rho(), candidate.rhoM());
for (auto const& trackSubtracted : tracksSubtracted) {
Expand All @@ -105,7 +105,7 @@ struct eventWiseConstituentSubtractorTask {
for (auto& candidate : candidates) {
inputParticles.clear();
tracksSubtracted.clear();
jetfindingutilities::analyseParticles<true>(inputParticles, particleSelection, 1, particles, pdgDatabase, std::optional{candidate}); // currently only works for charged analyses
jetfindingutilities::analyseParticles<true>(inputParticles, particleSelection, 1, particles, pdgDatabase, &candidate); // currently only works for charged analyses

tracksSubtracted = eventWiseConstituentSubtractor.JetBkgSubUtils::doEventConstSub(inputParticles, candidate.rho(), candidate.rhoM());
for (auto const& trackSubtracted : tracksSubtracted) {
Expand Down
20 changes: 10 additions & 10 deletions PWGJE/TableProducer/rhoEstimator.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ struct RhoEstimatorTask {
continue;
}
inputParticles.clear();
jetfindingutilities::analyseTracks(inputParticles, tracks, trackSelection, config.trackingEfficiency, std::optional{candidate});
jetfindingutilities::analyseTracks(inputParticles, tracks, trackSelection, config.trackingEfficiency, &candidate);

auto [rho, rhoM] = bkgSub.estimateRhoAreaMedian(inputParticles, config.doSparse);
rhoD0Table(rho, rhoM);
Expand All @@ -230,7 +230,7 @@ struct RhoEstimatorTask {
{
for (auto& candidate : candidates) {
inputParticles.clear();
jetfindingutilities::analyseParticles<true>(inputParticles, particleSelection, 1, particles, pdgDatabase, std::optional{candidate});
jetfindingutilities::analyseParticles<true>(inputParticles, particleSelection, 1, particles, pdgDatabase, &candidate);

auto [rho, rhoM] = bkgSub.estimateRhoAreaMedian(inputParticles, config.doSparse);
rhoD0McTable(rho, rhoM);
Expand All @@ -246,7 +246,7 @@ struct RhoEstimatorTask {
continue;
}
inputParticles.clear();
jetfindingutilities::analyseTracks(inputParticles, tracks, trackSelection, config.trackingEfficiency, std::optional{candidate});
jetfindingutilities::analyseTracks(inputParticles, tracks, trackSelection, config.trackingEfficiency, &candidate);

auto [rho, rhoM] = bkgSub.estimateRhoAreaMedian(inputParticles, config.doSparse);
rhoDplusTable(rho, rhoM);
Expand All @@ -258,7 +258,7 @@ struct RhoEstimatorTask {
{
for (auto& candidate : candidates) {
inputParticles.clear();
jetfindingutilities::analyseParticles<true>(inputParticles, particleSelection, 1, particles, pdgDatabase, std::optional{candidate});
jetfindingutilities::analyseParticles<true>(inputParticles, particleSelection, 1, particles, pdgDatabase, &candidate);

auto [rho, rhoM] = bkgSub.estimateRhoAreaMedian(inputParticles, config.doSparse);
rhoDplusMcTable(rho, rhoM);
Expand All @@ -274,7 +274,7 @@ struct RhoEstimatorTask {
continue;
}
inputParticles.clear();
jetfindingutilities::analyseTracks(inputParticles, tracks, trackSelection, config.trackingEfficiency, std::optional{candidate});
jetfindingutilities::analyseTracks(inputParticles, tracks, trackSelection, config.trackingEfficiency, &candidate);

auto [rho, rhoM] = bkgSub.estimateRhoAreaMedian(inputParticles, config.doSparse);
rhoLcTable(rho, rhoM);
Expand All @@ -286,7 +286,7 @@ struct RhoEstimatorTask {
{
for (auto& candidate : candidates) {
inputParticles.clear();
jetfindingutilities::analyseParticles<true>(inputParticles, particleSelection, 1, particles, pdgDatabase, std::optional{candidate});
jetfindingutilities::analyseParticles<true>(inputParticles, particleSelection, 1, particles, pdgDatabase, &candidate);

auto [rho, rhoM] = bkgSub.estimateRhoAreaMedian(inputParticles, config.doSparse);
rhoLcMcTable(rho, rhoM);
Expand All @@ -302,7 +302,7 @@ struct RhoEstimatorTask {
continue;
}
inputParticles.clear();
jetfindingutilities::analyseTracks(inputParticles, tracks, trackSelection, config.trackingEfficiency, std::optional{candidate});
jetfindingutilities::analyseTracks(inputParticles, tracks, trackSelection, config.trackingEfficiency, &candidate);

auto [rho, rhoM] = bkgSub.estimateRhoAreaMedian(inputParticles, config.doSparse);
rhoBplusTable(rho, rhoM);
Expand All @@ -314,7 +314,7 @@ struct RhoEstimatorTask {
{
for (auto& candidate : candidates) {
inputParticles.clear();
jetfindingutilities::analyseParticles<true>(inputParticles, particleSelection, 1, particles, pdgDatabase, std::optional{candidate});
jetfindingutilities::analyseParticles<true>(inputParticles, particleSelection, 1, particles, pdgDatabase, &candidate);

auto [rho, rhoM] = bkgSub.estimateRhoAreaMedian(inputParticles, config.doSparse);
rhoBplusMcTable(rho, rhoM);
Expand All @@ -330,7 +330,7 @@ struct RhoEstimatorTask {
continue;
}
inputParticles.clear();
jetfindingutilities::analyseTracks(inputParticles, tracks, trackSelection, config.trackingEfficiency, std::optional{candidate});
jetfindingutilities::analyseTracks(inputParticles, tracks, trackSelection, config.trackingEfficiency, &candidate);

auto [rho, rhoM] = bkgSub.estimateRhoAreaMedian(inputParticles, config.doSparse);
rhoDielectronTable(rho, rhoM);
Expand All @@ -342,7 +342,7 @@ struct RhoEstimatorTask {
{
for (auto& candidate : candidates) {
inputParticles.clear();
jetfindingutilities::analyseParticles<true>(inputParticles, particleSelection, 1, particles, pdgDatabase, std::optional{candidate});
jetfindingutilities::analyseParticles<true>(inputParticles, particleSelection, 1, particles, pdgDatabase, &candidate);

auto [rho, rhoM] = bkgSub.estimateRhoAreaMedian(inputParticles, config.doSparse);
rhoDielectronMcTable(rho, rhoM);
Expand Down
Loading