From 05037c5de07e46551ab6937dbfb321114de5e5d2 Mon Sep 17 00:00:00 2001 From: Kris Thielemans Date: Thu, 4 Jan 2024 12:27:11 +0000 Subject: [PATCH] remove defaults for some TOF-range to avoid unexpected problems --- .../stir/recon_buildblock/DataSymmetriesForBins.h | 9 ++------- .../stir/recon_buildblock/TrivialDataSymmetriesForBins.h | 9 ++------- src/include/stir/recon_buildblock/distributable.h | 2 +- .../stir/recon_buildblock/distributableMPICacheEnabled.h | 2 +- 4 files changed, 6 insertions(+), 16 deletions(-) diff --git a/src/include/stir/recon_buildblock/DataSymmetriesForBins.h b/src/include/stir/recon_buildblock/DataSymmetriesForBins.h index a095a5c37..2fd735014 100644 --- a/src/include/stir/recon_buildblock/DataSymmetriesForBins.h +++ b/src/include/stir/recon_buildblock/DataSymmetriesForBins.h @@ -78,12 +78,7 @@ class DataSymmetriesForBins : public DataSymmetriesForViewSegmentNumbers virtual ~DataSymmetriesForBins(); virtual -#ifndef STIR_NO_COVARIANT_RETURN_TYPES - DataSymmetriesForBins -#else - DataSymmetriesForViewSegmentNumbers -#endif - * clone() const = 0; + DataSymmetriesForBins * clone() const = 0; #if 0 TODO! @@ -109,7 +104,7 @@ class DataSymmetriesForBins : public DataSymmetriesForViewSegmentNumbers get_related_bins(std::vector&, const Bin& b, const int min_axial_pos_num, const int max_axial_pos_num, const int min_tangential_pos_num, const int max_tangential_pos_num, - const int min_timing_pos_num = 0, const int max_timing_pos_num = 0) const; + const int min_timing_pos_num, const int max_timing_pos_num) const; //! fills in a vector with the axial and tangential position numbers related to this bin /*! range for axial_pos_num and tangential_pos_num is taken from the ProjDataInfo object diff --git a/src/include/stir/recon_buildblock/TrivialDataSymmetriesForBins.h b/src/include/stir/recon_buildblock/TrivialDataSymmetriesForBins.h index dc3be78a9..b39dab211 100644 --- a/src/include/stir/recon_buildblock/TrivialDataSymmetriesForBins.h +++ b/src/include/stir/recon_buildblock/TrivialDataSymmetriesForBins.h @@ -38,18 +38,13 @@ class TrivialDataSymmetriesForBins : public DataSymmetriesForBins TrivialDataSymmetriesForBins(const shared_ptr& proj_data_info_ptr); virtual -#ifndef STIR_NO_COVARIANT_RETURN_TYPES - TrivialDataSymmetriesForBins -#else - DataSymmetriesForViewSegmentNumbers -#endif - * clone() const; + TrivialDataSymmetriesForBins * clone() const; virtual void get_related_bins(std::vector&, const Bin& b, const int min_axial_pos_num, const int max_axial_pos_num, const int min_tangential_pos_num, const int max_tangential_pos_num, - const int min_timing_pos_num = 0, const int max_timing_pos_num = 0) const; + const int min_timing_pos_num, const int max_timing_pos_num0) const; virtual void get_related_bins_factorised(std::vector&, const Bin& b, diff --git a/src/include/stir/recon_buildblock/distributable.h b/src/include/stir/recon_buildblock/distributable.h index 4eac6a183..498601724 100644 --- a/src/include/stir/recon_buildblock/distributable.h +++ b/src/include/stir/recon_buildblock/distributable.h @@ -176,7 +176,7 @@ void distributable_computation( const double end_time_of_frame, RPC_process_related_viewgrams_type * RPC_process_related_viewgrams, DistributedCachingInformation* caching_info_ptr, - int min_timing_pos_num = 0, int max_timing_pos_num = 0); + int min_timing_pos_num, int max_timing_pos_num); /*! \brief This function essentially implements a loop over a cached listmode file diff --git a/src/include/stir/recon_buildblock/distributableMPICacheEnabled.h b/src/include/stir/recon_buildblock/distributableMPICacheEnabled.h index 8544e8e9d..e3bd20f4f 100644 --- a/src/include/stir/recon_buildblock/distributableMPICacheEnabled.h +++ b/src/include/stir/recon_buildblock/distributableMPICacheEnabled.h @@ -66,7 +66,7 @@ void distributable_computation_cache_enabled( const double end_time_of_frame, RPC_process_related_viewgrams_type * RPC_process_related_viewgrams, DistributedCachingInformation* caching_info_ptr, - int min_timing_pos_num = 0, int max_timing_pos_num = 0 + int min_timing_pos_num, int max_timing_pos_num );