Skip to content

Please consider the following formatting changes to #15907 #15

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

Merged
maciacco merged 1 commit into from
Oct 7, 2026
Merged

Please consider the following formatting changes to #15907 #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion Detectors/Upgrades/ALICE3/IOTOF/DataFormatsIOTOF/include/DataFormatsIOTOF/Digit.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ struct DigitKey {
ULong64_t high;
UInt_t low;

bool operator<(const DigitKey& other) const {
bool operator<(const DigitKey& other) const
{
if (high != other.high) {
return high < other.high;
}
Expand Down
2 changes: 1 addition & 1 deletion Detectors/Upgrades/ALICE3/IOTOF/simulation/include/IOTOFSimulation/Chip.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ class Chip
protected:
Int_t mChipIndex = -1; ///< Chip ID
bool mDisabled = false; ///< Flag to indicate if the chip is disabled (e.g. due to dead channels)
std::map<DigitKey, o2::iotof::LabeledDigit> mDigits; ///< Map of fired digits, possibly in multiple frames
std::map<DigitKey, o2::iotof::LabeledDigit> mDigits; ///< Map of fired digits, possibly in multiple frames
std::vector<std::array<double, 2>> mTDCStates; ///< Vector of the last times the TDC pairs went busy

ClassDefNV(Chip, 1);
Expand Down
4 changes: 2 additions & 2 deletions Detectors/Upgrades/ALICE3/IOTOF/simulation/include/IOTOFSimulation/DPLDigitizerParam.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ struct DPLDigitizerParam : public o2::conf::ConfigurableParamHelper<DPLDigitizer
float energyToNElectrons = 1. / 3.6e-9; // conversion of eloss to Nelectrons
int responseMatrixSize = 1; ///< size of the response matrix (odd number)

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

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

Expand Down
7 changes: 2 additions & 5 deletions Detectors/Upgrades/ALICE3/IOTOF/simulation/src/Digitizer.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ void Digitizer::init()
LOG(info) << " Detection efficiency: " << digitizerParams.efficiency * 100 << " %";
LOG(info) << " Continuous mode: " << (mContinuous ? "ON" : "OFF");
sSegmentation = o2::iotof::Segmentation::Instance();

}

//_______________________________________________________________________
Expand Down Expand Up @@ -428,11 +427,9 @@ void Digitizer::fillOutputContainer()
if (digitTime - tdcStates[colInGroup][0] < digitizerParams.tdcBusyTime && digitTime - tdcStates[colInGroup][1] < digitizerParams.tdcBusyTime) {
// TODO: improve labels treatment if multiple hits cross the same pixel during
continue; // both tdc pairs are busy
}
else if (digitTime - tdcStates[colInGroup][0] > digitizerParams.tdcBusyTime) {
} else if (digitTime - tdcStates[colInGroup][0] > digitizerParams.tdcBusyTime) {
tdcStates[colInGroup][0] = digitTime;
}
else if (digitTime - tdcStates[colInGroup][1] > digitizerParams.tdcBusyTime) {
} else if (digitTime - tdcStates[colInGroup][1] > digitizerParams.tdcBusyTime) {
tdcStates[colInGroup][1] = digitTime;
}

Expand Down