Skip to content

Commit 3575466

Browse files
author
Arthur Glowacki
committed
Changed logic of loading integrated spectra to alway sum elt, srt, icr, and ocr
1 parent 9a18f91 commit 3575466

File tree

1 file changed

+4
-15
lines changed

1 file changed

+4
-15
lines changed

src/io/file/netcdf_io.cpp

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -428,23 +428,12 @@ size_t NetCDF_IO<T_real>::_load_spectra(E_load_type ltype,
428428
}
429429
}
430430

431-
432431
if (ltype == E_load_type::INTEGRATED)
433432
{
434-
if(cur_row == 0) //first spectra row being loaded
435-
{
436-
spectra->elapsed_livetime(sum_elapsed_livetime);
437-
spectra->elapsed_realtime(sum_elapsed_realtime);
438-
spectra->input_counts(sum_input_counts);
439-
spectra->output_counts(sum_output_counts);
440-
}
441-
else
442-
{
443-
spectra->elapsed_livetime(spectra->elapsed_livetime() + sum_elapsed_livetime);
444-
spectra->elapsed_realtime(spectra->elapsed_realtime() + sum_elapsed_realtime);
445-
spectra->input_counts(spectra->input_counts() + sum_input_counts);
446-
spectra->output_counts(spectra->output_counts() + sum_output_counts);
447-
}
433+
spectra->elapsed_livetime(spectra->elapsed_livetime() + sum_elapsed_livetime);
434+
spectra->elapsed_realtime(spectra->elapsed_realtime() + sum_elapsed_realtime);
435+
spectra->input_counts(spectra->input_counts() + sum_input_counts);
436+
spectra->output_counts(spectra->output_counts() + sum_output_counts);
448437
}
449438

450439
if ((retval = nc_close(ncid)))

0 commit comments

Comments
 (0)