Skip to content

Commit

Permalink
fixing abs rounding with fabs
Browse files Browse the repository at this point in the history
  • Loading branch information
glromane committed Sep 9, 2024
1 parent 977f730 commit 6a81ff2
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
8 changes: 4 additions & 4 deletions PWGCF/Femto3D/Core/femto3dPairTask.h
Original file line number Diff line number Diff line change
Expand Up @@ -109,14 +109,14 @@ float GetKstarFrom4vectors(TLorentzVector& first4momentum, TLorentzVector& secon
{
if (isIdentical) {
TLorentzVector fourmomentadiff = first4momentum - second4momentum;
return 0.5 * abs(fourmomentadiff.Mag());
return 0.5 * fabs(fourmomentadiff.Mag());
} else {
TLorentzVector fourmomentasum = first4momentum + second4momentum;
TLorentzVector fourmomentadif = first4momentum - second4momentum;

fourmomentadif.Boost((-1) * fourmomentasum.BoostVector());

return 0.5 * abs(fourmomentadif.Vect().Mag());
return 0.5 * fabs(fourmomentadif.Vect().Mag());
}
}

Expand Down Expand Up @@ -252,9 +252,9 @@ bool FemtoPair<TrackType>::IsClosePair(const float& deta, const float& dphi, con
return true;
if (_magfield1 * _magfield2 == 0)
return true;
if (std::pow(abs(GetEtaDiff()) / deta, 2) + std::pow(abs(GetPhiStarDiff(radius)) / dphi, 2) < 1.0f)
if (std::pow(fabs(GetEtaDiff()) / deta, 2) + std::pow(fabs(GetPhiStarDiff(radius)) / dphi, 2) < 1.0f)
return true;
// if (abs(GetEtaDiff()) < deta && abs(GetPhiStarDiff(radius)) < dphi)
// if (fabs(GetEtaDiff()) < deta && fabs(GetPhiStarDiff(radius)) < dphi)
// return true;

return false;
Expand Down
2 changes: 1 addition & 1 deletion PWGCF/Femto3D/TableProducer/singleTrackSelector.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@ struct singleTrackSelector {
return;
}

if (abs(mcCollision.posZ()) > _vertexZ) {
if (fabs(mcCollision.posZ()) > _vertexZ) {
return;
}

Expand Down
4 changes: 2 additions & 2 deletions PWGCF/Femto3D/Tasks/femto3dPairTask.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@ struct FemtoCorrelations {
LOGF(fatal, "One of passed PDG is 0!!!");

for (auto track : tracks) {
if (abs(track.template singleCollSel_as<soa::Filtered<FilteredCollisions>>().posZ()) > _vertexZ)
if (fabs(track.template singleCollSel_as<soa::Filtered<FilteredCollisions>>().posZ()) > _vertexZ)
continue;
if (_removeSameBunchPileup && !track.template singleCollSel_as<soa::Filtered<FilteredCollisions>>().isNoSameBunchPileup())
continue;
Expand All @@ -400,7 +400,7 @@ struct FemtoCorrelations {
continue;
if (track.template singleCollSel_as<soa::Filtered<FilteredCollisions>>().occupancy() < _OccupancyCut.value.first || track.template singleCollSel_as<soa::Filtered<FilteredCollisions>>().occupancy() >= _OccupancyCut.value.second)
continue;
if (abs(track.dcaXY()) > _dcaXY.value[0] + _dcaXY.value[1] * std::pow(track.pt(), _dcaXY.value[2]) || abs(track.dcaZ()) > _dcaZ.value[0] + _dcaZ.value[1] * std::pow(track.pt(), _dcaZ.value[2]))
if (fabs(track.dcaXY()) > _dcaXY.value[0] + _dcaXY.value[1] * std::pow(track.pt(), _dcaXY.value[2]) || fabs(track.dcaZ()) > _dcaZ.value[0] + _dcaZ.value[1] * std::pow(track.pt(), _dcaZ.value[2]))
continue;

if (track.sign() == _sign_1 && (track.p() < _PIDtrshld_1 ? o2::aod::singletrackselector::TPCselection(track, TPCcuts_1) : o2::aod::singletrackselector::TOFselection(track, TOFcuts_1, _tpcNSigmaResidual_1.value))) { // filling the map: eventID <-> selected particles1
Expand Down
6 changes: 3 additions & 3 deletions PWGCF/Femto3D/Tasks/femto3dPairTaskMC.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ struct FemtoCorrelationsMC {
int trackPDG, trackOrigin;

for (auto track : tracks) {
if (abs(track.template singleCollSel_as<soa::Filtered<FilteredCollisions>>().posZ()) > _vertexZ)
if (fabs(track.template singleCollSel_as<soa::Filtered<FilteredCollisions>>().posZ()) > _vertexZ)
continue;
if (track.tpcFractionSharedCls() > _tpcFractionSharedCls || track.itsNCls() < _itsNCls)
continue;
Expand Down Expand Up @@ -351,7 +351,7 @@ struct FemtoCorrelationsMC {
if (trackOrigin > -1 && trackOrigin < 3)
DCA_histos_1[centBin][track.origin()]->Fill(track.pt(), track.dcaXY(), track.dcaZ());

if (abs(track.dcaXY()) > _dcaXY.value[0] + _dcaXY.value[1] * std::pow(track.pt(), _dcaXY.value[2]) || abs(track.dcaZ()) > _dcaZ.value[0] + _dcaZ.value[1] * std::pow(track.pt(), _dcaZ.value[2]))
if (fabs(track.dcaXY()) > _dcaXY.value[0] + _dcaXY.value[1] * std::pow(track.pt(), _dcaXY.value[2]) || fabs(track.dcaZ()) > _dcaZ.value[0] + _dcaZ.value[1] * std::pow(track.pt(), _dcaZ.value[2]))
continue;

trackPDG = abs(track.pdgCode());
Expand All @@ -372,7 +372,7 @@ struct FemtoCorrelationsMC {
if (trackOrigin > -1 && trackOrigin < 3)
DCA_histos_2[centBin][track.origin()]->Fill(track.pt(), track.dcaXY(), track.dcaZ());

if (abs(track.dcaXY()) > _dcaXY.value[0] + _dcaXY.value[1] * std::pow(track.pt(), _dcaXY.value[2]) || abs(track.dcaZ()) > _dcaZ.value[0] + _dcaZ.value[1] * std::pow(track.pt(), _dcaZ.value[2]))
if (fabs(track.dcaXY()) > _dcaXY.value[0] + _dcaXY.value[1] * std::pow(track.pt(), _dcaXY.value[2]) || fabs(track.dcaZ()) > _dcaZ.value[0] + _dcaZ.value[1] * std::pow(track.pt(), _dcaZ.value[2]))
continue;

trackPDG = abs(track.pdgCode());
Expand Down
4 changes: 2 additions & 2 deletions PWGCF/Femto3D/Tasks/femto3dQA.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ struct QAHistograms {
if (_requestNoCollInTimeRangeStandard && !track.template singleCollSel_as<ColsType>().noCollInTimeRangeStandard())
continue;

if (abs(track.template singleCollSel_as<ColsType>().posZ()) > _vertexZ)
if (fabs(track.template singleCollSel_as<ColsType>().posZ()) > _vertexZ)
continue;
if (track.template singleCollSel_as<ColsType>().multPerc() < _centCut.value.first || track.template singleCollSel_as<ColsType>().multPerc() >= _centCut.value.second)
continue;
Expand All @@ -196,7 +196,7 @@ struct QAHistograms {
continue;
if ((track.tpcFractionSharedCls()) > _tpcFractionSharedCls || (track.itsNCls()) < _itsNCls)
continue;
if (abs(track.dcaXY()) > _dcaXY.value[0] + _dcaXY.value[1] * std::pow(track.pt(), _dcaXY.value[2]) || abs(track.dcaZ()) > _dcaZ.value[0] + _dcaZ.value[1] * std::pow(track.pt(), _dcaZ.value[2]))
if (fabs(track.dcaXY()) > _dcaXY.value[0] + _dcaXY.value[1] * std::pow(track.pt(), _dcaXY.value[2]) || fabs(track.dcaZ()) > _dcaZ.value[0] + _dcaZ.value[1] * std::pow(track.pt(), _dcaZ.value[2]))
continue;

if constexpr (FillExtra) {
Expand Down

0 comments on commit 6a81ff2

Please sign in to comment.