Skip to content

Commit d17bf84

Browse files
make coincidence_time_window arg of randoms_from_singles default
we now have it in Scanner
1 parent 7409deb commit d17bf84

File tree

3 files changed

+15
-9
lines changed

3 files changed

+15
-9
lines changed

src/data_buildblock/randoms_from_singles.cxx

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,11 @@
3030
START_NAMESPACE_STIR
3131

3232
void randoms_from_singles(ProjData& proj_data, const SinglesRates& singles,
33-
const float coincidence_time_window, float isotope_halflife)
33+
float coincidence_time_window, float isotope_halflife)
3434
{
3535
const auto& scanner = *proj_data.get_proj_data_info_sptr()->get_scanner_ptr();
3636
if (coincidence_time_window <= 0.F)
37-
{
38-
coincidence_time_window =scanner.get_coincidence_window_width_in_ps() / 1e12F;
39-
}
37+
coincidence_time_window = scanner.get_coincidence_window_width_in_ps() / 1e12F;
4038
if (isotope_halflife <= 0.F)
4139
isotope_halflife = proj_data.get_exam_info().get_radionuclide().get_half_life();
4240

src/include/stir/data/randoms_from_singles.h

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,16 @@ class SinglesRates;
2727

2828
/*!
2929
\ingroup singles_buildblock
30-
\brief Estimate randoms from singles
30+
\brief Estimate randoms from singles (RFS)
31+
32+
\param[in,out] proj_data
33+
Projection data to store output. It needs to be properly initialised with sizes etc.
34+
If \a coincidence_time_window or
35+
\a radionuclide_halflife are invalid, they will be determined from the \a proj_data.
36+
\param[in] singles
37+
Input value for RFS
38+
\param[in] coincidence_time_window Scanner coincidence window (in secs). Deprecated.
39+
\param[in] radionuclide_halflife half-life. Deprecated.
3140
3241
This uses the formula \f$ R_{ij}= \tau S_i S_j \f$ (with \f$\tau\f$ the \c coincidence_time_window)
3342
for finding the randoms-rate in terms of the
@@ -59,6 +68,7 @@ class SinglesRates;
5968
6069
\todo Dead-time is currently completely ignored.
6170
*/
62-
void randoms_from_singles(ProjData& proj_data, const SinglesRates& singles, const float coincidence_time_window, float isotope_halflife=-1.F);
71+
void randoms_from_singles(ProjData& proj_data, const SinglesRates& singles,
72+
float coincidence_time_window=-1.F, float radionuclide_halflife=-1.F);
6373

6474
END_NAMESPACE_STIR

src/utilities/construct_randoms_from_GEsingles.cxx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,7 @@ int main(int argc, char **argv)
8484
output_file_name);
8585

8686
GE::RDF_HDF5::SinglesRatesFromGEHDF5 singles(input_filename);
87-
const float coincidence_time_window = proj_data_info_sptr->get_coincidence_window_in_pico_sec() / 1e12F;
88-
const float isotope_halflife = exam_info_sptr->get_radionuclide().get_half_life();
8987

90-
randoms_from_singles(proj_data, singles, coincidence_time_window, isotope_halflife);
88+
randoms_from_singles(proj_data, singles);
9189
return EXIT_SUCCESS;
9290
}

0 commit comments

Comments
 (0)