From f6bf2c43a1a11138785f62cc2f82cafbc05472d8 Mon Sep 17 00:00:00 2001 From: Vakho Tsulaia <tsulaia@cern.ch> Date: Wed, 16 Apr 2025 09:44:58 -0700 Subject: [PATCH] GeoDiamondSurface+GeoTrapezoidSurface: fixed cppcheck warnings Logical conjunction always evaluates to false --- GeoModelCore/GeoModelKernel/GeoModelKernel/throwExcept.h | 8 ++++---- GeoModelCore/GeoModelKernel/src/GeoDiamondSurface.cxx | 6 ++---- GeoModelCore/GeoModelKernel/src/GeoTrapezoidSurface.cxx | 6 ++---- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/GeoModelCore/GeoModelKernel/GeoModelKernel/throwExcept.h b/GeoModelCore/GeoModelKernel/GeoModelKernel/throwExcept.h index 82d3ae0ae..f52bc4540 100644 --- a/GeoModelCore/GeoModelKernel/GeoModelKernel/throwExcept.h +++ b/GeoModelCore/GeoModelKernel/GeoModelKernel/throwExcept.h @@ -1,8 +1,8 @@ /* - Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration */ -#ifndef GeoModelHelpers_THROWEXCEPT_H -#define GeoModelHelpers_THROWEXCEPT_H +#ifndef GEOMODELKERNEL_THROWEXCEPT_H +#define GEOMODELKERNEL_THROWEXCEPT_H #include <exception> #include <sstream> @@ -14,4 +14,4 @@ except_str<<MESSAGE; \ throw std::runtime_error(except_str.str()); \ } -#endif \ No newline at end of file +#endif diff --git a/GeoModelCore/GeoModelKernel/src/GeoDiamondSurface.cxx b/GeoModelCore/GeoModelKernel/src/GeoDiamondSurface.cxx index e4d04b77c..fe90d95bc 100644 --- a/GeoModelCore/GeoModelKernel/src/GeoDiamondSurface.cxx +++ b/GeoModelCore/GeoModelKernel/src/GeoDiamondSurface.cxx @@ -27,10 +27,8 @@ bool GeoDiamondSurface::isOnSurface (const double Px, const double Py, const dou double Pp_y = P_prime_4d[1]; double Pp_z = P_prime_4d[2]; - if(Pp_z != 0 && Pp_z > 1e-5 && Pp_z < -1e-5){ - // now I take tolerance as 1e-5 - return false; - } + // now I take tolerance as 1e-5 + if(std::abs(Pp_z) > 1e-5) return false; double x_bot = this -> getXbottomHalf(); double y_bot = this -> getYbottomHalf(); double x_mid = this -> getXmidHalf(); diff --git a/GeoModelCore/GeoModelKernel/src/GeoTrapezoidSurface.cxx b/GeoModelCore/GeoModelKernel/src/GeoTrapezoidSurface.cxx index 0ce90f5bc..8809eb68d 100644 --- a/GeoModelCore/GeoModelKernel/src/GeoTrapezoidSurface.cxx +++ b/GeoModelCore/GeoModelKernel/src/GeoTrapezoidSurface.cxx @@ -25,10 +25,8 @@ bool GeoTrapezoidSurface::isOnSurface (const double Px, const double Py, const d double Pp_y = P_prime_4d[1]; double Pp_z = P_prime_4d[2]; - if(Pp_z != 0 && Pp_z > 1e-5 && Pp_z < -1e-5){ - // now I take tolerance as 1e-5 - return false; - } + // now I take tolerance as 1e-5 + if(std::abs(Pp_z) > 1e-5) return false; double half_x_max = this -> getXHalfLengthMax(); double half_x_min = this -> getXHalfLengthMin(); -- GitLab