Skip to content

[PWGJE] removing circular depenency for background subtraction #11090

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 5, 2025
Merged

[PWGJE] removing circular depenency for background subtraction #11090

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
14 changes: 1 addition & 13 deletions PWGJE/TableProducer/rhoEstimator.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,6 @@
Configurable<float> bkgPhiMax{"bkgPhiMax", 99., "maximum phi for determining background density"};
Configurable<bool> doSparse{"doSparse", false, "perfom sparse estimation"};

Configurable<float> thresholdChargedJetPtMin{"thresholdChargedJetPtMin", 0.0, "Minimum charged jet pt to accept event"};
Configurable<float> thresholdNeutralJetPtMin{"thresholdNeutralJetPtMin", 0.0, "Minimum neutral jet pt to accept event"};
Configurable<float> thresholdFullJetPtMin{"thresholdFullJetPtMin", 0.0, "Minimum full jet pt to accept event"};
Configurable<float> thresholdTriggerTrackPtMin{"thresholdTriggerTrackPtMin", 0.0, "Minimum trigger track pt to accept event"};
Configurable<float> thresholdClusterEnergyMin{"thresholdClusterEnergyMin", 0.0, "Minimum cluster energy to accept event"};
Configurable<bool> performTriggerTrackSelection{"performTriggerTrackSelection", false, "only accept trigger tracks that pass one of the track selections"};
Expand Down Expand Up @@ -111,10 +108,10 @@
bkgPhiMax_ = config.bkgPhiMax;
bkgPhiMin_ = config.bkgPhiMin;
if (config.bkgPhiMax > 98.0) {
bkgPhiMax_ = 2.0 * M_PI;

Check failure on line 111 in PWGJE/TableProducer/rhoEstimator.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[pi-multiple-fraction] 

Use multiples/fractions of PI defined in o2::constants::math.

Check failure on line 111 in PWGJE/TableProducer/rhoEstimator.cxx

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.
}
if (config.bkgPhiMin < -98.0) {
bkgPhiMin_ = -2.0 * M_PI;

Check failure on line 114 in PWGJE/TableProducer/rhoEstimator.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[pi-multiple-fraction] 

Use multiples/fractions of PI defined in o2::constants::math.

Check failure on line 114 in PWGJE/TableProducer/rhoEstimator.cxx

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.
}
bkgSub.setPhiMinMax(bkgPhiMin_, bkgPhiMax_);
eventSelectionBits = jetderiveddatautilities::initialiseEventSelectionBits(static_cast<std::string>(config.eventSelections));
Expand All @@ -141,13 +138,7 @@
void processSelectionObjects(T& selectionObjects)
{
float selectionObjectPtMin = 0.0;
if constexpr (std::is_same_v<std::decay_t<T>, aod::ChargedJets>) {
selectionObjectPtMin = config.thresholdChargedJetPtMin;
} else if constexpr (std::is_same_v<std::decay_t<T>, aod::NeutralJets>) {
selectionObjectPtMin = config.thresholdNeutralJetPtMin;
} else if constexpr (std::is_same_v<std::decay_t<T>, aod::FullJets>) {
selectionObjectPtMin = config.thresholdFullJetPtMin;
} else if constexpr (std::is_same_v<std::decay_t<T>, aod::JTracks>) {
if constexpr (std::is_same_v<std::decay_t<T>, aod::JTracks>) {
selectionObjectPtMin = config.thresholdTriggerTrackPtMin;
} else if constexpr (std::is_same_v<std::decay_t<T>, aod::JClusters>) {
selectionObjectPtMin = config.thresholdClusterEnergyMin;
Expand Down Expand Up @@ -182,9 +173,6 @@
}
PROCESS_SWITCH(RhoEstimatorTask, processSetupCollisionSelection, "setup the writing for data based on collisions", false);
PROCESS_SWITCH(RhoEstimatorTask, processSetupEventTriggering, "process software triggers", false);
PROCESS_SWITCH_FULL(RhoEstimatorTask, processSelectionObjects<aod::ChargedJets>, processSelectingChargedJets, "process charged jets", false);
PROCESS_SWITCH_FULL(RhoEstimatorTask, processSelectionObjects<aod::NeutralJets>, processSelectingNeutralJets, "process neutral jets", false);
PROCESS_SWITCH_FULL(RhoEstimatorTask, processSelectionObjects<aod::FullJets>, processSelectingFullJets, "process full jets", false);
PROCESS_SWITCH_FULL(RhoEstimatorTask, processSelectionObjects<aod::JClusters>, processSelectingClusters, "process EMCal clusters", false);
PROCESS_SWITCH_FULL(RhoEstimatorTask, processSelectionObjects<aod::JTracks>, processSelectingTracks, "process high pt tracks", false);

Expand Down Expand Up @@ -224,7 +212,7 @@

void processD0Collisions(aod::JetCollision const& collision, soa::Filtered<aod::JetTracks> const& tracks, aod::CandidatesD0Data const& candidates)
{
for (auto& candidate : candidates) {

Check failure on line 215 in PWGJE/TableProducer/rhoEstimator.cxx

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::selectCollision(collision, eventSelectionBits) || collision.centrality() < config.centralityMin || collision.centrality() >= config.centralityMax || collision.trackOccupancyInTimeRange() > config.trackOccupancyInTimeRangeMax || std::abs(collision.posZ()) > config.vertexZCut) {
rhoD0Table(0.0, 0.0);
continue;
Expand All @@ -240,7 +228,7 @@

void processD0McCollisions(aod::JetMcCollision const&, soa::Filtered<aod::JetParticles> const& particles, aod::CandidatesD0MCP const& candidates)
{
for (auto& candidate : candidates) {

Check failure on line 231 in PWGJE/TableProducer/rhoEstimator.cxx

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.
inputParticles.clear();
jetfindingutilities::analyseParticles<true>(inputParticles, particleSelection, 1, particles, pdgDatabase, std::optional{candidate});

Expand All @@ -252,7 +240,7 @@

void processDplusCollisions(aod::JetCollision const& collision, soa::Filtered<aod::JetTracks> const& tracks, aod::CandidatesDplusData const& candidates)
{
for (auto& candidate : candidates) {

Check failure on line 243 in PWGJE/TableProducer/rhoEstimator.cxx

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::selectCollision(collision, eventSelectionBits) || collision.centrality() < config.centralityMin || collision.centrality() >= config.centralityMax || collision.trackOccupancyInTimeRange() > config.trackOccupancyInTimeRangeMax || std::abs(collision.posZ()) > config.vertexZCut) {
rhoDplusTable(0.0, 0.0);
continue;
Expand All @@ -268,7 +256,7 @@

void processDplusMcCollisions(aod::JetMcCollision const&, soa::Filtered<aod::JetParticles> const& particles, aod::CandidatesDplusMCP const& candidates)
{
for (auto& candidate : candidates) {

Check failure on line 259 in PWGJE/TableProducer/rhoEstimator.cxx

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.
inputParticles.clear();
jetfindingutilities::analyseParticles<true>(inputParticles, particleSelection, 1, particles, pdgDatabase, std::optional{candidate});

Expand All @@ -280,7 +268,7 @@

void processLcCollisions(aod::JetCollision const& collision, soa::Filtered<aod::JetTracks> const& tracks, aod::CandidatesLcData const& candidates)
{
for (auto& candidate : candidates) {

Check failure on line 271 in PWGJE/TableProducer/rhoEstimator.cxx

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::selectCollision(collision, eventSelectionBits) || collision.centrality() < config.centralityMin || collision.centrality() >= config.centralityMax || collision.trackOccupancyInTimeRange() > config.trackOccupancyInTimeRangeMax || std::abs(collision.posZ()) > config.vertexZCut) {
rhoLcTable(0.0, 0.0);
continue;
Expand All @@ -296,7 +284,7 @@

void processLcMcCollisions(aod::JetMcCollision const&, soa::Filtered<aod::JetParticles> const& particles, aod::CandidatesLcMCP const& candidates)
{
for (auto& candidate : candidates) {

Check failure on line 287 in PWGJE/TableProducer/rhoEstimator.cxx

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.
inputParticles.clear();
jetfindingutilities::analyseParticles<true>(inputParticles, particleSelection, 1, particles, pdgDatabase, std::optional{candidate});

Expand Down
3 changes: 1 addition & 2 deletions PWGJE/Tasks/jetSubstructureHFOutput.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -695,11 +695,10 @@ struct JetSubstructureHFOutputTask {
PROCESS_SWITCH(JetSubstructureHFOutputTask, processOutputSubstructureMatchingMC, "jet substructure matching output MC", false);

void processOutputJetsMCD(aod::JetCollisionMCD const& collision,
aod::JetMcCollisions const&,
JetTableMCD const& jets,
soa::Join<CandidateTableMCD, CandidateRhosTable> const& candidates)
{
analyseCharged<false>(collision, jets, candidates, products.collisionOutputTableMCD, products.jetOutputTableMCD, products.jetSubstructureOutputTableMCD, splittingMatchesGeoVecVecMCD, splittingMatchesPtVecVecMCD, splittingMatchesHFVecVecMCD, pairMatchesVecVecMCD, jetMappingMCD, candidateMapping, configs.jetPtMinMCD, collision.mcCollision().weight());
analyseCharged<false>(collision, jets, candidates, products.collisionOutputTableMCD, products.jetOutputTableMCD, products.jetSubstructureOutputTableMCD, splittingMatchesGeoVecVecMCD, splittingMatchesPtVecVecMCD, splittingMatchesHFVecVecMCD, pairMatchesVecVecMCD, jetMappingMCD, candidateMapping, configs.jetPtMinMCD, collision.weight());
}
PROCESS_SWITCH(JetSubstructureHFOutputTask, processOutputJetsMCD, "hf jet substructure output MCD", false);

Expand Down
4 changes: 2 additions & 2 deletions PWGJE/Tasks/jetSubstructureOutput.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,10 +381,10 @@ struct JetSubstructureOutputTask {
}
PROCESS_SWITCH(JetSubstructureOutputTask, processOutputSubstructureMatchingMC, "substructure matching output MC", false);

void processOutputMCD(soa::Join<aod::JetCollisionsMCD, aod::BkgChargedRhos>::iterator const& collision, aod::JetMcCollisions const&,
void processOutputMCD(soa::Join<aod::JetCollisionsMCD, aod::BkgChargedRhos>::iterator const& collision,
soa::Join<aod::ChargedMCDetectorLevelJets, aod::ChargedMCDetectorLevelJetConstituents, aod::CMCDJetSSs> const& jets)
{
analyseCharged<false>(collision, jets, collisionOutputTableMCD, jetOutputTableMCD, jetSubstructureOutputTableMCD, splittingMatchesGeoVecVecMCD, splittingMatchesPtVecVecMCD, splittingMatchesHFVecVecMCD, pairMatchesVecVecMCD, jetMappingMCD, jetPtMinMCD, collision.mcCollision().weight());
analyseCharged<false>(collision, jets, collisionOutputTableMCD, jetOutputTableMCD, jetSubstructureOutputTableMCD, splittingMatchesGeoVecVecMCD, splittingMatchesPtVecVecMCD, splittingMatchesHFVecVecMCD, pairMatchesVecVecMCD, jetMappingMCD, jetPtMinMCD, collision.weight());
}
PROCESS_SWITCH(JetSubstructureOutputTask, processOutputMCD, "jet substructure output MCD", false);

Expand Down
Loading