Skip to content

Commit f8bbb33

Browse files
committed
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.
1 parent 0abf8fb commit f8bbb33

3 files changed

Lines changed: 20 additions & 20 deletions

File tree

Detectors/ITSMFT/ITS/base/include/ITSBase/GeometryTGeo.h

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -399,20 +399,20 @@ class GeometryTGeo : public o2::itsmft::GeometryTGeo
399399
protected:
400400
static constexpr int MAXLAYERS = 15; ///< max number of active layers
401401

402-
Int_t mNumberOfLayers; ///< number of layers
403-
Int_t mNumberOfHalfBarrels; ///< number of halfbarrels
404-
std::vector<int> mNumberOfStaves; ///< number of staves/layer(layer)
405-
std::vector<int> mNumberOfHalfStaves; ///< the number of substaves/stave(layer)
406-
std::vector<int> mNumberOfModules; ///< number of modules/substave(layer)
407-
std::vector<int> mNumberOfChipsPerModule; ///< number of chips per module (group of chips on substaves)
408-
std::vector<int> mNumberOfChipRowsPerModule; ///< number of chips rows per module (relevant for OB modules)
409-
std::vector<int> mNumberOfChipsPerHalfStave; ///< number of chips per substave
410-
std::vector<int> mNumberOfChipsPerStave; ///< number of chips per stave
411-
std::vector<int> mNumberOfChipsPerHalfBarrel; ///< number of chips per halfbarrel
412-
std::vector<int> mNumberOfChipsPerLayer; ///< number of chips per stave
413-
std::vector<int> mLastChipIndex; ///< max ID of the detctor in the layer
414-
std::array<bool, MAXLAYERS> mIsLayerITS3; ///< flag with the information of the ITS version (ITS2 or ITS3)
415-
std::array<char, MAXLAYERS> mLayerToWrapper; ///< Layer to wrapper correspondence
402+
Int_t mNumberOfLayers; ///< number of layers
403+
Int_t mNumberOfHalfBarrels; ///< number of halfbarrels
404+
std::vector<int> mNumberOfStaves; ///< number of staves/layer(layer)
405+
std::vector<int> mNumberOfHalfStaves; ///< the number of substaves/stave(layer)
406+
std::vector<int> mNumberOfModules; ///< number of modules/substave(layer)
407+
std::vector<int> mNumberOfChipsPerModule; ///< number of chips per module (group of chips on substaves)
408+
std::vector<int> mNumberOfChipRowsPerModule; ///< number of chips rows per module (relevant for OB modules)
409+
std::vector<int> mNumberOfChipsPerHalfStave; ///< number of chips per substave
410+
std::vector<int> mNumberOfChipsPerStave; ///< number of chips per stave
411+
std::vector<int> mNumberOfChipsPerHalfBarrel; ///< number of chips per halfbarrel
412+
std::vector<int> mNumberOfChipsPerLayer; ///< number of chips per stave
413+
std::vector<int> mLastChipIndex; ///< max ID of the detctor in the layer
414+
std::array<bool, MAXLAYERS> mIsLayerITS3; ///< flag with the information of the ITS version (ITS2 or ITS3)
415+
std::array<int8_t, MAXLAYERS> mLayerToWrapper; ///< Layer to wrapper correspondence
416416

417417
std::vector<float> mCacheRefX; ///< sensors tracking plane reference X
418418
std::vector<float> mCacheRefAlpha; ///< sensors tracking plane reference alpha

Detectors/PHOS/reconstruction/src/Clusterer.cxx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ void Clusterer::makeUnfolding(Cluster& clu, std::vector<Cluster>& clusters, std:
235235
return;
236236
}
237237

238-
char nMax = getNumberOfLocalMax(clu, cluelements);
238+
int8_t nMax = getNumberOfLocalMax(clu, cluelements);
239239
if (nMax > 1) {
240240
unfoldOneCluster(clu, nMax, clusters, cluelements);
241241
} else {
@@ -250,7 +250,7 @@ void Clusterer::makeUnfolding(Cluster& clu, std::vector<Cluster>& clusters, std:
250250
}
251251
}
252252
//____________________________________________________________________________
253-
void Clusterer::unfoldOneCluster(Cluster& iniClu, char nMax, std::vector<Cluster>& clusters, std::vector<CluElement>& cluelements)
253+
void Clusterer::unfoldOneCluster(Cluster& iniClu, int8_t nMax, std::vector<Cluster>& clusters, std::vector<CluElement>& cluelements)
254254
{
255255
// Performs the unfolding of a cluster with nMax overlapping showers
256256
// Parameters: iniClu cluster to be unfolded
@@ -668,8 +668,8 @@ char Clusterer::getNumberOfLocalMax(Cluster& clu, std::vector<CluElement>& cluel
668668
}
669669
}
670670
} // if areneighbours
671-
} // digit j
672-
} // digit i
671+
} // digit j
672+
} // digit i
673673

674674
int iDigitN = 0;
675675
for (std::size_t i = 0; i < mIsLocalMax.size(); i++) {

Detectors/TRD/base/include/TRDBase/ChamberStatus.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class ChamberStatus
4646
ChamberStatus() = default;
4747
~ChamberStatus() = default;
4848
//
49-
char getStatus(int det) const { return mStatus[det]; }
49+
int8_t getStatus(int det) const { return mStatus[det]; }
5050
void setStatus(int det, char bit);
5151
void setRawStatus(int det, char status) { mStatus[det] = status; };
5252
bool isGood(int det) const { return (mStatus[det] & Good); }
@@ -61,7 +61,7 @@ class ChamberStatus
6161
TH2D* plotBadCalibrated(int sm, int rphi); // Plot calibration status for sm and halfchamberside
6262
TH2D* plot(int sm); // Plot mStatus for sm
6363
private:
64-
std::array<char, constants::MAXCHAMBER> mStatus{};
64+
std::array<int8_t, constants::MAXCHAMBER> mStatus{};
6565
ClassDefNV(ChamberStatus, 1);
6666
};
6767
} // namespace trd

0 commit comments

Comments
 (0)