Skip to content

Commit 48e383b

Browse files
ilikmetaalibuild
andauthored
Fix boolian function and track filter (AliceO2Group#7901)
* Fix boolian function and track filter * Remove whitespaces * Please consider the following formatting changes --------- Co-authored-by: ALICE Action Bot <[email protected]>
1 parent 1d9a52a commit 48e383b

File tree

1 file changed

+14
-18
lines changed

1 file changed

+14
-18
lines changed

PWGCF/Flow/Tasks/FlowGFWPbPb.cxx

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -403,25 +403,25 @@ struct FlowGFWPbPb {
403403
auto occupancy = collision.trackOccupancyInTimeRange();
404404

405405
if (centrality >= 70. || centrality < 0)
406-
return 0;
406+
return false;
407407
if (abs(vtxz) > cfgCutVertex)
408-
return 0;
408+
return false;
409409
if (multNTracksPV < fMultPVCutLow->Eval(centrality))
410-
return 0;
410+
return false;
411411
if (multNTracksPV > fMultPVCutHigh->Eval(centrality))
412-
return 0;
412+
return false;
413413
if (multTrk < fMultCutLow->Eval(centrality))
414-
return 0;
414+
return false;
415415
if (multTrk > fMultCutHigh->Eval(centrality))
416-
return 0;
416+
return false;
417417
if (occupancy < cfgCutOccupancyLow || occupancy > cfgCutOccupancyHigh)
418-
return 0;
418+
return false;
419419

420420
// V0A T0A 5 sigma cut
421421
if (abs(collision.multFV0A() - fT0AV0AMean->Eval(collision.multFT0A())) > 5 * fT0AV0ASigma->Eval(collision.multFT0A()))
422-
return 0;
422+
return false;
423423

424-
return 1;
424+
return true;
425425
}
426426

427427
int getMagneticField(uint64_t timestamp)
@@ -462,8 +462,11 @@ struct FlowGFWPbPb {
462462
Filter collisionFilter = nabs(aod::collision::posZ) < cfgCutVertex;
463463
Filter trackFilter = ncheckbit(aod::track::v001::detectorMap, (uint8_t)o2::aod::track::ITS) &&
464464
ncheckbit(aod::track::trackCutFlag, trackSelectionITS) &&
465-
ifnode(ncheckbit(aod::track::v001::detectorMap, (uint8_t)o2::aod::track::TPC), ncheckbit(aod::track::trackCutFlag, trackSelectionTPC), true) &&
466-
ifnode(dcaZ.node() > 0.f, nabs(aod::track::dcaZ) <= dcaZ && ncheckbit(aod::track::trackCutFlag, trackSelectionDCAXYonly), ncheckbit(aod::track::trackCutFlag, trackSelectionDCA));
465+
ifnode(ncheckbit(aod::track::v001::detectorMap, (uint8_t)o2::aod::track::TPC),
466+
ncheckbit(aod::track::trackCutFlag, trackSelectionTPC), true) &&
467+
ifnode(dcaZ.node() > 0.f, nabs(aod::track::dcaZ) <= dcaZ && ncheckbit(aod::track::trackCutFlag, trackSelectionDCAXYonly),
468+
ncheckbit(aod::track::trackCutFlag, trackSelectionDCA)) &&
469+
(nabs(aod::track::eta) < cfgCutEta) && (aod::track::pt > cfgCutPtMin) && (aod::track::pt < cfgCutPtMax);
467470

468471
using Colls = soa::Filtered<soa::Join<aod::Collisions, aod::EvSels, aod::Mults, aod::MultsExtra, aod::CentFT0Cs>>; // collisions filter
469472
using aodTracks = soa::Filtered<soa::Join<aod::Tracks, aod::TrackSelection, aod::TracksDCA, aod::TracksExtra>>; // tracks filter
@@ -533,13 +536,6 @@ struct FlowGFWPbPb {
533536

534537
for (auto& track : tracks) {
535538

536-
if (std::abs(track.eta()) >= cfgCutEta) {
537-
continue;
538-
}
539-
if (cfgCutPtMin > track.pt() && track.pt() > cfgCutPtMax) {
540-
continue;
541-
}
542-
543539
if (cfgUseAdditionalTrackCut && !trackSelected(track, Magnetfield))
544540
continue;
545541
if (cfgOutputNUAWeights)

0 commit comments

Comments
 (0)