From 188dc1ce75ed082c1577bc7ad5857b5b711f276c Mon Sep 17 00:00:00 2001
From: Axel Puntke <axel.puntke@uni-muenster.de>
Date: Mon, 5 Aug 2024 16:39:15 +0200
Subject: [PATCH] replacing isnan/isfinite by std::isnan/std::isfinite
---
reco/KF/CbmKFMath.cxx | 2 +-
reco/KF/Interface/CbmPVFinderKF.cxx | 4 ++--
reco/KF/Interface/CbmPVFinderKFGlobal.cxx | 4 ++--
reco/KF/Interface/CbmStsFitPerformanceTask.cxx | 6 +++---
reco/KF/Interface/CbmStsKFTrackFitter.cxx | 8 ++++----
reco/detectors/tof/CbmTofCalibrator.cxx | 8 ++++----
reco/littrack/cbm/qa/clustering/CbmLitClusteringQa.cxx | 2 +-
7 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/reco/KF/CbmKFMath.cxx b/reco/KF/CbmKFMath.cxx
index cd8d24ae67..3e73d91ed0 100644
--- a/reco/KF/CbmKFMath.cxx
+++ b/reco/KF/CbmKFMath.cxx
@@ -756,7 +756,7 @@ Int_t CbmKFMath::GetNoise(Double_t Lrl, Double_t F, Double_t Fe, Double_t tx, Do
*Q9 = 0;
*Ecor = 1.;
Double_t t = sqrt(1. + tx * tx + ty * ty);
- if (!isfinite(t) || t > 1.e4) {
+ if (!std::isfinite(t) || t > 1.e4) {
return 1;
}
t = sqrt(t);
diff --git a/reco/KF/Interface/CbmPVFinderKF.cxx b/reco/KF/Interface/CbmPVFinderKF.cxx
index be7acad497..c3d125d18f 100644
--- a/reco/KF/Interface/CbmPVFinderKF.cxx
+++ b/reco/KF/Interface/CbmPVFinderKF.cxx
@@ -36,7 +36,7 @@ Int_t CbmPVFinderKF::FindPrimaryVertex(TClonesArray* tracks, CbmVertex* vertex)
}
CbmKFTrack& T = CloneArray[i];
T.SetStsTrack(*st);
- if (!isfinite(T.GetTrack()[0]) || !isfinite(T.GetCovMatrix()[0])) {
+ if (!std::isfinite(T.GetTrack()[0]) || !std::isfinite(T.GetCovMatrix()[0])) {
continue;
}
Finder.AddTrack(&T);
@@ -81,7 +81,7 @@ Int_t CbmPVFinderKF::FindEventVertex(CbmEvent* event, TClonesArray* tracks)
}
CbmKFTrack& kTrack = trackArray[iTrack];
kTrack.SetStsTrack(*track);
- if (!isfinite(kTrack.GetTrack()[0]) || !isfinite(kTrack.GetCovMatrix()[0])) {
+ if (!std::isfinite(kTrack.GetTrack()[0]) || !std::isfinite(kTrack.GetCovMatrix()[0])) {
continue;
}
vFinder.AddTrack(&kTrack);
diff --git a/reco/KF/Interface/CbmPVFinderKFGlobal.cxx b/reco/KF/Interface/CbmPVFinderKFGlobal.cxx
index 8bc34107f5..4db6df4e56 100644
--- a/reco/KF/Interface/CbmPVFinderKFGlobal.cxx
+++ b/reco/KF/Interface/CbmPVFinderKFGlobal.cxx
@@ -45,7 +45,7 @@ Int_t CbmPVFinderKFGlobal::FindPrimaryVertex(TClonesArray* tracks, CbmVertex* ve
if (globalTrack->GetChi2() < 0.) continue;
CbmKFTrack& kfTrack = vKFTracks[iT];
kfTrack.SetGlobalTrack(*globalTrack);
- if (!isfinite(kfTrack.GetTrack()[0]) || !isfinite(kfTrack.GetCovMatrix()[0])) continue;
+ if (!std::isfinite(kfTrack.GetTrack()[0]) || !std::isfinite(kfTrack.GetCovMatrix()[0])) continue;
finder.AddTrack(&kfTrack);
}
CbmKFVertex kfVertex;
@@ -97,7 +97,7 @@ Int_t CbmPVFinderKFGlobal::FindEventVertex(CbmEvent* event, TClonesArray* tracks
if (globalTrack->GetChi2() < 0.) continue;
CbmKFTrack& kfTrack = vKFTracks[iT];
kfTrack.SetGlobalTrack(*globalTrack);
- if (!isfinite(kfTrack.GetTrack()[0]) || !isfinite(kfTrack.GetCovMatrix()[0])) continue;
+ if (!std::isfinite(kfTrack.GetTrack()[0]) || !std::isfinite(kfTrack.GetCovMatrix()[0])) continue;
finder.AddTrack(&kfTrack);
}
diff --git a/reco/KF/Interface/CbmStsFitPerformanceTask.cxx b/reco/KF/Interface/CbmStsFitPerformanceTask.cxx
index 03f494c8a4..0ffa2f6b08 100644
--- a/reco/KF/Interface/CbmStsFitPerformanceTask.cxx
+++ b/reco/KF/Interface/CbmStsFitPerformanceTask.cxx
@@ -543,7 +543,7 @@ void CbmStsFitPerformanceTask::Exec(Option_t* /*option*/)
FairTrackParam paramI;
fFitter.Extrapolate(trackI, z[iz], ¶mI);
CbmKFMath::CopyTrackParam2TC(¶mI, sT[iTrack][iz], sC[iTrack][iz]);
- if (!isfinite(sC[iTrack][iz][0]) || sC[iTrack][iz][0] < 0 || sC[iTrack][iz][0] > 10.) {
+ if (!std::isfinite(sC[iTrack][iz][0]) || sC[iTrack][iz][0] < 0 || sC[iTrack][iz][0] > 10.) {
flag[iTrack] = 0;
break;
}
@@ -988,10 +988,10 @@ void CbmStsFitPerformanceTask::FillTrackHisto(const Double_t mc[6], CbmStsTrack*
CbmKFMath::CopyTrackParam2TC(¶m, t, c);
Bool_t ok = 1;
for (int i = 0; i < 6; i++) {
- ok = ok && isfinite(t[i]);
+ ok = ok && std::isfinite(t[i]);
}
for (int i = 0; i < 15; i++) {
- ok = ok && isfinite(c[i]);
+ ok = ok && std::isfinite(c[i]);
}
if (!ok) {
return;
diff --git a/reco/KF/Interface/CbmStsKFTrackFitter.cxx b/reco/KF/Interface/CbmStsKFTrackFitter.cxx
index 354f351ad0..75e04d1e79 100644
--- a/reco/KF/Interface/CbmStsKFTrackFitter.cxx
+++ b/reco/KF/Interface/CbmStsKFTrackFitter.cxx
@@ -230,7 +230,7 @@ Double_t CbmStsKFTrackFitter::FitToVertex(CbmStsTrack* track, CbmVertex* vtx, Fa
T.GetTrackParam(*v_track);
if (T.GetRefNDF() > 0 && T.GetRefChi2() >= 0) {
ret = T.GetRefChi2() / T.GetRefNDF();
- if (isfinite(ret)) {
+ if (std::isfinite(ret)) {
ret = sqrt(ret);
}
}
@@ -243,12 +243,12 @@ Bool_t CbmStsKFTrackFitter::CheckTrack(CbmKFTrack& T)
Double_t* t = T.GetTrack();
Double_t* c = T.GetCovMatrix();
for (int i = 0; i < 6; i++) {
- ok = ok && isfinite(t[i]) && TMath::Abs(t[i]) < 1.e5;
+ ok = ok && std::isfinite(t[i]) && TMath::Abs(t[i]) < 1.e5;
}
for (int i = 0; i < 15; i++) {
- ok = ok && isfinite(c[i]);
+ ok = ok && std::isfinite(c[i]);
}
- ok = ok && isfinite(T.GetMass()) && isfinite(T.GetRefChi2());
+ ok = ok && std::isfinite(T.GetMass()) && std::isfinite(T.GetRefChi2());
if (ok) {
ok = ok && (c[0] > 0);
ok = ok && (c[2] > 0);
diff --git a/reco/detectors/tof/CbmTofCalibrator.cxx b/reco/detectors/tof/CbmTofCalibrator.cxx
index 2656b9fe49..53680a2026 100644
--- a/reco/detectors/tof/CbmTofCalibrator.cxx
+++ b/reco/detectors/tof/CbmTofCalibrator.cxx
@@ -1081,7 +1081,7 @@ Bool_t CbmTofCalibrator::UpdateCalHist(Int_t iOpt)
double dTfind = dRes[0];
double dTmax = dTfind + fTofClusterizer->GetEdgeFrange();
dRes = fit_tofedge((const char*) (h2y->GetName()), dTmax, fTofClusterizer->GetEdgeThr());
- if (isnan(dRes[0])) dRes[0] = dTfind;
+ if (std::isnan(dRes[0])) dRes[0] = dTfind;
}
}
}
@@ -1148,7 +1148,7 @@ Bool_t CbmTofCalibrator::UpdateCalHist(Int_t iOpt)
double dTfind = dRes[0];
double dTmax = dTfind + fTofClusterizer->GetEdgeFrange();
dRes = fit_tofedge((const char*) (h2yAv->GetName()), dTmax, fTofClusterizer->GetEdgeThr());
- if (isnan(dRes[0])) dRes[0] = dTfind;
+ if (std::isnan(dRes[0])) dRes[0] = dTfind;
LOG(info) << h2yAv->GetName() << ": fitted AvEdge up to " << dTmax << ", Res " << dRes[0]
<< ", FindE " << dTfind;
}
@@ -1217,7 +1217,7 @@ Bool_t CbmTofCalibrator::UpdateCalHist(Int_t iOpt)
double dTfind = dRes[0];
double dTmax = dTfind + fTofClusterizer->GetEdgeFrange();
dRes = fit_tofedge((const char*) (h2y->GetName()), dTmax, fTofClusterizer->GetEdgeThr());
- if (isnan(dRes[0])) dRes[0] = dTfind;
+ if (std::isnan(dRes[0])) dRes[0] = dTfind;
LOG(info) << h2y->GetName() << ": fit edge up to " << dTmax << ", Res " << dRes[0]
<< ", FindE " << dTfind;
} break;
@@ -1279,7 +1279,7 @@ Bool_t CbmTofCalibrator::UpdateCalHist(Int_t iOpt)
LOG(warn) << "Channel ooHR: " << h2Wy->GetName() << i << ", " << dRes[0] << ", " << dTminShift;
}
double dVal = fhCorTOff[iDetIndx]->GetBinContent(i + 1);
- if (isnan(dVal)) fhCorTOff[iDetIndx]->SetBinContent(i + 1, 0.); // fix NANs
+ if (std::isnan(dVal)) fhCorTOff[iDetIndx]->SetBinContent(i + 1, 0.); // fix NANs
LOG(info) << h2Wy->GetName() << i << " CorTOff: " << dRes[0] << ", " << dResAv << ", " << dTminShift
<< ", " << fhCorTOff[iDetIndx]->GetBinContent(i + 1) << " -> "
diff --git a/reco/littrack/cbm/qa/clustering/CbmLitClusteringQa.cxx b/reco/littrack/cbm/qa/clustering/CbmLitClusteringQa.cxx
index 1e24d7b801..73b348e0ea 100644
--- a/reco/littrack/cbm/qa/clustering/CbmLitClusteringQa.cxx
+++ b/reco/littrack/cbm/qa/clustering/CbmLitClusteringQa.cxx
@@ -355,7 +355,7 @@ void CbmLitClusteringQa::FillResidualAndPullHistograms(CbmMCDataArray* points, c
for (Int_t iHit = 0; iHit < nofHits; iHit++) {
const CbmPixelHit* hit = static_cast<const CbmPixelHit*>(hits->At(iHit));
const CbmMatch* match = static_cast<const CbmMatch*>(hitMatches->At(iHit));
- if (isnan(static_cast<Float_t>(hit->GetX())) || (isnan(static_cast<Float_t>(hit->GetY())))) continue;
+ if (std::isnan(static_cast<Float_t>(hit->GetX())) || (std::isnan(static_cast<Float_t>(hit->GetY())))) continue;
const FairMCPoint* point = static_cast<const FairMCPoint*>(
points->Get(0, match->GetMatchedLink().GetEntry(), match->GetMatchedLink().GetIndex()));
if (point == NULL) continue;
--
GitLab