upgrade STIR_VERSION to 6.0.0

had to fix some files accordingly
NikEfth · Dec 27, 2023 · 4b362c3 · 4b362c3
1 parent 42827e5
commit 4b362c3
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -55,10 +55,10 @@ else()
 endif()
 
 ####### Set Version number etc
-set(VERSION_MAJOR   5)
-set(VERSION_MINOR   2)
+set(VERSION_MAJOR   6)
+set(VERSION_MINOR   0)
 set(VERSION_PATCH   0)
-set(VERSION   050200) # only used in STIRConfig.h.in
+set(VERSION   060000) # only used in STIRConfig.h.in and swig/CMakeLists.txt
 
 set(STIR_VERSION
   ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})

diff --git a/src/buildblock/extend_projdata.cxx b/src/buildblock/extend_projdata.cxx
@@ -30,9 +30,9 @@
 
 START_NAMESPACE_STIR
 
+#if STIR_VERSION < 060000
 namespace detail 
 {
-#if STIR_VERSION < 060000
   /* This function takes symmetries in the sinogram space into account
      to find data in the negative segment if necessary.
      However, it needs testing if it would work for non-direct sinograms.

diff --git a/...ildblock/PoissonLogLikelihoodWithLinearModelForMeanAndListModeDataWithProjMatrixByBin.cxx b/...ildblock/PoissonLogLikelihoodWithLinearModelForMeanAndListModeDataWithProjMatrixByBin.cxx
@@ -349,9 +349,9 @@ PoissonLogLikelihoodWithLinearModelForMeanAndListModeDataWithProjMatrixByBin<Tar
   if (base_type::post_processing() == true)
     return true;
 
-#if STIR_VERSION < 060000
    this->proj_data_info_sptr = this->list_mode_data_sptr->get_proj_data_info_sptr()->create_shared_clone();
 
+#if STIR_VERSION < 060000
    if (this->get_max_segment_num_to_process() < 0)
      this->set_max_ring_difference(this->max_ring_difference_num_to_process);
    else

diff --git a/src/swig/CMakeLists.txt b/src/swig/CMakeLists.txt
@@ -25,7 +25,7 @@ if(BUILD_SWIG_PYTHON OR BUILD_SWIG_OCTAVE OR BUILD_SWIG_MATLAB)
   FIND_PACKAGE(SWIG 3.0 REQUIRED)
   INCLUDE("${SWIG_USE_FILE}")
 
-  SET(CMAKE_SWIG_FLAGS -DSTART_NAMESPACE_STIR=\"namespace stir {\" -DEND_NAMESPACE_STIR=\"}\" -DSTIR_DEPRECATED="" -DSTIR_TOF=1)
+  SET(CMAKE_SWIG_FLAGS -DSTART_NAMESPACE_STIR=\"namespace stir {\" -DEND_NAMESPACE_STIR=\"}\" -DSTIR_DEPRECATED="" -DSTIR_TOF=1 -DSTIR_VERSION=${VERSION})
   # Manually add some flags (really should get this from elsewhere)
   if (HAVE_LLN_MATRIX)
     SET(CMAKE_SWIG_FLAGS ${CMAKE_SWIG_FLAGS} -DHAVE_LLN_MATRIX)