From 691d3f63d221b2df4e192f9ca326cd6cc09a4d99 Mon Sep 17 00:00:00 2001
From: Kris Thielemans
Date: Tue, 6 Feb 2024 23:21:16 +0000
Subject: [PATCH 1/8] removed some unused variables
---
src/recon_buildblock/LogcoshPrior.cxx | 1 -
src/recon_buildblock/QuadraticPrior.cxx | 1 -
src/recon_buildblock/RelativeDifferencePrior.cxx | 1 -
3 files changed, 3 deletions(-)
diff --git a/src/recon_buildblock/LogcoshPrior.cxx b/src/recon_buildblock/LogcoshPrior.cxx
index d9b038fa6f..abccd71023 100644
--- a/src/recon_buildblock/LogcoshPrior.cxx
+++ b/src/recon_buildblock/LogcoshPrior.cxx
@@ -424,7 +424,6 @@ LogcoshPrior::compute_Hessian(DiscretisedDensity<3, elemT>& prior_Hessian
const int min_dx = max(weights[0][0].get_min_index(), prior_Hessian_for_single_densel[z][y].get_min_index() - x);
const int max_dx = min(weights[0][0].get_max_index(), prior_Hessian_for_single_densel[z][y].get_max_index() - x);
- elemT diagonal = 0;
for (int dz = min_dz; dz <= max_dz; ++dz)
for (int dy = min_dy; dy <= max_dy; ++dy)
for (int dx = min_dx; dx <= max_dx; ++dx)
diff --git a/src/recon_buildblock/QuadraticPrior.cxx b/src/recon_buildblock/QuadraticPrior.cxx
index 1b2e7aeade..93c4db3fb0 100644
--- a/src/recon_buildblock/QuadraticPrior.cxx
+++ b/src/recon_buildblock/QuadraticPrior.cxx
@@ -467,7 +467,6 @@ QuadraticPrior::compute_Hessian(DiscretisedDensity<3, elemT>& prior_Hessi
const int min_dx = max(weights[0][0].get_min_index(), prior_Hessian_for_single_densel[z][y].get_min_index() - x);
const int max_dx = min(weights[0][0].get_max_index(), prior_Hessian_for_single_densel[z][y].get_max_index() - x);
- elemT diagonal = 0;
for (int dz = min_dz; dz <= max_dz; ++dz)
for (int dy = min_dy; dy <= max_dy; ++dy)
for (int dx = min_dx; dx <= max_dx; ++dx)
diff --git a/src/recon_buildblock/RelativeDifferencePrior.cxx b/src/recon_buildblock/RelativeDifferencePrior.cxx
index d407f1d728..d23b9528a1 100644
--- a/src/recon_buildblock/RelativeDifferencePrior.cxx
+++ b/src/recon_buildblock/RelativeDifferencePrior.cxx
@@ -489,7 +489,6 @@ RelativeDifferencePrior::compute_Hessian(DiscretisedDensity<3, elemT>& pr
const int min_dx = max(weights[0][0].get_min_index(), prior_Hessian_for_single_densel[z][y].get_min_index() - x);
const int max_dx = min(weights[0][0].get_max_index(), prior_Hessian_for_single_densel[z][y].get_max_index() - x);
- elemT diagonal = 0;
for (int dz = min_dz; dz <= max_dz; ++dz)
for (int dy = min_dy; dy <= max_dy; ++dy)
for (int dx = min_dx; dx <= max_dx; ++dx)
From 2df514472e411c9b207c5c75f1be3949e4744fd1 Mon Sep 17 00:00:00 2001
From: Kris Thielemans
Date: Tue, 6 Feb 2024 23:24:10 +0000
Subject: [PATCH 2/8] extra test for Array2D
---
src/test/test_ArrayFilter.cxx | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/test/test_ArrayFilter.cxx b/src/test/test_ArrayFilter.cxx
index 829cf06a23..36aa2fe44c 100644
--- a/src/test/test_ArrayFilter.cxx
+++ b/src/test/test_ArrayFilter.cxx
@@ -313,12 +313,14 @@ ArrayFilterTests::run_tests()
Array<2, float> test_pos_offset(IndexRange2D(1, size1, 2, size2 + 1));
// initialise to some arbitrary values
{
- Array<2, float>::full_iterator iter = test.begin_all();
- /*for (int i=-100; iter != test.end_all(); ++i, ++iter)
- *iter = 1;//i*i*2.F-i-100.F;*/
- test[0][0] = 1;
+ auto iter = test.begin_all();
+ for (int i = -100; iter != test.end_all(); ++i, ++iter)
+ *iter = i * i * 2.F - i - 100.F;
+ test[0][0] = 1.F;
std::copy(test.begin_all(), test.end_all(), test_neg_offset.begin_all());
std::copy(test.begin_all(), test.end_all(), test_pos_offset.begin_all());
+ check_if_equal(test_neg_offset[-5][-10], 1.F);
+ check_if_equal(test_pos_offset[1][2], 1.F);
}
{
const int kernel_half_length = 14;
From e0fcfc365c3dbe67eb2bdd2ed869fcdef65407a3 Mon Sep 17 00:00:00 2001
From: Kris Thielemans
Date: Tue, 6 Feb 2024 23:41:33 +0000
Subject: [PATCH 3/8] clean-up of release notes for 6.0.0
---
documentation/release_6.0.htm | 66 +++++++++++++++++++----------------
1 file changed, 36 insertions(+), 30 deletions(-)
diff --git a/documentation/release_6.0.htm b/documentation/release_6.0.htm
index 61ba0b89f6..8b13e1f21a 100644
--- a/documentation/release_6.0.htm
+++ b/documentation/release_6.0.htm
@@ -10,7 +10,7 @@ Summary of changes in STIR release 6.0
This version is 99% backwards compatible with STIR 5.x for the user (see below).
Developers might need to make code changes as
detailed below. Note though that the locations of installed files have changed.
- Developers of other software that uses STIR via CMake will need to adapt (see below).
+ Developers of other software that uses STIR via CMake will therefore need to adapt (see below).
Overall summary
@@ -18,8 +18,8 @@
Overall summary
- Of course, there is also the usual code-cleanup and
- improvements to the documentation.
+
This version has a major code-cleanup related to removing old compiler work-arounds,
+ consistent use of override
and white-space enforcement.
Overall code management and assistance was Kris Thielemans (UCL and ASC). Other main contributors
@@ -33,7 +33,10 @@
Overall summary
Patch release info