Skip to content
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.

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

Please consider the following formatting changes to #13367 #297

Open
wants to merge 1 commit into
base: pr13367
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions DataFormats/Detectors/CPV/include/DataFormatsCPV/Cluster.h
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,13 @@ class Cluster
posZ = mLocalPosZ;
}
[[nodiscard]] uint8_t getMultiplicity() const { return mMulDigit; } // gets the number of digits making this recpoint
// 0: was no unfolging, -1: unfolding failed
[[nodiscard]] int8_t getModule() const { return mModule; } // CPV module of a current cluster
// 0: was no unfolging, -1: unfolding failed
[[nodiscard]] int8_t getModule() const { return mModule; } // CPV module of a current cluster

// 0: was no unfolging, -1: unfolding failed
void setNExMax(int8_t nmax = 1) { mNExMax = nmax; }
[[nodiscard]] int8_t getNExMax() const { return mNExMax; } // Number of maxima found in cluster in unfolding:
// 0: was no unfolging, -1: unfolding failed
// 0: was no unfolging, -1: unfolding failed

// raw access for CTF encoding
[[nodiscard]] uint16_t getPackedPosX() const { return uint16_t((mLocalPosX - kMinX) / kStepX); }
Expand Down Expand Up @@ -110,8 +110,8 @@ class Cluster

protected:
unsigned char mMulDigit = 0; ///< Digit nultiplicity
int8_t mModule = 0; ///< Module number
int8_t mNExMax = -1; ///< number of (Ex-)maxima before unfolding
int8_t mModule = 0; ///< Module number
int8_t mNExMax = -1; ///< number of (Ex-)maxima before unfolding
float mLocalPosX = 0.; ///< Center of gravity position in local module coordunates (phi direction)
float mLocalPosZ = 0.; ///< Center of gravity position in local module coordunates (z direction)
float mEnergy = 0.; ///< full energy of a cluster
Expand Down
8 changes: 4 additions & 4 deletions DataFormats/Detectors/PHOS/include/DataFormatsPHOS/Cluster.h
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ class Cluster
// 0: was no unfolging, -1: unfolding failed
void setNExMax(int8_t nmax = 1) { mNExMax = nmax; }
int8_t getNExMax() const { return mNExMax; } // Number of maxima found in cluster in unfolding:
// 0: was no unfolging, -1: unfolding failed
// 0: was no unfolging, -1: unfolding failed
int8_t module() const { return mModule; } // PHOS module of a current cluster
void setModule(int8_t mod) { mModule = mod; } // set PHOS module of a current cluster

Expand All @@ -110,9 +110,9 @@ class Cluster
// std::vector<Digit>::const_iterator BinarySearch(const std::vector<Digit>* container, Digit& element);

protected:
int8_t mModule = 0; ///< Module number
int8_t mNExMax = -1; ///< number of (Ex-)maxima before unfolding
int8_t mFiredTrigger = 0; ///< matched with PHOS trigger: 0 no match, bit 1 with 2x2, bit 2 with 4x4
int8_t mModule = 0; ///< Module number
int8_t mNExMax = -1; ///< number of (Ex-)maxima before unfolding
int8_t mFiredTrigger = 0; ///< matched with PHOS trigger: 0 no match, bit 1 with 2x2, bit 2 with 4x4
uint32_t mFirstCluElement = -1; ///< index of the first contributing CluElement in a list
uint32_t mLastCluElement = -1; ///< index of the last contributing CluElement in a list
float mLocalPosX = 0.; ///< Center of gravity position in local module coordunates (phi direction)
Expand Down
4 changes: 2 additions & 2 deletions DataFormats/Detectors/PHOS/src/CalibParams.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ bool CalibParams::setGain(TH2* h, int8_t module)
bool CalibParams::setHGLGRatio(TH2* h, int8_t module)
{
const int8_t MAXX = 64,
MAXZ = 56;
MAXZ = 56;
if (module < 1 || module > 4) {
LOG(error) << "module " << module << "does not exist";
return false;
Expand Down Expand Up @@ -105,7 +105,7 @@ bool CalibParams::setHGLGRatio(TH2* h, int8_t module)
bool CalibParams::setHGTimeCalib(TH2* h, int8_t module)
{
const int8_t MAXX = 64,
MAXZ = 56;
MAXZ = 56;
if (module < 1 || module > 4) {
LOG(error) << "module " << module << "does not exist";
return false;
Expand Down
2 changes: 1 addition & 1 deletion Detectors/Align/include/Align/AlignableVolume.h
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ class AlignableVolume : public DOFSet
bool mIsDummy = false; // placeholder (e.g. inactive), used to have the numbering corresponding to position in the container
bool mIsDummyEnvelope = false; // some volumes are dummy envelopes for their children
//
int8_t mNDOFGeomFree = 0; // number of free geom degrees of freedom
int8_t mNDOFGeomFree = 0; // number of free geom degrees of freedom
uint8_t mConstrChild = 0; // bitpattern for constraints on children corrections
//
AlignableVolume* mParent = nullptr; // parent volume
Expand Down
2 changes: 1 addition & 1 deletion Detectors/PHOS/base/include/PHOSBase/Geometry.h
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ class Geometry
// relid[0] = PHOS Module number 1:module
// relid[1] = Row number inside a PHOS module (Phi coordinate)
// relid[2] = Column number inside a PHOS module (Z coordinate)
static bool absToRelNumbering(short absId, int8_t * relid);
static bool absToRelNumbering(short absId, int8_t* relid);
static int8_t absIdToModule(short absId);
static void absIdToRelPosInModule(short absId, float& x, float& z);
static void relPosToRelId(short module, float x, float z, int8_t* relId);
Expand Down
4 changes: 2 additions & 2 deletions Detectors/PHOS/reconstruction/src/Clusterer.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -668,8 +668,8 @@ int8_t Clusterer::getNumberOfLocalMax(Cluster& clu, std::vector<CluElement>& clu
}
}
} // if areneighbours
} // digit j
} // digit i
} // digit j
} // digit i

int iDigitN = 0;
for (std::size_t i = 0; i < mIsLocalMax.size(); i++) {
Expand Down
Loading