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.

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

TPG accumulator initialization fix #183

Merged
merged 3 commits into from
Jun 4, 2024
Merged

TPG accumulator initialization fix #183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
553a910
Redefine Running Sum ADC Data
aeoranday May 23, 2024
5cd1492
Redefine Naive RS ADC Data
aeoranday May 23, 2024
3a8d2fd
Set accumulator, charge, tot values to 0 at initialisation
May 28, 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
6 changes: 3 additions & 3 deletions include/fdreadoutlibs/wibeth/tpg/ProcessAbsRSAVX2.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ process_window_rs_avx2(ProcessingInfo<NREGISTERS>& info)
// Really want an epi16 version of this, but the cmpgt and
// cmplt functions set their epi16 parts to 0xff or 0x0,
// so treating everything as epi8 works the same
__m256i to_add_charge = _mm256_blendv_epi8(_mm256_set1_epi16(0), s, is_over);
__m256i to_add_charge = _mm256_blendv_epi8(_mm256_set1_epi16(0), RS, is_over);
hit_charge = _mm256_adds_epi16(hit_charge, to_add_charge);

// Avoid overflow of the hit charge, if needed in practice
Expand All @@ -217,8 +217,8 @@ process_window_rs_avx2(ProcessingInfo<NREGISTERS>& info)
//}

// 1. Calculation of the hit peak time and ADC
__m256i is_sample_over_adc_peak = _mm256_cmpgt_epi16(s, hit_peak_adc);
hit_peak_adc = _mm256_blendv_epi8(hit_peak_adc, s, is_sample_over_adc_peak);
__m256i is_sample_over_adc_peak = _mm256_cmpgt_epi16(RS, hit_peak_adc);
hit_peak_adc = _mm256_blendv_epi8(hit_peak_adc, RS, is_sample_over_adc_peak);
hit_peak_time = _mm256_blendv_epi8(hit_peak_time, hit_tover, is_sample_over_adc_peak);

// 2. Update of the hit time over threshold
Expand Down
6 changes: 3 additions & 3 deletions include/fdreadoutlibs/wibeth/tpg/ProcessNaiveRS.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,10 +121,10 @@ process_window_naive_RS(ProcessingInfo<NREGISTERS>& info)
if (is_over) {
// Simulate saturated add
int32_t tmp_charge = hit_charge;
tmp_charge += sample;
tmp_charge += RS;
tmp_charge = std::min(tmp_charge, (int32_t)std::numeric_limits<int16_t>::max());
if (sample > hit_peak_adc) {
hit_peak_adc = (uint16_t)sample;
if (RS > hit_peak_adc) {
hit_peak_adc = (uint16_t)RS;
hit_peak_time = hit_tover;
}
hit_charge = (int16_t)tmp_charge;
Expand Down
6 changes: 3 additions & 3 deletions include/fdreadoutlibs/wibeth/tpg/ProcessStandardRSAVX2.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ process_window_standard_rs_avx2(ProcessingInfo<NREGISTERS>& info)
// Really want an epi16 version of this, but the cmpgt and
// cmplt functions set their epi16 parts to 0xff or 0x0,
// so treating everything as epi8 works the same
__m256i to_add_charge = _mm256_blendv_epi8(_mm256_set1_epi16(0), s, is_over);
__m256i to_add_charge = _mm256_blendv_epi8(_mm256_set1_epi16(0), RS, is_over);
hit_charge = _mm256_adds_epi16(hit_charge, to_add_charge);

// Avoid overflow of the hit charge, if needed in practice
Expand All @@ -211,8 +211,8 @@ process_window_standard_rs_avx2(ProcessingInfo<NREGISTERS>& info)
//}

// 1. Calculation of the hit peak time and ADC
__m256i is_sample_over_adc_peak = _mm256_cmpgt_epi16(s, hit_peak_adc);
hit_peak_adc = _mm256_blendv_epi8(hit_peak_adc, s, is_sample_over_adc_peak);
__m256i is_sample_over_adc_peak = _mm256_cmpgt_epi16(RS, hit_peak_adc);
hit_peak_adc = _mm256_blendv_epi8(hit_peak_adc, RS, is_sample_over_adc_peak);
hit_peak_time = _mm256_blendv_epi8(hit_peak_time, hit_tover, is_sample_over_adc_peak);

// 2. Update of the hit time over threshold
Expand Down
4 changes: 4 additions & 0 deletions include/fdreadoutlibs/wibeth/tpg/ProcessingInfo.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,10 @@ struct ProcessingInfo

// Set the pedestals and the 25/75-percentiles
chanState.pedestals[j] = ped;
chanState.accum[j] = 0;
chanState.hit_tover[j] = 0;
chanState.hit_charge[j] = 0;

chanState.pedestalsRS[j] = 0;
chanState.RS[j] = 0;
// AAA: Quantiles are set to the pedestal value +/- 20 so that the IQR
Expand Down