Skip to content

Commit 7f269be

Browse files
gianniliverarogianniliveraro
authored
[PWGLF] Removing event selection bit (#9561)
1 parent 8c3a36c commit 7f269be

File tree

2 files changed

+18
-31
lines changed

2 files changed

+18
-31
lines changed

‎PWGLF/TableProducer/Strangeness/sigma0builder.cxx‎

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ struct sigma0builder {
172172
void init(InitContext const&)
173173
{
174174
// Event Counters
175-
histos.add("hEventSelection", "hEventSelection", kTH1F, {{20, -0.5f, +19.5f}});
175+
histos.add("hEventSelection", "hEventSelection", kTH1F, {{20, -0.5f, +18.5f}});
176176
histos.get<TH1>(HIST("hEventSelection"))->GetXaxis()->SetBinLabel(1, "All collisions");
177177
histos.get<TH1>(HIST("hEventSelection"))->GetXaxis()->SetBinLabel(2, "sel8 cut");
178178
histos.get<TH1>(HIST("hEventSelection"))->GetXaxis()->SetBinLabel(3, "kIsTriggerTVX");
@@ -187,15 +187,14 @@ struct sigma0builder {
187187
histos.get<TH1>(HIST("hEventSelection"))->GetXaxis()->SetBinLabel(12, "kNoCollInTimeRangeStd");
188188
histos.get<TH1>(HIST("hEventSelection"))->GetXaxis()->SetBinLabel(13, "kNoCollInTimeRangeStrict");
189189
histos.get<TH1>(HIST("hEventSelection"))->GetXaxis()->SetBinLabel(14, "kNoCollInTimeRangeNarrow");
190-
histos.get<TH1>(HIST("hEventSelection"))->GetXaxis()->SetBinLabel(15, "kNoCollInTimeRangeVzDep");
191-
histos.get<TH1>(HIST("hEventSelection"))->GetXaxis()->SetBinLabel(16, "kNoCollInRofStd");
192-
histos.get<TH1>(HIST("hEventSelection"))->GetXaxis()->SetBinLabel(17, "kNoCollInRofStrict");
190+
histos.get<TH1>(HIST("hEventSelection"))->GetXaxis()->SetBinLabel(15, "kNoCollInRofStd");
191+
histos.get<TH1>(HIST("hEventSelection"))->GetXaxis()->SetBinLabel(16, "kNoCollInRofStrict");
193192
if (doPPAnalysis) {
194-
histos.get<TH1>(HIST("hEventSelection"))->GetXaxis()->SetBinLabel(18, "INEL>0");
195-
histos.get<TH1>(HIST("hEventSelection"))->GetXaxis()->SetBinLabel(19, "INEL>1");
193+
histos.get<TH1>(HIST("hEventSelection"))->GetXaxis()->SetBinLabel(17, "INEL>0");
194+
histos.get<TH1>(HIST("hEventSelection"))->GetXaxis()->SetBinLabel(18, "INEL>1");
196195
} else {
197-
histos.get<TH1>(HIST("hEventSelection"))->GetXaxis()->SetBinLabel(18, "Below min occup.");
198-
histos.get<TH1>(HIST("hEventSelection"))->GetXaxis()->SetBinLabel(19, "Above max occup.");
196+
histos.get<TH1>(HIST("hEventSelection"))->GetXaxis()->SetBinLabel(17, "Below min occup.");
197+
histos.get<TH1>(HIST("hEventSelection"))->GetXaxis()->SetBinLabel(18, "Above max occup.");
199198
}
200199

201200
histos.add("hEventCentrality", "hEventCentrality", kTH1F, {axisCentrality});
@@ -356,44 +355,39 @@ struct sigma0builder {
356355
}
357356
if (fillHists)
358357
histos.fill(HIST("hEventSelection"), 13 /* No other collision within +/- 2 microseconds */);
359-
if (eventSelections.requireNoCollInTimeRangeVzDep && !collision.selection_bit(o2::aod::evsel::kNoCollInTimeRangeVzDependent)) {
360-
return false;
361-
}
362-
if (fillHists)
363-
histos.fill(HIST("hEventSelection"), 14 /* No other collision with pvZ of drifting TPC tracks from past/future collisions within 2.5 cm the current pvZ */);
364358
if (eventSelections.requireNoCollInROFStd && !collision.selection_bit(o2::aod::evsel::kNoCollInRofStandard)) {
365359
return false;
366360
}
367361
if (fillHists)
368-
histos.fill(HIST("hEventSelection"), 15 /* No other collision within the same ITS ROF with mult. above a certain threshold */);
362+
histos.fill(HIST("hEventSelection"), 14 /* No other collision within the same ITS ROF with mult. above a certain threshold */);
369363
if (eventSelections.requireNoCollInROFStrict && !collision.selection_bit(o2::aod::evsel::kNoCollInRofStrict)) {
370364
return false;
371365
}
372366
if (fillHists)
373-
histos.fill(HIST("hEventSelection"), 16 /* No other collision within the same ITS ROF */);
367+
histos.fill(HIST("hEventSelection"), 15 /* No other collision within the same ITS ROF */);
374368
if (doPPAnalysis) { // we are in pp
375369
if (eventSelections.requireINEL0 && collision.multNTracksPVeta1() < 1) {
376370
return false;
377371
}
378372
if (fillHists)
379-
histos.fill(HIST("hEventSelection"), 17 /* INEL > 0 */);
373+
histos.fill(HIST("hEventSelection"), 16 /* INEL > 0 */);
380374
if (eventSelections.requireINEL1 && collision.multNTracksPVeta1() < 2) {
381375
return false;
382376
}
383377
if (fillHists)
384-
histos.fill(HIST("hEventSelection"), 18 /* INEL > 1 */);
378+
histos.fill(HIST("hEventSelection"), 17 /* INEL > 1 */);
385379
} else { // we are in Pb-Pb
386380
float collisionOccupancy = eventSelections.useFT0CbasedOccupancy ? collision.ft0cOccupancyInTimeRange() : collision.trackOccupancyInTimeRange();
387381
if (eventSelections.minOccupancy >= 0 && collisionOccupancy < eventSelections.minOccupancy) {
388382
return false;
389383
}
390384
if (fillHists)
391-
histos.fill(HIST("hEventSelection"), 17 /* Below min occupancy */);
385+
histos.fill(HIST("hEventSelection"), 16 /* Below min occupancy */);
392386
if (eventSelections.maxOccupancy >= 0 && collisionOccupancy > eventSelections.maxOccupancy) {
393387
return false;
394388
}
395389
if (fillHists)
396-
histos.fill(HIST("hEventSelection"), 18 /* Above max occupancy */);
390+
histos.fill(HIST("hEventSelection"), 17 /* Above max occupancy */);
397391
}
398392
return true;
399393
}

‎PWGLF/Tasks/QC/strderivedGenQA.cxx‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ struct strderivedGenQA {
8888
Configurable<bool> requireNoCollInTimeRangeStd{"requireNoCollInTimeRangeStd", false, "reject collisions corrupted by the cannibalism, with other collisions within +/- 2 microseconds or mult above a certain threshold in -4 - -2 microseconds"};
8989
Configurable<bool> requireNoCollInTimeRangeStrict{"requireNoCollInTimeRangeStrict", false, "reject collisions corrupted by the cannibalism, with other collisions within +/- 10 microseconds"};
9090
Configurable<bool> requireNoCollInTimeRangeNarrow{"requireNoCollInTimeRangeNarrow", false, "reject collisions corrupted by the cannibalism, with other collisions within +/- 2 microseconds"};
91-
Configurable<bool> requireNoCollInTimeRangeVzDep{"requireNoCollInTimeRangeVzDep", false, "reject collisions corrupted by the cannibalism, with other collisions with pvZ of drifting TPC tracks from past/future collisions within 2.5 cm the current pvZ"};
9291
Configurable<bool> requireNoCollInROFStd{"requireNoCollInROFStd", false, "reject collisions corrupted by the cannibalism, with other collisions within the same ITS ROF with mult. above a certain threshold"};
9392
Configurable<bool> requireNoCollInROFStrict{"requireNoCollInROFStrict", false, "reject collisions corrupted by the cannibalism, with other collisions within the same ITS ROF"};
9493
Configurable<bool> requireINEL0{"requireINEL0", true, "require INEL>0 event selection"};
@@ -199,7 +198,7 @@ struct strderivedGenQA {
199198
histos.add("Event/hPosZ", "hPosZ", kTH1F, {axisPosZ});
200199

201200
// Event Counters
202-
histos.add("Event/hEventProperties", "hEventProperties", kTH1F, {{20, -0.5f, +19.5f}});
201+
histos.add("Event/hEventProperties", "hEventProperties", kTH1F, {{20, -0.5f, +18.5f}});
203202
histos.get<TH1>(HIST("Event/hEventProperties"))->GetXaxis()->SetBinLabel(1, "All collisions");
204203
histos.get<TH1>(HIST("Event/hEventProperties"))->GetXaxis()->SetBinLabel(2, "sel8 cut");
205204
histos.get<TH1>(HIST("Event/hEventProperties"))->GetXaxis()->SetBinLabel(3, "kIsTriggerTVX");
@@ -213,9 +212,8 @@ struct strderivedGenQA {
213212
histos.get<TH1>(HIST("Event/hEventProperties"))->GetXaxis()->SetBinLabel(11, "kNoCollInTimeRangeStd");
214213
histos.get<TH1>(HIST("Event/hEventProperties"))->GetXaxis()->SetBinLabel(12, "kNoCollInTimeRangeStrict");
215214
histos.get<TH1>(HIST("Event/hEventProperties"))->GetXaxis()->SetBinLabel(13, "kNoCollInTimeRangeNarrow");
216-
histos.get<TH1>(HIST("Event/hEventProperties"))->GetXaxis()->SetBinLabel(14, "kNoCollInTimeRangeVzDep");
217-
histos.get<TH1>(HIST("Event/hEventProperties"))->GetXaxis()->SetBinLabel(15, "kNoCollInRofStd");
218-
histos.get<TH1>(HIST("Event/hEventProperties"))->GetXaxis()->SetBinLabel(16, "kNoCollInRofStrict");
215+
histos.get<TH1>(HIST("Event/hEventProperties"))->GetXaxis()->SetBinLabel(14, "kNoCollInRofStd");
216+
histos.get<TH1>(HIST("Event/hEventProperties"))->GetXaxis()->SetBinLabel(15, "kNoCollInRofStrict");
219217

220218
histos.add("Event/hft0cOccupancyInTimeRange", "hft0cOccupancyInTimeRange", kTH1F, {axisFt0cOccupancyInTimeRange});
221219
histos.add("Event/htrackOccupancyInTimeRange", "htrackOccupancyInTimeRange", kTH1F, {axisTrackOccupancyInTimeRange});
@@ -553,9 +551,6 @@ struct strderivedGenQA {
553551
if (eventSelections.requireNoCollInTimeRangeNarrow && !collision.selection_bit(o2::aod::evsel::kNoCollInTimeRangeNarrow)) {
554552
return false;
555553
}
556-
if (eventSelections.requireNoCollInTimeRangeVzDep && !collision.selection_bit(o2::aod::evsel::kNoCollInTimeRangeVzDependent)) {
557-
return false;
558-
}
559554
if (eventSelections.requireNoCollInROFStd && !collision.selection_bit(o2::aod::evsel::kNoCollInRofStandard)) {
560555
return false;
561556
}
@@ -679,12 +674,10 @@ struct strderivedGenQA {
679674
histos.fill(HIST("Event/hEventProperties"), 11.);
680675
if (coll.selection_bit(o2::aod::evsel::kNoCollInTimeRangeNarrow))
681676
histos.fill(HIST("Event/hEventProperties"), 12.);
682-
if (coll.selection_bit(o2::aod::evsel::kNoCollInTimeRangeVzDependent))
683-
histos.fill(HIST("Event/hEventProperties"), 13.);
684677
if (coll.selection_bit(o2::aod::evsel::kNoCollInRofStandard))
685-
histos.fill(HIST("Event/hEventProperties"), 14.);
678+
histos.fill(HIST("Event/hEventProperties"), 13.);
686679
if (coll.selection_bit(o2::aod::evsel::kNoCollInRofStrict))
687-
histos.fill(HIST("Event/hEventProperties"), 15.);
680+
histos.fill(HIST("Event/hEventProperties"), 14.);
688681

689682
histos.fill(HIST("Event/hft0cOccupancyInTimeRange"), coll.ft0cOccupancyInTimeRange());
690683
histos.fill(HIST("Event/htrackOccupancyInTimeRange"), coll.trackOccupancyInTimeRange());

0 commit comments

Comments
 (0)