Skip to content

Please consider the following formatting changes to #15466 #4

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
spulawsk merged 1 commit into from
Jun 1, 2026
Merged

Please consider the following formatting changes to #15466 #4

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
4 changes: 2 additions & 2 deletions Detectors/FIT/FT0/base/include/FT0Base/FT0DigParam.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,14 @@ struct FT0DigParam : o2::conf::ConfigurableParamHelper<FT0DigParam> {
float mNoiseVar = 0.1; // noise level
float mNoisePeriod = 1 / 0.9; // GHz low frequency noise period;
short mTime_trg_gate = 153; // #channels as in TCM as in Pilot beams ('OR gate' setting in TCM tab in ControlServer)
short mTime_trg_vertex_gate = 100; // #channels as in TCM for VTX trigger
short mTime_trg_vertex_gate = 100; // #channels as in TCM for VTX trigger
float mAmpThresholdForReco = 5; // only channels with amplitude higher will participate in calibration and collision time: 0.3 MIP
short mTimeThresholdForReco = 1000; // only channels with time below will participate in calibration and collision time

float mMV_2_Nchannels = 2.; // amplitude channel 7 mV ->14channels
float mMV_2_NchannelsInverse = 0.5; // inverse amplitude channel 7 mV ->14channels (nowhere used)

float Cross_Talk_Frac = 0.10f; // Crosstalk between channels
float Cross_Talk_Frac = 0.10f; // Crosstalk between channels
float mAmpThresholdForCrossTalkDigit = 5.f; // Treshold for low crosstalk signals

O2ParamDef(FT0DigParam, "FT0DigParam");
Expand Down
25 changes: 11 additions & 14 deletions Detectors/FIT/FT0/simulation/src/Digitizer.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,14 +411,12 @@ void Digitizer::storeBC(BCCache& bc,
std::vector<int> chChain(params.mMCPs, 0);
std::vector<bool> chValid(params.mMCPs, false);

static const std::array<std::array<int, 3>, 4> localNeighbours = {{
{{1, 2, 3}},
{{0, 3, 2}},
{{0, 3, 1}},
{{1, 2, 0}}
}};

// std::set<int> disabledChannels = {40, 41, 42, 43, 88, 89, 90, 91, 56, 57, 58, 59, 60, 61, 62, 63, 72, 73, 74, 75, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 164, 165, 166, 167, 184, 185, 186, 187, 160, 161, 162, 163, 188, 189, 190, 191, 156, 157, 158, 159, 192, 193, 194, 195, 152, 153, 154, 155, 196, 197, 198, 199, 148, 149, 150, 151, 144, 145, 146, 147, 204, 205, 206, 207, 200, 201, 202, 203}; // przykładowe kanały
static const std::array<std::array<int, 3>, 4> localNeighbours = {{{{1, 2, 3}},
{{0, 3, 2}},
{{0, 3, 1}},
{{1, 2, 0}}}};

// std::set<int> disabledChannels = {40, 41, 42, 43, 88, 89, 90, 91, 56, 57, 58, 59, 60, 61, 62, 63, 72, 73, 74, 75, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 164, 165, 166, 167, 184, 185, 186, 187, 160, 161, 162, 163, 188, 189, 190, 191, 156, 157, 158, 159, 192, 193, 194, 195, 152, 153, 154, 155, 196, 197, 198, 199, 148, 149, 150, 151, 144, 145, 146, 147, 204, 205, 206, 207, 200, 201, 202, 203}; // przykładowe kanały
for (Int_t ipmt = 0; ipmt < params.mMCPs; ++ipmt) {
auto channel_begin = channel_end;
channel_end = std::find_if(channel_begin, particles.end(),
Expand Down Expand Up @@ -451,9 +449,9 @@ void Digitizer::storeBC(BCCache& bc,
if (amp > 4095.f) {
amp = 4095.f;
}
// if (!disabledChannels.count(ipmt)) {
// continue;
// }
// if (!disabledChannels.count(ipmt)) {
// continue;
// }

LOG(debug) << mEventID << " bc " << firstBCinDeque.bc << " orbit " << firstBCinDeque.orbit
<< ", ipmt " << ipmt << ", smeared_time " << smeared_time
Expand Down Expand Up @@ -506,7 +504,6 @@ void Digitizer::storeBC(BCCache& bc,
chTime[diag] = chTime[src];
chChain[diag] = chChain[src];
}

}
}

Expand All @@ -522,8 +519,8 @@ void Digitizer::storeBC(BCCache& bc,
const bool hasPrimarySignal = (baseAmp[ipmt] > 0.f);
const bool isCrossTalkOnly = (!hasPrimarySignal && amp > 0.f);

if (isCrossTalkOnly && amp < params.mAmpThresholdForCrossTalkDigit) {
continue;
if (isCrossTalkOnly && amp < params.mAmpThresholdForCrossTalkDigit) {
continue;
}

const int smeared_time = chTime[ipmt];
Expand Down