Skip to content

Commit 4dee152

Browse files
authored
Merge pull request #15 from alibuild/alibot-cleanup-15907
Please consider the following formatting changes to #15907
2 parents 538b04f + 50552f6 commit 4dee152

4 files changed

Lines changed: 7 additions & 9 deletions

File tree

‎Detectors/Upgrades/ALICE3/IOTOF/DataFormatsIOTOF/include/DataFormatsIOTOF/Digit.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ struct DigitKey {
2929
ULong64_t high;
3030
UInt_t low;
3131

32-
bool operator<(const DigitKey& other) const {
32+
bool operator<(const DigitKey& other) const
33+
{
3334
if (high != other.high) {
3435
return high < other.high;
3536
}

‎Detectors/Upgrades/ALICE3/IOTOF/simulation/include/IOTOFSimulation/Chip.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ class Chip
8585
protected:
8686
Int_t mChipIndex = -1; ///< Chip ID
8787
bool mDisabled = false; ///< Flag to indicate if the chip is disabled (e.g. due to dead channels)
88-
std::map<DigitKey, o2::iotof::LabeledDigit> mDigits; ///< Map of fired digits, possibly in multiple frames
88+
std::map<DigitKey, o2::iotof::LabeledDigit> mDigits; ///< Map of fired digits, possibly in multiple frames
8989
std::vector<std::array<double, 2>> mTDCStates; ///< Vector of the last times the TDC pairs went busy
9090

9191
ClassDefNV(Chip, 1);

‎Detectors/Upgrades/ALICE3/IOTOF/simulation/include/IOTOFSimulation/DPLDigitizerParam.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ struct DPLDigitizerParam : public o2::conf::ConfigurableParamHelper<DPLDigitizer
3838
float energyToNElectrons = 1. / 3.6e-9; // conversion of eloss to Nelectrons
3939
int responseMatrixSize = 1; ///< size of the response matrix (odd number)
4040

41-
int nColsPerGroup = 4; ///< number of pixel columns grouped into a readout column
42-
double tdcBusyTime = 0.100f; ///< tdc pair bsuy time (default 100 ps)
41+
int nColsPerGroup = 4; ///< number of pixel columns grouped into a readout column
42+
double tdcBusyTime = 0.100f; ///< tdc pair bsuy time (default 100 ps)
4343

4444
std::string noiseFilePath{}; ///< optional noise masks file path. FIXME to be removed once switch to CCDBFetcher
4545

‎Detectors/Upgrades/ALICE3/IOTOF/simulation/src/Digitizer.cxx‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ void Digitizer::init()
7676
LOG(info) << " Detection efficiency: " << digitizerParams.efficiency * 100 << " %";
7777
LOG(info) << " Continuous mode: " << (mContinuous ? "ON" : "OFF");
7878
sSegmentation = o2::iotof::Segmentation::Instance();
79-
8079
}
8180

8281
//_______________________________________________________________________
@@ -428,11 +427,9 @@ void Digitizer::fillOutputContainer()
428427
if (digitTime - tdcStates[colInGroup][0] < digitizerParams.tdcBusyTime && digitTime - tdcStates[colInGroup][1] < digitizerParams.tdcBusyTime) {
429428
// TODO: improve labels treatment if multiple hits cross the same pixel during
430429
continue; // both tdc pairs are busy
431-
}
432-
else if (digitTime - tdcStates[colInGroup][0] > digitizerParams.tdcBusyTime) {
430+
} else if (digitTime - tdcStates[colInGroup][0] > digitizerParams.tdcBusyTime) {
433431
tdcStates[colInGroup][0] = digitTime;
434-
}
435-
else if (digitTime - tdcStates[colInGroup][1] > digitizerParams.tdcBusyTime) {
432+
} else if (digitTime - tdcStates[colInGroup][1] > digitizerParams.tdcBusyTime) {
436433
tdcStates[colInGroup][1] = digitTime;
437434
}
438435

0 commit comments

Comments
 (0)