From 8e1643c1b4aba40dd7932f207d7def4e0b6251ea Mon Sep 17 00:00:00 2001 From: Giulio Eulisse <10544+ktf@users.noreply.github.com> Date: Sat, 10 Aug 2024 16:33:29 +0200 Subject: [PATCH] Make it explicit we are currently using a signed char On x86 Linux `char` is assumed to be signed, however that's an implementation detail. This makes sure we are explicit about the sign-ness. --- .../ITS/base/include/ITSBase/GeometryTGeo.h | 28 +++++++++---------- .../PHOS/reconstruction/src/Clusterer.cxx | 8 +++--- .../TRD/base/include/TRDBase/ChamberStatus.h | 4 +-- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Detectors/ITSMFT/ITS/base/include/ITSBase/GeometryTGeo.h b/Detectors/ITSMFT/ITS/base/include/ITSBase/GeometryTGeo.h index 6172a02286abd..6d10a263408af 100644 --- a/Detectors/ITSMFT/ITS/base/include/ITSBase/GeometryTGeo.h +++ b/Detectors/ITSMFT/ITS/base/include/ITSBase/GeometryTGeo.h @@ -399,20 +399,20 @@ class GeometryTGeo : public o2::itsmft::GeometryTGeo protected: static constexpr int MAXLAYERS = 15; ///< max number of active layers - Int_t mNumberOfLayers; ///< number of layers - Int_t mNumberOfHalfBarrels; ///< number of halfbarrels - std::vector mNumberOfStaves; ///< number of staves/layer(layer) - std::vector mNumberOfHalfStaves; ///< the number of substaves/stave(layer) - std::vector mNumberOfModules; ///< number of modules/substave(layer) - std::vector mNumberOfChipsPerModule; ///< number of chips per module (group of chips on substaves) - std::vector mNumberOfChipRowsPerModule; ///< number of chips rows per module (relevant for OB modules) - std::vector mNumberOfChipsPerHalfStave; ///< number of chips per substave - std::vector mNumberOfChipsPerStave; ///< number of chips per stave - std::vector mNumberOfChipsPerHalfBarrel; ///< number of chips per halfbarrel - std::vector mNumberOfChipsPerLayer; ///< number of chips per stave - std::vector mLastChipIndex; ///< max ID of the detctor in the layer - std::array mIsLayerITS3; ///< flag with the information of the ITS version (ITS2 or ITS3) - std::array mLayerToWrapper; ///< Layer to wrapper correspondence + Int_t mNumberOfLayers; ///< number of layers + Int_t mNumberOfHalfBarrels; ///< number of halfbarrels + std::vector mNumberOfStaves; ///< number of staves/layer(layer) + std::vector mNumberOfHalfStaves; ///< the number of substaves/stave(layer) + std::vector mNumberOfModules; ///< number of modules/substave(layer) + std::vector mNumberOfChipsPerModule; ///< number of chips per module (group of chips on substaves) + std::vector mNumberOfChipRowsPerModule; ///< number of chips rows per module (relevant for OB modules) + std::vector mNumberOfChipsPerHalfStave; ///< number of chips per substave + std::vector mNumberOfChipsPerStave; ///< number of chips per stave + std::vector mNumberOfChipsPerHalfBarrel; ///< number of chips per halfbarrel + std::vector mNumberOfChipsPerLayer; ///< number of chips per stave + std::vector mLastChipIndex; ///< max ID of the detctor in the layer + std::array mIsLayerITS3; ///< flag with the information of the ITS version (ITS2 or ITS3) + std::array mLayerToWrapper; ///< Layer to wrapper correspondence std::vector mCacheRefX; ///< sensors tracking plane reference X std::vector mCacheRefAlpha; ///< sensors tracking plane reference alpha diff --git a/Detectors/PHOS/reconstruction/src/Clusterer.cxx b/Detectors/PHOS/reconstruction/src/Clusterer.cxx index 08b8ddfd234a5..a994b4df3fc62 100644 --- a/Detectors/PHOS/reconstruction/src/Clusterer.cxx +++ b/Detectors/PHOS/reconstruction/src/Clusterer.cxx @@ -235,7 +235,7 @@ void Clusterer::makeUnfolding(Cluster& clu, std::vector& clusters, std: return; } - char nMax = getNumberOfLocalMax(clu, cluelements); + int8_t nMax = getNumberOfLocalMax(clu, cluelements); if (nMax > 1) { unfoldOneCluster(clu, nMax, clusters, cluelements); } else { @@ -250,7 +250,7 @@ void Clusterer::makeUnfolding(Cluster& clu, std::vector& clusters, std: } } //____________________________________________________________________________ -void Clusterer::unfoldOneCluster(Cluster& iniClu, char nMax, std::vector& clusters, std::vector& cluelements) +void Clusterer::unfoldOneCluster(Cluster& iniClu, int8_t nMax, std::vector& clusters, std::vector& cluelements) { // Performs the unfolding of a cluster with nMax overlapping showers // Parameters: iniClu cluster to be unfolded @@ -668,8 +668,8 @@ char Clusterer::getNumberOfLocalMax(Cluster& clu, std::vector& cluel } } } // if areneighbours - } // digit j - } // digit i + } // digit j + } // digit i int iDigitN = 0; for (std::size_t i = 0; i < mIsLocalMax.size(); i++) { diff --git a/Detectors/TRD/base/include/TRDBase/ChamberStatus.h b/Detectors/TRD/base/include/TRDBase/ChamberStatus.h index b5e1afd9d98f9..ab0128f0a4b11 100644 --- a/Detectors/TRD/base/include/TRDBase/ChamberStatus.h +++ b/Detectors/TRD/base/include/TRDBase/ChamberStatus.h @@ -46,7 +46,7 @@ class ChamberStatus ChamberStatus() = default; ~ChamberStatus() = default; // - char getStatus(int det) const { return mStatus[det]; } + int8_t getStatus(int det) const { return mStatus[det]; } void setStatus(int det, char bit); void setRawStatus(int det, char status) { mStatus[det] = status; }; bool isGood(int det) const { return (mStatus[det] & Good); } @@ -61,7 +61,7 @@ class ChamberStatus TH2D* plotBadCalibrated(int sm, int rphi); // Plot calibration status for sm and halfchamberside TH2D* plot(int sm); // Plot mStatus for sm private: - std::array mStatus{}; + std::array mStatus{}; ClassDefNV(ChamberStatus, 1); }; } // namespace trd