Skip to content

Use std::abs for floating-point values in TRD and ITS studies #15874

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sawenzel merged 1 commit into from
Sep 30, 2026
Merged

Use std::abs for floating-point values in TRD and ITS studies #15874

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Detectors/ITSMFT/ITS/postprocessing/studies/src/AvgClusSize.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
#include "SimulationDataFormat/MCCompLabel.h"
#include "DetectorsCommonDataFormats/DetID.h"

#include <cmath>
#include <numeric>
#include <TH1F.h>
#include <TH2F.h>
Expand Down Expand Up @@ -461,7 +462,7 @@ void AvgClusSizeStudy::process(o2::globaltracking::RecoContainer& recoData)
}

mOutputNtupleAll->Fill(dPosACS, dNegACS, cosPA, v0R, eta, dauDCA, dPospvDCA, dNegpvDCA, v0pvDCA, alphaArm, pT, calcV0HypoMass(v0, PID::Pion, PID::Pion), calcV0HypoMass(v0, PID::Proton, PID::Pion), calcV0HypoMass(v0, PID::Pion, PID::Proton), (float)V0PdgCode);
if ((cosPA > params.cosPAmin || params.disableCosPA) && (v0R < params.Rmax || params.disableRmax) && (v0R > params.Rmin || params.disableRmin) && (dauDCA < params.prongDCAmax || params.disableProngDCAmax) && (dPospvDCA > params.dauPVDCAmin || params.disableDauPVDCAmin) && (dNegpvDCA > params.dauPVDCAmin || params.disableDauPVDCAmin) && (v0pvDCA < params.v0PVDCAmax || params.disableV0PVDCAmax) && (abs(bgV0HypoMass - backgroundV0.getMass()) > params.bgV0window || params.disableMassHypoth) && (abs(tgV0HypoMass - targetV0.getMass()) < params.tgV0window || params.disableMassHypoth)) {
if ((cosPA > params.cosPAmin || params.disableCosPA) && (v0R < params.Rmax || params.disableRmax) && (v0R > params.Rmin || params.disableRmin) && (dauDCA < params.prongDCAmax || params.disableProngDCAmax) && (dPospvDCA > params.dauPVDCAmin || params.disableDauPVDCAmin) && (dNegpvDCA > params.dauPVDCAmin || params.disableDauPVDCAmin) && (v0pvDCA < params.v0PVDCAmax || params.disableV0PVDCAmax) && (std::abs(bgV0HypoMass - backgroundV0.getMass()) > params.bgV0window || params.disableMassHypoth) && (std::abs(tgV0HypoMass - targetV0.getMass()) < params.tgV0window || params.disableMassHypoth)) {
mOutputNtupleCut->Fill(dPosACS, dNegACS, cosPA, v0R, eta, dauDCA, dPospvDCA, dNegpvDCA, v0pvDCA, alphaArm, pT, calcV0HypoMass(v0, PID::Pion, PID::Pion), calcV0HypoMass(v0, PID::Proton, PID::Pion), calcV0HypoMass(v0, PID::Pion, PID::Proton), (float)V0PdgCode);
if (eta > params.etaMin && eta < params.etaMax) {
fillEtaBin(eta, dPosACS, 0);
Expand Down
13 changes: 7 additions & 6 deletions Detectors/ITSMFT/ITS/postprocessing/studies/src/Efficiency.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
#include <TString.h>
#include <TAttMarker.h>
#include <TArrayD.h>
#include <cmath>
#include <numeric>

#define NLAYERS 3
Expand Down Expand Up @@ -902,11 +903,11 @@ void EfficiencyStudy::countDuplicatedAfterCuts()
o2::math_utils::Point3D<float> clusOriginalPointGlob = mGeometry->getMatrixT2G(clusOriginal.getSensorID()) * clusOriginalPointTrack;
phiOriginal = clusOriginalPointGlob.phi(); // * 180 / M_PI;

if (abs(clusOriginalPointGlob.y()) < 0.5) { ///// excluding gap between bottom and top barrels
if (std::abs(clusOriginalPointGlob.y()) < 0.5) { ///// excluding gap between bottom and top barrels
continue;
}

if (abs(clusOriginalPointGlob.z()) >= 10) { /// excluding external z
if (std::abs(clusOriginalPointGlob.z()) >= 10) { /// excluding external z
continue;
}

Expand Down Expand Up @@ -1139,10 +1140,10 @@ void EfficiencyStudy::studyDCAcutsMC()
}
/// checking the DCA for 20 different sigma ranges
for (int i = 0; i < 20; i++) {
if (abs(dcaXY[layerDuplicated] - clusDuplicatedDCA[0]) < (i + 1) * sigmaDcaXY[layerDuplicated] && abs(dcaZ[layerDuplicated] - clusDuplicatedDCA[1]) < (i + 1) * sigmaDcaZ[layerDuplicated]) { // check if the DCA is within the cut i*sigma
if (std::abs(dcaXY[layerDuplicated] - clusDuplicatedDCA[0]) < (i + 1) * sigmaDcaXY[layerDuplicated] && std::abs(dcaZ[layerDuplicated] - clusDuplicatedDCA[1]) < (i + 1) * sigmaDcaZ[layerDuplicated]) { // check if the DCA is within the cut i*sigma

if (mVerboseOutput) {
LOGP(info, "Check DCA ok: {} < {}; {} < {}", abs(meanDCAxyDuplicated[layerDuplicated] - clusDuplicatedDCA[0]), (i + 1) * sigmaDCAxyDuplicated[layerDuplicated], abs(meanDCAzDuplicated[layerDuplicated] - clusDuplicatedDCA[1]), (i + 1) * sigmaDCAzDuplicated[layerDuplicated]);
LOGP(info, "Check DCA ok: {} < {}; {} < {}", std::abs(meanDCAxyDuplicated[layerDuplicated] - clusDuplicatedDCA[0]), (i + 1) * sigmaDCAxyDuplicated[layerDuplicated], std::abs(meanDCAzDuplicated[layerDuplicated] - clusDuplicatedDCA[1]), (i + 1) * sigmaDCAzDuplicated[layerDuplicated]);
}
nDCAMatches[i]++;
bool isGoodMatch = false;
Expand Down Expand Up @@ -2279,11 +2280,11 @@ void EfficiencyStudy::getEfficiency(bool isMC)
o2::math_utils::Point3D<float> clusOriginalPointGlob = mGeometry->getMatrixT2G(clusOriginal.getSensorID()) * clusOriginalPointTrack;
phiOriginal = clusOriginalPointGlob.phi(); // * 180 / M_PI;

if (abs(clusOriginalPointGlob.y()) < 0.5) { ///// excluding gap between bottom and top barrels
if (std::abs(clusOriginalPointGlob.y()) < 0.5) { ///// excluding gap between bottom and top barrels
continue;
}

if (abs(clusOriginalPointGlob.z()) >= 10) { /// excluding external z
if (std::abs(clusOriginalPointGlob.z()) >= 10) { /// excluding external z
continue;
}

Expand Down
3 changes: 2 additions & 1 deletion Detectors/TRD/calibration/src/TrackBasedCalib.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#include "CommonConstants/GeomConstants.h"
#include "DataFormatsTPC/TrackTPC.h"
#include "ReconstructionDataFormats/TrackTPCITS.h"
#include <cmath>
#include <fairlogger/Logger.h>

using namespace o2::trd;
Expand Down Expand Up @@ -149,7 +150,7 @@ int TrackBasedCalib::filldEdx(gsl::span<const TrackTRD>& tracks, bool isTPCTRD)
float tgl = trkIn.getTgl();
float snp = trkIn.getSnpAt(o2::math_utils::sector2Angle(trkltSec), trackletCalib.getX(), bz);

if (abs(snp) > 1.) {
if (std::abs(snp) > 1.) {
continue;
}

Expand Down
Loading