Skip to content

Commit 345fcd0

Browse files
aimeric-landouaimeric-landou
committed
PWGJE - add skipMBGapEvents to jetBackgroundAnalysis and jetSpectraCharged
1 parent 4e85781 commit 345fcd0

File tree

2 files changed

+33
-25
lines changed

2 files changed

+33
-25
lines changed

‎PWGJE/Tasks/jetBackgroundAnalysis.cxx‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ struct JetBackgroundAnalysisTask {
5555
Configurable<float> centralityMax{"centralityMax", 999.0, "maximum centrality for collisions"};
5656
Configurable<int> trackOccupancyInTimeRangeMax{"trackOccupancyInTimeRangeMax", 999999, "maximum track occupancy of collisions in neighbouring collisions in a given time range; only applied to reconstructed collisions (data and mcd jets), not mc collisions (mcp jets)"};
5757
Configurable<int> trackOccupancyInTimeRangeMin{"trackOccupancyInTimeRangeMin", -999999, "minimum track occupancy of collisions in neighbouring collisions in a given time range; only applied to reconstructed collisions (data and mcd jets), not mc collisions (mcp jets)"};
58+
Configurable<bool> skipMBGapEvents{"skipMBGapEvents", false, "flag to choose to reject min. bias gap events"};
5859

5960
Configurable<float> trackEtaMin{"trackEtaMin", -0.9, "minimum eta acceptance for tracks"};
6061
Configurable<float> trackEtaMax{"trackEtaMax", 0.9, "maximum eta acceptance for tracks"};
@@ -114,12 +115,6 @@ struct JetBackgroundAnalysisTask {
114115
template <typename TCollisions, typename TJets, typename TTracks>
115116
void bkgFluctuationsRandomCone(TCollisions const& collision, TJets const& jets, TTracks const& tracks)
116117
{
117-
if (!jetderiveddatautilities::selectCollision(collision, eventSelectionBits)) {
118-
return;
119-
}
120-
if (collision.trackOccupancyInTimeRange() < trackOccupancyInTimeRangeMin || trackOccupancyInTimeRangeMax < collision.trackOccupancyInTimeRange()) {
121-
return;
122-
}
123118
TRandom3 randomNumber(0);
124119
float randomConeEta = randomNumber.Uniform(trackEtaMin + randomConeR, trackEtaMax - randomConeR);
125120
float randomConePhi = randomNumber.Uniform(0.0, 2 * M_PI);
@@ -201,7 +196,7 @@ struct JetBackgroundAnalysisTask {
201196

202197
void processRho(soa::Filtered<soa::Join<aod::JetCollisions, aod::BkgChargedRhos>>::iterator const& collision, soa::Filtered<aod::JetTracks> const& tracks)
203198
{
204-
if (!jetderiveddatautilities::selectCollision(collision, eventSelectionBits)) {
199+
if (!jetderiveddatautilities::selectCollision(collision, eventSelectionBits, skipMBGapEvents)) {
205200
return;
206201
}
207202
if (collision.trackOccupancyInTimeRange() < trackOccupancyInTimeRangeMin || trackOccupancyInTimeRangeMax < collision.trackOccupancyInTimeRange()) {
@@ -223,12 +218,24 @@ struct JetBackgroundAnalysisTask {
223218

224219
void processBkgFluctuationsData(soa::Filtered<soa::Join<aod::JetCollisions, aod::BkgChargedRhos>>::iterator const& collision, soa::Join<aod::ChargedJets, aod::ChargedJetConstituents> const& jets, soa::Filtered<aod::JetTracks> const& tracks)
225220
{
221+
if (!jetderiveddatautilities::selectCollision(collision, eventSelectionBits, skipMBGapEvents)) {
222+
return;
223+
}
224+
if (collision.trackOccupancyInTimeRange() < trackOccupancyInTimeRangeMin || trackOccupancyInTimeRangeMax < collision.trackOccupancyInTimeRange()) {
225+
return;
226+
}
226227
bkgFluctuationsRandomCone(collision, jets, tracks);
227228
}
228229
PROCESS_SWITCH(JetBackgroundAnalysisTask, processBkgFluctuationsData, "QA for random cone estimation of background fluctuations in data", false);
229230

230231
void processBkgFluctuationsMCD(soa::Filtered<soa::Join<aod::JetCollisions, aod::BkgChargedRhos>>::iterator const& collision, soa::Join<aod::ChargedMCDetectorLevelJets, aod::ChargedMCDetectorLevelJetConstituents> const& jets, soa::Filtered<aod::JetTracks> const& tracks)
231232
{
233+
if (!jetderiveddatautilities::selectCollision(collision, eventSelectionBits, skipMBGapEvents)) {
234+
return;
235+
}
236+
if (collision.trackOccupancyInTimeRange() < trackOccupancyInTimeRangeMin || trackOccupancyInTimeRangeMax < collision.trackOccupancyInTimeRange()) {
237+
return;
238+
}
232239
bkgFluctuationsRandomCone(collision, jets, tracks);
233240
}
234241
PROCESS_SWITCH(JetBackgroundAnalysisTask, processBkgFluctuationsMCD, "QA for random cone estimation of background fluctuations in mcd", false);

‎PWGJE/Tasks/jetSpectraCharged.cxx‎

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ struct JetSpectraCharged {
8282
Configurable<bool> checkPtMatched{"checkPtMatched", false, "0: turn off pT matching, 1: do pT matching"};
8383
Configurable<bool> checkGeoPtMatched{"checkGeoPtMatched", false, "0: turn off geometry and pT matching, 1: do geometry and pT matching"};
8484
Configurable<int> acceptSplitCollisions{"acceptSplitCollisions", 0, "0: only look at mcCollisions that are not split; 1: accept split mcCollisions, 2: accept split mcCollisions but only look at the first reco collision associated with it"};
85+
Configurable<bool> skipMBGapEvents{"skipMBGapEvents", false, "flag to choose to reject min. bias gap events; jet-level rejection can also be applied at the jet finder level for jets only, here rejection is applied for collision and track process functions for the first time, and on jets in case it was set to false at the jet finder level"};
8586

8687
std::vector<int> eventSelectionBits;
8788
int trackSelection = -1;
@@ -464,7 +465,7 @@ struct JetSpectraCharged {
464465
void processQC(soa::Filtered<aod::JetCollisions>::iterator const& collision,
465466
soa::Filtered<soa::Join<aod::JetTracks, aod::JTrackExtras>> const& tracks)
466467
{
467-
if (!jetderiveddatautilities::selectCollision(collision, eventSelectionBits)) {
468+
if (!jetderiveddatautilities::selectCollision(collision, eventSelectionBits, skipMBGapEvents)) {
468469
return;
469470
}
470471
if (collision.trackOccupancyInTimeRange() < trackOccupancyInTimeRangeMin || trackOccupancyInTimeRangeMax < collision.trackOccupancyInTimeRange()) {
@@ -484,7 +485,7 @@ struct JetSpectraCharged {
484485
soa::Filtered<soa::Join<aod::JetTracks, aod::JTrackExtras>> const& tracks)
485486
{
486487
float eventWeight = collision.mcCollision().weight();
487-
if (!jetderiveddatautilities::selectCollision(collision, eventSelectionBits)) {
488+
if (!jetderiveddatautilities::selectCollision(collision, eventSelectionBits, skipMBGapEvents)) {
488489
return;
489490
}
490491
if (collision.trackOccupancyInTimeRange() < trackOccupancyInTimeRangeMin || trackOccupancyInTimeRangeMax < collision.trackOccupancyInTimeRange()) {
@@ -502,7 +503,7 @@ struct JetSpectraCharged {
502503
void processCollisions(soa::Filtered<aod::JetCollisions>::iterator const& collision)
503504
{
504505
registry.fill(HIST("h_collisions"), 0.5);
505-
if (!jetderiveddatautilities::selectCollision(collision, eventSelectionBits)) {
506+
if (!jetderiveddatautilities::selectCollision(collision, eventSelectionBits, skipMBGapEvents)) {
506507
return;
507508
}
508509
registry.fill(HIST("h_collisions"), 1.5);
@@ -521,7 +522,7 @@ struct JetSpectraCharged {
521522
float eventWeight = collision.mcCollision().weight();
522523
registry.fill(HIST("h_collisions"), 0.5);
523524
registry.fill(HIST("h_collisions_weighted"), 0.5, eventWeight);
524-
if (!jetderiveddatautilities::selectCollision(collision, eventSelectionBits)) {
525+
if (!jetderiveddatautilities::selectCollision(collision, eventSelectionBits, skipMBGapEvents)) {
525526
return;
526527
}
527528
registry.fill(HIST("h_collisions"), 1.5);
@@ -540,7 +541,7 @@ struct JetSpectraCharged {
540541
soa::Join<aod::ChargedJets, aod::ChargedJetConstituents> const& jets,
541542
aod::JetTracks const&)
542543
{
543-
if (!jetderiveddatautilities::selectCollision(collision, eventSelectionBits)) {
544+
if (!jetderiveddatautilities::selectCollision(collision, eventSelectionBits, skipMBGapEvents)) {
544545
return;
545546
}
546547
if (collision.trackOccupancyInTimeRange() < trackOccupancyInTimeRangeMin || trackOccupancyInTimeRangeMax < collision.trackOccupancyInTimeRange()) {
@@ -562,7 +563,7 @@ struct JetSpectraCharged {
562563
soa::Join<aod::ChargedMCDetectorLevelJets, aod::ChargedMCDetectorLevelJetConstituents> const& jets,
563564
aod::JetTracks const&)
564565
{
565-
if (!jetderiveddatautilities::selectCollision(collision, eventSelectionBits)) {
566+
if (!jetderiveddatautilities::selectCollision(collision, eventSelectionBits, skipMBGapEvents)) {
566567
return;
567568
}
568569
if (collision.trackOccupancyInTimeRange() < trackOccupancyInTimeRangeMin || trackOccupancyInTimeRangeMax < collision.trackOccupancyInTimeRange()) {
@@ -584,7 +585,7 @@ struct JetSpectraCharged {
584585
soa::Join<aod::ChargedJets, aod::ChargedJetConstituents> const& jets,
585586
aod::JetTracks const&)
586587
{
587-
if (!jetderiveddatautilities::selectCollision(collision, eventSelectionBits)) {
588+
if (!jetderiveddatautilities::selectCollision(collision, eventSelectionBits, skipMBGapEvents)) {
588589
return;
589590
}
590591
if (collision.trackOccupancyInTimeRange() < trackOccupancyInTimeRangeMin || trackOccupancyInTimeRangeMax < collision.trackOccupancyInTimeRange()) {
@@ -606,7 +607,7 @@ struct JetSpectraCharged {
606607
soa::Join<aod::ChargedMCDetectorLevelJets, aod::ChargedMCDetectorLevelJetConstituents> const& jets,
607608
aod::JetTracks const&)
608609
{
609-
if (!jetderiveddatautilities::selectCollision(collision, eventSelectionBits)) {
610+
if (!jetderiveddatautilities::selectCollision(collision, eventSelectionBits, skipMBGapEvents)) {
610611
return;
611612
}
612613
if (collision.trackOccupancyInTimeRange() < trackOccupancyInTimeRangeMin || trackOccupancyInTimeRangeMax < collision.trackOccupancyInTimeRange()) {
@@ -628,7 +629,7 @@ struct JetSpectraCharged {
628629
soa::Join<aod::ChargedMCDetectorLevelJets, aod::ChargedMCDetectorLevelJetConstituents, aod::ChargedMCDetectorLevelJetEventWeights> const& jets,
629630
aod::JetTracks const&)
630631
{
631-
if (!jetderiveddatautilities::selectCollision(collision, eventSelectionBits)) {
632+
if (!jetderiveddatautilities::selectCollision(collision, eventSelectionBits, skipMBGapEvents)) {
632633
return;
633634
}
634635
if (collision.trackOccupancyInTimeRange() < trackOccupancyInTimeRangeMin || trackOccupancyInTimeRangeMax < collision.trackOccupancyInTimeRange()) {
@@ -676,7 +677,7 @@ struct JetSpectraCharged {
676677
bool centralityIsGood = false;
677678
bool occupancyIsGood = false;
678679
if (acceptSplitCollisions == 2) {
679-
if (jetderiveddatautilities::selectCollision(collisions.begin(), eventSelectionBits)) {
680+
if (jetderiveddatautilities::selectCollision(collisions.begin(), eventSelectionBits, skipMBGapEvents)) {
680681
hasSel8Coll = true;
681682
}
682683
if ((centralityMin < collisions.begin().centrality()) && (collisions.begin().centrality() < centralityMax)) {
@@ -687,7 +688,7 @@ struct JetSpectraCharged {
687688
}
688689
} else {
689690
for (auto const& collision : collisions) {
690-
if (jetderiveddatautilities::selectCollision(collision, eventSelectionBits)) {
691+
if (jetderiveddatautilities::selectCollision(collision, eventSelectionBits, skipMBGapEvents)) {
691692
hasSel8Coll = true;
692693
}
693694
if ((centralityMin < collision.centrality()) && (collision.centrality() < centralityMax)) {
@@ -744,7 +745,7 @@ struct JetSpectraCharged {
744745
bool centralityIsGood = false;
745746
bool occupancyIsGood = false;
746747
for (auto const& collision : collisions) {
747-
if (jetderiveddatautilities::selectCollision(collision, eventSelectionBits)) {
748+
if (jetderiveddatautilities::selectCollision(collision, eventSelectionBits, skipMBGapEvents)) {
748749
hasSel8Coll = true;
749750
}
750751
if ((centralityMin < collision.centrality()) && (collision.centrality() < centralityMax)) {
@@ -797,7 +798,7 @@ struct JetSpectraCharged {
797798

798799
bool hasSel8Coll = false;
799800
for (auto const& collision : collisions) {
800-
if (jetderiveddatautilities::selectCollision(collision, eventSelectionBits)) {
801+
if (jetderiveddatautilities::selectCollision(collision, eventSelectionBits, skipMBGapEvents)) {
801802
hasSel8Coll = true;
802803
}
803804
}
@@ -831,7 +832,7 @@ struct JetSpectraCharged {
831832
soa::Join<aod::ChargedEventWiseSubtractedJets, aod::ChargedEventWiseSubtractedJetConstituents> const& jets,
832833
aod::JetTracksSub const&)
833834
{
834-
if (!jetderiveddatautilities::selectCollision(collision, eventSelectionBits)) {
835+
if (!jetderiveddatautilities::selectCollision(collision, eventSelectionBits, skipMBGapEvents)) {
835836
return;
836837
}
837838
if (collision.trackOccupancyInTimeRange() < trackOccupancyInTimeRangeMin || trackOccupancyInTimeRangeMax < collision.trackOccupancyInTimeRange()) {
@@ -853,7 +854,7 @@ struct JetSpectraCharged {
853854
soa::Join<aod::ChargedMCDetectorLevelEventWiseSubtractedJets, aod::ChargedMCDetectorLevelEventWiseSubtractedJetConstituents> const& jets,
854855
aod::JetTracksSub const&)
855856
{
856-
if (!jetderiveddatautilities::selectCollision(collision, eventSelectionBits)) {
857+
if (!jetderiveddatautilities::selectCollision(collision, eventSelectionBits, skipMBGapEvents)) {
857858
return;
858859
}
859860
if (collision.trackOccupancyInTimeRange() < trackOccupancyInTimeRangeMin || trackOccupancyInTimeRangeMax < collision.trackOccupancyInTimeRange()) {
@@ -876,7 +877,7 @@ struct JetSpectraCharged {
876877
ChargedMCPMatchedJets const&,
877878
aod::JetTracks const&, aod::JetParticles const&)
878879
{
879-
if (!jetderiveddatautilities::selectCollision(collision, eventSelectionBits)) {
880+
if (!jetderiveddatautilities::selectCollision(collision, eventSelectionBits, skipMBGapEvents)) {
880881
return;
881882
}
882883
if (collision.trackOccupancyInTimeRange() < trackOccupancyInTimeRangeMin || trackOccupancyInTimeRangeMax < collision.trackOccupancyInTimeRange()) {
@@ -900,7 +901,7 @@ struct JetSpectraCharged {
900901
ChargedMCPMatchedJetsWeighted const&,
901902
aod::JetTracks const&, aod::JetParticles const&)
902903
{
903-
if (!jetderiveddatautilities::selectCollision(collision, eventSelectionBits)) {
904+
if (!jetderiveddatautilities::selectCollision(collision, eventSelectionBits, skipMBGapEvents)) {
904905
return;
905906
}
906907
if (collision.trackOccupancyInTimeRange() < trackOccupancyInTimeRangeMin || trackOccupancyInTimeRangeMax < collision.trackOccupancyInTimeRange()) {
@@ -937,7 +938,7 @@ struct JetSpectraCharged {
937938
registry.fill(HIST("h_mc_rho_matched"), mcrho);
938939
for (const auto& collision : collisions) {
939940
registry.fill(HIST("h_mcd_events_matched"), 0.5);
940-
if (!jetderiveddatautilities::selectCollision(collision, eventSelectionBits) || !(std::abs(collision.posZ()) < vertexZCut)) {
941+
if (!jetderiveddatautilities::selectCollision(collision, eventSelectionBits, skipMBGapEvents) || !(std::abs(collision.posZ()) < vertexZCut)) {
941942
continue;
942943
}
943944
registry.fill(HIST("h_mcd_events_matched"), 1.5);

0 commit comments

Comments
 (0)