Skip to content

Please consider the following formatting changes to #13375 #299

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

Closed
alibuild wants to merge 2 commits into from
Closed

Please consider the following formatting changes to #13375 #299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e1643c
Make it explicit we are currently using a signed char
ktf Aug 10, 2024
01229b5
Please consider the following formatting changes
alibuild Aug 13, 2024
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
28 changes: 14 additions & 14 deletions Detectors/ITSMFT/ITS/base/include/ITSBase/GeometryTGeo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<int> mNumberOfStaves; ///< number of staves/layer(layer)
std::vector<int> mNumberOfHalfStaves; ///< the number of substaves/stave(layer)
std::vector<int> mNumberOfModules; ///< number of modules/substave(layer)
std::vector<int> mNumberOfChipsPerModule; ///< number of chips per module (group of chips on substaves)
std::vector<int> mNumberOfChipRowsPerModule; ///< number of chips rows per module (relevant for OB modules)
std::vector<int> mNumberOfChipsPerHalfStave; ///< number of chips per substave
std::vector<int> mNumberOfChipsPerStave; ///< number of chips per stave
std::vector<int> mNumberOfChipsPerHalfBarrel; ///< number of chips per halfbarrel
std::vector<int> mNumberOfChipsPerLayer; ///< number of chips per stave
std::vector<int> mLastChipIndex; ///< max ID of the detctor in the layer
std::array<bool, MAXLAYERS> mIsLayerITS3; ///< flag with the information of the ITS version (ITS2 or ITS3)
std::array<char, MAXLAYERS> mLayerToWrapper; ///< Layer to wrapper correspondence
Int_t mNumberOfLayers; ///< number of layers
Int_t mNumberOfHalfBarrels; ///< number of halfbarrels
std::vector<int> mNumberOfStaves; ///< number of staves/layer(layer)
std::vector<int> mNumberOfHalfStaves; ///< the number of substaves/stave(layer)
std::vector<int> mNumberOfModules; ///< number of modules/substave(layer)
std::vector<int> mNumberOfChipsPerModule; ///< number of chips per module (group of chips on substaves)
std::vector<int> mNumberOfChipRowsPerModule; ///< number of chips rows per module (relevant for OB modules)
std::vector<int> mNumberOfChipsPerHalfStave; ///< number of chips per substave
std::vector<int> mNumberOfChipsPerStave; ///< number of chips per stave
std::vector<int> mNumberOfChipsPerHalfBarrel; ///< number of chips per halfbarrel
std::vector<int> mNumberOfChipsPerLayer; ///< number of chips per stave
std::vector<int> mLastChipIndex; ///< max ID of the detctor in the layer
std::array<bool, MAXLAYERS> mIsLayerITS3; ///< flag with the information of the ITS version (ITS2 or ITS3)
std::array<int8_t, MAXLAYERS> mLayerToWrapper; ///< Layer to wrapper correspondence

std::vector<float> mCacheRefX; ///< sensors tracking plane reference X
std::vector<float> mCacheRefAlpha; ///< sensors tracking plane reference alpha
Expand Down
4 changes: 2 additions & 2 deletions Detectors/PHOS/reconstruction/src/Clusterer.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ void Clusterer::makeUnfolding(Cluster& clu, std::vector<Cluster>& clusters, std:
return;
}

char nMax = getNumberOfLocalMax(clu, cluelements);
int8_t nMax = getNumberOfLocalMax(clu, cluelements);
if (nMax > 1) {
unfoldOneCluster(clu, nMax, clusters, cluelements);
} else {
Expand All @@ -250,7 +250,7 @@ void Clusterer::makeUnfolding(Cluster& clu, std::vector<Cluster>& clusters, std:
}
}
//____________________________________________________________________________
void Clusterer::unfoldOneCluster(Cluster& iniClu, char nMax, std::vector<Cluster>& clusters, std::vector<CluElement>& cluelements)
void Clusterer::unfoldOneCluster(Cluster& iniClu, int8_t nMax, std::vector<Cluster>& clusters, std::vector<CluElement>& cluelements)
{
// Performs the unfolding of a cluster with nMax overlapping showers
// Parameters: iniClu cluster to be unfolded
Expand Down
4 changes: 2 additions & 2 deletions Detectors/TRD/base/include/TRDBase/ChamberStatus.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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); }
Expand All @@ -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<char, constants::MAXCHAMBER> mStatus{};
std::array<int8_t, constants::MAXCHAMBER> mStatus{};
ClassDefNV(ChamberStatus, 1);
};
} // namespace trd
Expand Down