From bdc015f48838699c1a9dd76e34f59f2ff3036140 Mon Sep 17 00:00:00 2001 From: jaimenorman Date: Tue, 14 Jan 2025 16:10:00 +0100 Subject: [PATCH 1/2] add MB gap event rejection for tracks and collisions --- PWGJE/Tasks/jetFinderFullQA.cxx | 13 +++++++++++-- PWGJE/Tasks/jetFinderHFQA.cxx | 22 ++++++++++++++++++++++ PWGJE/Tasks/jetFinderQA.cxx | 19 +++++++++++++++++++ 3 files changed, 52 insertions(+), 2 deletions(-) diff --git a/PWGJE/Tasks/jetFinderFullQA.cxx b/PWGJE/Tasks/jetFinderFullQA.cxx index 3899a335d4b..bedb91838c8 100644 --- a/PWGJE/Tasks/jetFinderFullQA.cxx +++ b/PWGJE/Tasks/jetFinderFullQA.cxx @@ -74,6 +74,7 @@ struct JetFinderFullQATask { Configurable pTHatMaxMCD{"pTHatMaxMCD", 999.0, "maximum fraction of hard scattering for jet acceptance in detector MC"}; Configurable pTHatMaxMCP{"pTHatMaxMCP", 999.0, "maximum fraction of hard scattering for jet acceptance in particle MC"}; Configurable pTHatExponent{"pTHatExponent", 6.0, "exponent of the event weight for the calculation of pTHat"}; + Configurable skipMBGapEvents{"skipMBGapEvents", false, "flag to choose to reject min. bias gap events; jet-level rejection applied at the jet finder level, here rejection is applied for collision and track process functions"}; std::vector filledJetR; std::vector jetRadiiValues; @@ -566,7 +567,9 @@ struct JetFinderFullQATask { void processMCCollisionsWeighted(aod::JetMcCollision const& collision) { - + if(skipMBGapEvents && collision.subGeneratorId() == jetderiveddatautilities::JCollisionSubGeneratorId::mbGap) { + return; + } registry.fill(HIST("h_collision_eventweight_part"), collision.weight()); } PROCESS_SWITCH(JetFinderFullQATask, processMCCollisionsWeighted, "collision QA for weighted events", false); @@ -575,6 +578,9 @@ struct JetFinderFullQATask { soa::Filtered const& tracks, soa::Filtered const& clusters) { + if(skipMBGapEvents && collision.subGeneratorId() == jetderiveddatautilities::JCollisionSubGeneratorId::mbGap) { + return; + } registry.fill(HIST("h_collisions"), 0.5); registry.fill(HIST("h_centrality_collisions"), collision.centrality(), 0.5); if (!jetderiveddatautilities::eventEMCAL(collision)) { @@ -586,12 +592,15 @@ struct JetFinderFullQATask { } PROCESS_SWITCH(JetFinderFullQATask, processTracks, "QA for charged tracks", false); - void processTracksWeighted(soa::Join::iterator const& collision, + void processTracksWeighted(soa::Join::iterator const& collision, aod::JMcCollisions const&, soa::Filtered const& tracks, soa::Filtered const& clusters) { float eventWeight = collision.mcCollision().weight(); + if(skipMBGapEvents && collision.subGeneratorId() == jetderiveddatautilities::JCollisionSubGeneratorId::mbGap) { + return; + } registry.fill(HIST("h_collisions"), 0.5); registry.fill(HIST("h_collisions_weighted"), 0.5, eventWeight); if (!jetderiveddatautilities::eventEMCAL(collision)) { diff --git a/PWGJE/Tasks/jetFinderHFQA.cxx b/PWGJE/Tasks/jetFinderHFQA.cxx index 36cf4d149d8..eb49afc8c42 100644 --- a/PWGJE/Tasks/jetFinderHFQA.cxx +++ b/PWGJE/Tasks/jetFinderHFQA.cxx @@ -69,6 +69,7 @@ struct JetFinderHFQATask { Configurable pTHatMaxMCP{"pTHatMaxMCP", 999.0, "maximum fraction of hard scattering for jet acceptance in particle MC"}; Configurable pTHatExponent{"pTHatExponent", 6.0, "exponent of the event weight for the calculation of pTHat"}; Configurable randomConeR{"randomConeR", 0.4, "size of random Cone for estimating background fluctuations"}; + Configurable skipMBGapEvents{"skipMBGapEvents", false, "flag to choose to reject min. bias gap events; jet-level rejection applied at the jet finder level, here rejection is applied for collision and track process functions"}; HfHelper hfHelper; std::vector filledJetR_Both; @@ -1173,6 +1174,9 @@ struct JetFinderHFQATask { void processMCCollisionsWeighted(aod::JetMcCollision const& collision) { + if(skipMBGapEvents && collision.subGeneratorId() == jetderiveddatautilities::JCollisionSubGeneratorId::mbGap) { + return; + } registry.fill(HIST("h_collision_eventweight_part"), collision.weight()); } PROCESS_SWITCH(JetFinderHFQATask, processMCCollisionsWeighted, "collision QA for weighted events", false); @@ -1463,6 +1467,9 @@ struct JetFinderHFQATask { void processTracks(soa::Filtered::iterator const& collision, soa::Filtered const& tracks) { + if(skipMBGapEvents && collision.subGeneratorId() == jetderiveddatautilities::JCollisionSubGeneratorId::mbGap) { + return; + } registry.fill(HIST("h_collisions"), 0.5); registry.fill(HIST("h2_centrality_collisions"), collision.centrality(), 0.5); if (!jetderiveddatautilities::selectCollision(collision, eventSelection)) { @@ -1479,6 +1486,9 @@ struct JetFinderHFQATask { soa::Filtered const& tracks) { float eventWeight = collision.mcCollision().weight(); + if(skipMBGapEvents && collision.subGeneratorId() == jetderiveddatautilities::JCollisionSubGeneratorId::mbGap) { + return; + } registry.fill(HIST("h_collisions"), 0.5); registry.fill(HIST("h_collisions_weighted"), 0.5, eventWeight); if (!jetderiveddatautilities::selectCollision(collision, eventSelection)) { @@ -1494,6 +1504,9 @@ struct JetFinderHFQATask { CandidateTableData const& candidates, soa::Filtered const& tracks) { + if(skipMBGapEvents && collision.subGeneratorId() == jetderiveddatautilities::JCollisionSubGeneratorId::mbGap) { + return; + } if (!jetderiveddatautilities::selectCollision(collision, eventSelection)) { return; } @@ -1511,6 +1524,9 @@ struct JetFinderHFQATask { void processRho(aod::JetCollision const& collision, soa::Join const& candidates, soa::Filtered const& tracks) { + if(skipMBGapEvents && collision.subGeneratorId() == jetderiveddatautilities::JCollisionSubGeneratorId::mbGap) { + return; + } if (!jetderiveddatautilities::selectCollision(collision, eventSelection)) { return; } @@ -1539,6 +1555,9 @@ struct JetFinderHFQATask { void processRandomConeMCD(soa::Filtered::iterator const& collision, JetTableMCDJoined const& jets, soa::Join const& candidates, soa::Filtered const& tracks) { + if(skipMBGapEvents && collision.subGeneratorId() == jetderiveddatautilities::JCollisionSubGeneratorId::mbGap) { + return; + } randomCone(collision, jets, candidates, tracks); } PROCESS_SWITCH(JetFinderHFQATask, processRandomConeMCD, "QA for random cone estimation of background fluctuations in mcd", false); @@ -1546,6 +1565,9 @@ struct JetFinderHFQATask { void processCandidates(soa::Filtered::iterator const& collision, CandidateTableData const& candidates) { + if(skipMBGapEvents && collision.subGeneratorId() == jetderiveddatautilities::JCollisionSubGeneratorId::mbGap) { + return; + } for (auto const& candidate : candidates) { registry.fill(HIST("h_candidate_invmass"), jetcandidateutilities::getCandidateInvariantMass(candidate)); registry.fill(HIST("h_candidate_pt"), candidate.pt()); diff --git a/PWGJE/Tasks/jetFinderQA.cxx b/PWGJE/Tasks/jetFinderQA.cxx index 67806db1115..7884c5d7341 100644 --- a/PWGJE/Tasks/jetFinderQA.cxx +++ b/PWGJE/Tasks/jetFinderQA.cxx @@ -72,6 +72,7 @@ struct JetFinderQATask { Configurable checkMcCollisionIsMatched{"checkMcCollisionIsMatched", false, "0: count whole MCcollisions, 1: select MCcollisions which only have their correspond collisions"}; Configurable trackOccupancyInTimeRangeMax{"trackOccupancyInTimeRangeMax", 999999, "maximum occupancy of tracks in neighbouring collisions in a given time range; only applied to reconstructed collisions (data and mcd jets), not mc collisions (mcp jets)"}; Configurable trackOccupancyInTimeRangeMin{"trackOccupancyInTimeRangeMin", -999999, "minimum occupancy of tracks in neighbouring collisions in a given time range; only applied to reconstructed collisions (data and mcd jets), not mc collisions (mcp jets)"}; + Configurable skipMBGapEvents{"skipMBGapEvents", false, "flag to choose to reject min. bias gap events; jet-level rejection applied at the jet finder level, here rejection is applied for collision and track process functions"}; std::vector filledJetR_Both; std::vector filledJetR_Low; @@ -924,6 +925,9 @@ struct JetFinderQATask { void processMCCollisionsWeighted(aod::JetMcCollision const& collision) { + if(skipMBGapEvents && collision.subGeneratorId() == jetderiveddatautilities::JCollisionSubGeneratorId::mbGap) { + return; + } registry.fill(HIST("h_collision_eventweight_part"), collision.weight()); } PROCESS_SWITCH(JetFinderQATask, processMCCollisionsWeighted, "collision QA for weighted events", false); @@ -1057,6 +1061,9 @@ struct JetFinderQATask { void processTracks(soa::Filtered::iterator const& collision, soa::Filtered> const& tracks) { + if(skipMBGapEvents && collision.subGeneratorId() == jetderiveddatautilities::JCollisionSubGeneratorId::mbGap) { + return; + } registry.fill(HIST("h_collisions"), 0.5); registry.fill(HIST("h2_centrality_collisions"), collision.centrality(), 0.5); if (!jetderiveddatautilities::selectCollision(collision, eventSelection)) { @@ -1078,6 +1085,9 @@ struct JetFinderQATask { soa::Filtered> const& tracks) { float eventWeight = collision.mcCollision().weight(); + if(skipMBGapEvents && collision.subGeneratorId() == jetderiveddatautilities::JCollisionSubGeneratorId::mbGap) { + return; + } registry.fill(HIST("h_collisions"), 0.5); registry.fill(HIST("h_collisions_weighted"), 0.5, eventWeight); if (!jetderiveddatautilities::selectCollision(collision, eventSelection)) { @@ -1097,6 +1107,9 @@ struct JetFinderQATask { void processTracksSub(soa::Filtered::iterator const& collision, soa::Filtered const& tracks) { + if(skipMBGapEvents && collision.subGeneratorId() == jetderiveddatautilities::JCollisionSubGeneratorId::mbGap) { + return; + } if (!jetderiveddatautilities::selectCollision(collision, eventSelection)) { return; } @@ -1113,6 +1126,9 @@ struct JetFinderQATask { void processRho(soa::Filtered>::iterator const& collision, soa::Filtered const& tracks) { + if(skipMBGapEvents && collision.subGeneratorId() == jetderiveddatautilities::JCollisionSubGeneratorId::mbGap) { + return; + } if (!jetderiveddatautilities::selectCollision(collision, eventSelection)) { return; } @@ -1141,6 +1157,9 @@ struct JetFinderQATask { void processRandomConeMCD(soa::Filtered>::iterator const& collision, soa::Join const& jets, soa::Filtered const& tracks) { + if(skipMBGapEvents && collision.subGeneratorId() == jetderiveddatautilities::JCollisionSubGeneratorId::mbGap) { + return; + } randomCone(collision, jets, tracks); } PROCESS_SWITCH(JetFinderQATask, processRandomConeMCD, "QA for random cone estimation of background fluctuations in mcd", false); From 47a44f4cc895dabd605c71f1dc32b53fd5ad607b Mon Sep 17 00:00:00 2001 From: ALICE Action Bot Date: Thu, 23 Jan 2025 15:41:24 +0000 Subject: [PATCH 2/2] Please consider the following formatting changes --- PWGJE/Tasks/jetFinderFullQA.cxx | 6 +++--- PWGJE/Tasks/jetFinderHFQA.cxx | 14 +++++++------- PWGJE/Tasks/jetFinderQA.cxx | 12 ++++++------ 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/PWGJE/Tasks/jetFinderFullQA.cxx b/PWGJE/Tasks/jetFinderFullQA.cxx index bedb91838c8..d2fa3b5c53f 100644 --- a/PWGJE/Tasks/jetFinderFullQA.cxx +++ b/PWGJE/Tasks/jetFinderFullQA.cxx @@ -567,7 +567,7 @@ struct JetFinderFullQATask { void processMCCollisionsWeighted(aod::JetMcCollision const& collision) { - if(skipMBGapEvents && collision.subGeneratorId() == jetderiveddatautilities::JCollisionSubGeneratorId::mbGap) { + if (skipMBGapEvents && collision.subGeneratorId() == jetderiveddatautilities::JCollisionSubGeneratorId::mbGap) { return; } registry.fill(HIST("h_collision_eventweight_part"), collision.weight()); @@ -578,7 +578,7 @@ struct JetFinderFullQATask { soa::Filtered const& tracks, soa::Filtered const& clusters) { - if(skipMBGapEvents && collision.subGeneratorId() == jetderiveddatautilities::JCollisionSubGeneratorId::mbGap) { + if (skipMBGapEvents && collision.subGeneratorId() == jetderiveddatautilities::JCollisionSubGeneratorId::mbGap) { return; } registry.fill(HIST("h_collisions"), 0.5); @@ -598,7 +598,7 @@ struct JetFinderFullQATask { soa::Filtered const& clusters) { float eventWeight = collision.mcCollision().weight(); - if(skipMBGapEvents && collision.subGeneratorId() == jetderiveddatautilities::JCollisionSubGeneratorId::mbGap) { + if (skipMBGapEvents && collision.subGeneratorId() == jetderiveddatautilities::JCollisionSubGeneratorId::mbGap) { return; } registry.fill(HIST("h_collisions"), 0.5); diff --git a/PWGJE/Tasks/jetFinderHFQA.cxx b/PWGJE/Tasks/jetFinderHFQA.cxx index eb49afc8c42..ae37cc827b6 100644 --- a/PWGJE/Tasks/jetFinderHFQA.cxx +++ b/PWGJE/Tasks/jetFinderHFQA.cxx @@ -1174,7 +1174,7 @@ struct JetFinderHFQATask { void processMCCollisionsWeighted(aod::JetMcCollision const& collision) { - if(skipMBGapEvents && collision.subGeneratorId() == jetderiveddatautilities::JCollisionSubGeneratorId::mbGap) { + if (skipMBGapEvents && collision.subGeneratorId() == jetderiveddatautilities::JCollisionSubGeneratorId::mbGap) { return; } registry.fill(HIST("h_collision_eventweight_part"), collision.weight()); @@ -1467,7 +1467,7 @@ struct JetFinderHFQATask { void processTracks(soa::Filtered::iterator const& collision, soa::Filtered const& tracks) { - if(skipMBGapEvents && collision.subGeneratorId() == jetderiveddatautilities::JCollisionSubGeneratorId::mbGap) { + if (skipMBGapEvents && collision.subGeneratorId() == jetderiveddatautilities::JCollisionSubGeneratorId::mbGap) { return; } registry.fill(HIST("h_collisions"), 0.5); @@ -1486,7 +1486,7 @@ struct JetFinderHFQATask { soa::Filtered const& tracks) { float eventWeight = collision.mcCollision().weight(); - if(skipMBGapEvents && collision.subGeneratorId() == jetderiveddatautilities::JCollisionSubGeneratorId::mbGap) { + if (skipMBGapEvents && collision.subGeneratorId() == jetderiveddatautilities::JCollisionSubGeneratorId::mbGap) { return; } registry.fill(HIST("h_collisions"), 0.5); @@ -1504,7 +1504,7 @@ struct JetFinderHFQATask { CandidateTableData const& candidates, soa::Filtered const& tracks) { - if(skipMBGapEvents && collision.subGeneratorId() == jetderiveddatautilities::JCollisionSubGeneratorId::mbGap) { + if (skipMBGapEvents && collision.subGeneratorId() == jetderiveddatautilities::JCollisionSubGeneratorId::mbGap) { return; } if (!jetderiveddatautilities::selectCollision(collision, eventSelection)) { @@ -1524,7 +1524,7 @@ struct JetFinderHFQATask { void processRho(aod::JetCollision const& collision, soa::Join const& candidates, soa::Filtered const& tracks) { - if(skipMBGapEvents && collision.subGeneratorId() == jetderiveddatautilities::JCollisionSubGeneratorId::mbGap) { + if (skipMBGapEvents && collision.subGeneratorId() == jetderiveddatautilities::JCollisionSubGeneratorId::mbGap) { return; } if (!jetderiveddatautilities::selectCollision(collision, eventSelection)) { @@ -1555,7 +1555,7 @@ struct JetFinderHFQATask { void processRandomConeMCD(soa::Filtered::iterator const& collision, JetTableMCDJoined const& jets, soa::Join const& candidates, soa::Filtered const& tracks) { - if(skipMBGapEvents && collision.subGeneratorId() == jetderiveddatautilities::JCollisionSubGeneratorId::mbGap) { + if (skipMBGapEvents && collision.subGeneratorId() == jetderiveddatautilities::JCollisionSubGeneratorId::mbGap) { return; } randomCone(collision, jets, candidates, tracks); @@ -1565,7 +1565,7 @@ struct JetFinderHFQATask { void processCandidates(soa::Filtered::iterator const& collision, CandidateTableData const& candidates) { - if(skipMBGapEvents && collision.subGeneratorId() == jetderiveddatautilities::JCollisionSubGeneratorId::mbGap) { + if (skipMBGapEvents && collision.subGeneratorId() == jetderiveddatautilities::JCollisionSubGeneratorId::mbGap) { return; } for (auto const& candidate : candidates) { diff --git a/PWGJE/Tasks/jetFinderQA.cxx b/PWGJE/Tasks/jetFinderQA.cxx index 7884c5d7341..cdfb33e2acb 100644 --- a/PWGJE/Tasks/jetFinderQA.cxx +++ b/PWGJE/Tasks/jetFinderQA.cxx @@ -925,7 +925,7 @@ struct JetFinderQATask { void processMCCollisionsWeighted(aod::JetMcCollision const& collision) { - if(skipMBGapEvents && collision.subGeneratorId() == jetderiveddatautilities::JCollisionSubGeneratorId::mbGap) { + if (skipMBGapEvents && collision.subGeneratorId() == jetderiveddatautilities::JCollisionSubGeneratorId::mbGap) { return; } registry.fill(HIST("h_collision_eventweight_part"), collision.weight()); @@ -1061,7 +1061,7 @@ struct JetFinderQATask { void processTracks(soa::Filtered::iterator const& collision, soa::Filtered> const& tracks) { - if(skipMBGapEvents && collision.subGeneratorId() == jetderiveddatautilities::JCollisionSubGeneratorId::mbGap) { + if (skipMBGapEvents && collision.subGeneratorId() == jetderiveddatautilities::JCollisionSubGeneratorId::mbGap) { return; } registry.fill(HIST("h_collisions"), 0.5); @@ -1085,7 +1085,7 @@ struct JetFinderQATask { soa::Filtered> const& tracks) { float eventWeight = collision.mcCollision().weight(); - if(skipMBGapEvents && collision.subGeneratorId() == jetderiveddatautilities::JCollisionSubGeneratorId::mbGap) { + if (skipMBGapEvents && collision.subGeneratorId() == jetderiveddatautilities::JCollisionSubGeneratorId::mbGap) { return; } registry.fill(HIST("h_collisions"), 0.5); @@ -1107,7 +1107,7 @@ struct JetFinderQATask { void processTracksSub(soa::Filtered::iterator const& collision, soa::Filtered const& tracks) { - if(skipMBGapEvents && collision.subGeneratorId() == jetderiveddatautilities::JCollisionSubGeneratorId::mbGap) { + if (skipMBGapEvents && collision.subGeneratorId() == jetderiveddatautilities::JCollisionSubGeneratorId::mbGap) { return; } if (!jetderiveddatautilities::selectCollision(collision, eventSelection)) { @@ -1126,7 +1126,7 @@ struct JetFinderQATask { void processRho(soa::Filtered>::iterator const& collision, soa::Filtered const& tracks) { - if(skipMBGapEvents && collision.subGeneratorId() == jetderiveddatautilities::JCollisionSubGeneratorId::mbGap) { + if (skipMBGapEvents && collision.subGeneratorId() == jetderiveddatautilities::JCollisionSubGeneratorId::mbGap) { return; } if (!jetderiveddatautilities::selectCollision(collision, eventSelection)) { @@ -1157,7 +1157,7 @@ struct JetFinderQATask { void processRandomConeMCD(soa::Filtered>::iterator const& collision, soa::Join const& jets, soa::Filtered const& tracks) { - if(skipMBGapEvents && collision.subGeneratorId() == jetderiveddatautilities::JCollisionSubGeneratorId::mbGap) { + if (skipMBGapEvents && collision.subGeneratorId() == jetderiveddatautilities::JCollisionSubGeneratorId::mbGap) { return; } randomCone(collision, jets, tracks);