Skip to content

Commit 2dff492

Browse files
zhangbiao-phyzhangbiao-phy
authored
[Common] Protect TOF PID tasks against empty collision tables (#17048)
1 parent 3998bb3 commit 2dff492

3 files changed

Lines changed: 20 additions & 20 deletions

File tree

‎Common/TableProducer/PID/pidTOFBase.cxx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ struct tofEventTime {
358358
using ResponseImplementationEvTime = o2::pid::tof::ExpTimes<TrksEvTime::iterator, pid>;
359359
using EvTimeCollisions = soa::Join<aod::Collisions, aod::EvSels>;
360360
void processNoFT0(TrksEvTime const& tracks,
361-
EvTimeCollisions const&)
361+
EvTimeCollisions const& collisions)
362362
{
363363
if (!enableTable) {
364364
return;
@@ -372,7 +372,7 @@ struct tofEventTime {
372372

373373
int lastCollisionId = -1; // Last collision ID analysed
374374
for (auto const& t : tracks) { // Loop on collisions
375-
if (!t.has_collision() || ((sel8TOFEvTime.value == true) && !t.collision_as<EvTimeCollisions>().sel8())) { // Track was not assigned, cannot compute event time or event did not pass the event selection
375+
if (!t.has_collision() || collisions.size() == 0 || ((sel8TOFEvTime.value == true) && !t.collision_as<EvTimeCollisions>().sel8())) { // Track was not assigned, cannot compute event time or event did not pass the event selection
376376
tableFlags(0);
377377
tableEvTime(0.f, 999.f);
378378
if (enableTableTOFOnly) {
@@ -420,7 +420,7 @@ struct tofEventTime {
420420
using EvTimeCollisionsFT0 = soa::Join<EvTimeCollisions, aod::FT0sCorrected>;
421421
void processFT0(TrksEvTime const& tracks,
422422
aod::FT0s const&,
423-
EvTimeCollisionsFT0 const&)
423+
EvTimeCollisionsFT0 const& collisions)
424424
{
425425
if (!enableTable) {
426426
return;
@@ -434,7 +434,7 @@ struct tofEventTime {
434434

435435
int lastCollisionId = -1; // Last collision ID analysed
436436
for (auto const& t : tracks) { // Loop on collisions
437-
if (!t.has_collision() || ((sel8TOFEvTime.value == true) && !t.collision_as<EvTimeCollisionsFT0>().sel8())) { // Track was not assigned, cannot compute event time or event did not pass the event selection
437+
if (!t.has_collision() || collisions.size() == 0 || ((sel8TOFEvTime.value == true) && !t.collision_as<EvTimeCollisionsFT0>().sel8())) { // Track was not assigned, cannot compute event time or event did not pass the event selection
438438
tableFlags(0);
439439
tableEvTime(0.f, 999.f);
440440
if (enableTableTOFOnly) {
@@ -515,7 +515,7 @@ struct tofEventTime {
515515
/// Process function to prepare the event for each track on Run 3 data with only the FT0
516516
void processOnlyFT0(TrksEvTime const& tracks,
517517
aod::FT0s const&,
518-
EvTimeCollisionsFT0 const&)
518+
EvTimeCollisionsFT0 const& collisions)
519519
{
520520
if (!enableTable) {
521521
return;
@@ -531,7 +531,7 @@ struct tofEventTime {
531531
if (enableTableTOFOnly) {
532532
tableEvTimeTOFOnly((uint8_t)0, 0.f, 0.f, -1);
533533
}
534-
if (!t.has_collision()) { // Track was not assigned, cannot compute event time
534+
if (!t.has_collision() || collisions.size() == 0) { // Track was not assigned, cannot compute event time
535535
tableFlags(0);
536536
tableEvTime(0.f, 999.f);
537537
continue;

‎Common/TableProducer/PID/pidTOFFull.cxx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ struct tofPidFull {
286286
Preslice<Trks> perCollision = aod::track::collisionId;
287287
template <o2::track::PID::ID pid>
288288
using ResponseImplementation = o2::pid::tof::ExpTimes<Trks::iterator, pid>;
289-
void processWSlice(Trks const& tracks, aod::Collisions const&, aod::BCsWithTimestamps const&)
289+
void processWSlice(Trks const& tracks, aod::Collisions const& collisions, aod::BCsWithTimestamps const&)
290290
{
291291
constexpr auto responseEl = ResponseImplementation<PID::Electron>();
292292
constexpr auto responseMu = ResponseImplementation<PID::Muon>();
@@ -305,7 +305,7 @@ struct tofPidFull {
305305
int lastCollisionId = -1; // Last collision ID analysed
306306
float resolution = 1.f; // Last resolution assigned
307307
for (auto const& track : tracks) { // Loop on all tracks
308-
if (!track.has_collision()) { // Track was not assigned, cannot compute NSigma (no event time) -> filling with empty table
308+
if (!track.has_collision() || collisions.size() == 0) { // Track was not assigned, cannot compute NSigma (no event time) -> filling with empty table
309309
for (auto const& pidId : mEnabledParticles) {
310310
makeTableEmpty(pidId);
311311
}
@@ -392,7 +392,7 @@ struct tofPidFull {
392392
using TrksIU = soa::Join<aod::TracksIU, aod::TracksExtra, aod::TOFSignal, aod::TOFEvTime, aod::pidEvTimeFlags>;
393393
template <o2::track::PID::ID pid>
394394
using ResponseImplementationIU = o2::pid::tof::ExpTimes<TrksIU::iterator, pid>;
395-
void processWoSlice(TrksIU const& tracks, aod::Collisions const&, aod::BCsWithTimestamps const&)
395+
void processWoSlice(TrksIU const& tracks, aod::Collisions const& collisions, aod::BCsWithTimestamps const&)
396396
{
397397
constexpr auto responseEl = ResponseImplementationIU<PID::Electron>();
398398
constexpr auto responseMu = ResponseImplementationIU<PID::Muon>();
@@ -409,7 +409,7 @@ struct tofPidFull {
409409
}
410410
float resolution = 1.f; // Last resolution assigned
411411
for (auto const& track : tracks) { // Loop on all tracks
412-
if (!track.has_collision()) { // Track was not assigned, cannot compute NSigma (no event time) -> filling with empty table
412+
if (!track.has_collision() || collisions.size() == 0) { // Track was not assigned, cannot compute NSigma (no event time) -> filling with empty table
413413
for (auto const& pidId : mEnabledParticles) {
414414
makeTableEmpty(pidId);
415415
}

‎Common/TableProducer/PID/pidTOFMerge.cxx‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ struct tofEventTime {
334334
///
335335
/// Process function to prepare the event for each track on Run 2 data
336336
void processRun2(aod::Tracks const& tracks,
337-
aod::Collisions const&,
337+
aod::Collisions const& collisions,
338338
aod::BCsWithTimestamps const& bcs)
339339
{
340340
if (!enableTableTOFEvTime) {
@@ -346,7 +346,7 @@ struct tofEventTime {
346346
tableFlags.reserve(tracks.size());
347347

348348
for (auto const& t : tracks) { // Loop on collisions
349-
if (!t.has_collision()) { // Track was not assigned, cannot compute event time
349+
if (!t.has_collision() || collisions.size() == 0) { // Track was not assigned, cannot compute event time
350350
tableFlags(0);
351351
tableEvTime(0.f, 999.f);
352352
continue;
@@ -365,7 +365,7 @@ struct tofEventTime {
365365
using ResponseImplementationEvTime = o2::pid::tof::ExpTimes<Run3TrksWtof::iterator, pid>;
366366
void processRun3(Run3TrksWtof const& tracks,
367367
aod::FT0s const&,
368-
EvTimeCollisionsFT0 const&,
368+
EvTimeCollisionsFT0 const& collisions,
369369
aod::BCsWithTimestamps const& bcs)
370370
{
371371
if (!enableTableTOFEvTime) {
@@ -401,7 +401,7 @@ struct tofEventTime {
401401
if (mComputeEvTimeWithTOF == 1 && mComputeEvTimeWithFT0 == 1) {
402402
int lastCollisionId = -1; // Last collision ID analysed
403403
for (auto const& t : tracks) { // Loop on collisions
404-
if (!t.has_collision() || ((sel8TOFEvTime.value == true) && !t.collision_as<EvTimeCollisionsFT0>().sel8())) { // Track was not assigned, cannot compute event time or event did not pass the event selection
404+
if (!t.has_collision() || collisions.size() == 0 || ((sel8TOFEvTime.value == true) && !t.collision_as<EvTimeCollisionsFT0>().sel8())) { // Track was not assigned, cannot compute event time or event did not pass the event selection
405405
tableFlags(0);
406406
tableEvTime(0.f, 999.f);
407407
if (enableTableEvTimeTOFOnly) {
@@ -477,7 +477,7 @@ struct tofEventTime {
477477
} else if (mComputeEvTimeWithTOF == 1 && mComputeEvTimeWithFT0 == 0) {
478478
int lastCollisionId = -1; // Last collision ID analysed
479479
for (auto const& t : tracks) { // Loop on collisions
480-
if (!t.has_collision() || ((sel8TOFEvTime.value == true) && !t.collision_as<EvTimeCollisions>().sel8())) { // Track was not assigned, cannot compute event time or event did not pass the event selection
480+
if (!t.has_collision() || collisions.size() == 0 || ((sel8TOFEvTime.value == true) && !t.collision_as<EvTimeCollisions>().sel8())) { // Track was not assigned, cannot compute event time or event did not pass the event selection
481481
tableFlags(0);
482482
tableEvTime(0.f, 999.f);
483483
if (enableTableEvTimeTOFOnly) {
@@ -522,7 +522,7 @@ struct tofEventTime {
522522
if (enableTableEvTimeTOFOnly) {
523523
tableEvTimeTOFOnly((uint8_t)0, 0.f, 0.f, -1);
524524
}
525-
if (!t.has_collision()) { // Track was not assigned, cannot compute event time
525+
if (!t.has_collision() || collisions.size() == 0) { // Track was not assigned, cannot compute event time
526526
tableFlags(0);
527527
tableEvTime(0.f, 999.f);
528528
continue;
@@ -881,7 +881,7 @@ struct tofPidMerge {
881881
template <o2::track::PID::ID pid>
882882
using ResponseImplementation = o2::pid::tof::ExpTimes<Run3TrksWtofWevTime::iterator, pid>;
883883
void processRun3(Run3TrksWtofWevTime const& tracks,
884-
aod::Collisions const&,
884+
aod::Collisions const& collisions,
885885
aod::BCsWithTimestamps const& bcs)
886886
{
887887
constexpr auto responseEl = ResponseImplementation<PID::Electron>();
@@ -907,7 +907,7 @@ struct tofPidMerge {
907907
float resolution = 1.f; // Last resolution assigned
908908
float nsigma = 0;
909909
for (auto const& trk : tracks) { // Loop on all tracks
910-
if (!trk.has_collision()) { // Track was not assigned, cannot compute NSigma (no event time) -> filling with empty table
910+
if (!trk.has_collision() || collisions.size() == 0) { // Track was not assigned, cannot compute NSigma (no event time) -> filling with empty table
911911
for (auto const& pidId : mEnabledParticles) {
912912
makeTableEmpty(pidId, false);
913913
}
@@ -1043,7 +1043,7 @@ struct tofPidMerge {
10431043
template <o2::track::PID::ID pid>
10441044
using ResponseImplementationRun2 = o2::pid::tof::ExpTimes<Run2TrksWtofWevTime::iterator, pid>;
10451045
void processRun2(Run2TrksWtofWevTime const& tracks,
1046-
aod::Collisions const&,
1046+
aod::Collisions const& collisions,
10471047
aod::BCsWithTimestamps const& bcs)
10481048
{
10491049
constexpr auto responseEl = ResponseImplementationRun2<PID::Electron>();
@@ -1069,7 +1069,7 @@ struct tofPidMerge {
10691069
float resolution = 1.f; // Last resolution assigned
10701070
float nsigma = 0;
10711071
for (auto const& trk : tracks) { // Loop on all tracks
1072-
if (!trk.has_collision()) { // Track was not assigned, cannot compute NSigma (no event time) -> filling with empty table
1072+
if (!trk.has_collision() || collisions.size() == 0) { // Track was not assigned, cannot compute NSigma (no event time) -> filling with empty table
10731073
for (auto const& pidId : mEnabledParticles) {
10741074
makeTableEmpty(pidId, false);
10751075
}

0 commit comments

Comments
 (0)