drop more Dataset items

SyneRBI · Jun 27, 2024 · 2cca32a · 2cca32a
1 parent 7ba4b34
commit 2cca32a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/main.py b/main.py
@@ -7,7 +7,7 @@
 """
 from cil.optimisation.algorithms import Algorithm
 from cil.optimisation.utilities import callbacks
-from petric import Dataset, MetricsWithTimeout
+from petric import Dataset
 from sirf.contrib.BSREM.BSREM import BSREM1
 from sirf.contrib.partitioner import partitioner
 

diff --git a/petric.py b/petric.py
@@ -108,9 +108,7 @@ def construct_RDP(penalty_strength, initial_image, kappa, max_scaling=1e-3):
     return prior
 
 
-Dataset = namedtuple(
-    'Dataset',
-    ['data', 'prior', 'penalty_strength', 'OSEM_image', 'kappa', 'mult_factors', 'additive_term', 'acquired_data'])
+Dataset = namedtuple('Dataset', ['acquired_data', 'additive_term', 'mult_factors', 'OSEM_image', 'prior'])
 
 
 def get_data(srcdir=".", outdir=OUTDIR, sirf_verbosity=0):
@@ -132,8 +130,7 @@ def get_data(srcdir=".", outdir=OUTDIR, sirf_verbosity=0):
         penalty_strength = 1 / 700 # default choice
     prior = construct_RDP(penalty_strength, OSEM_image, kappa)
 
-    return Dataset(data=data, prior=prior, penalty_strength=penalty_strength, OSEM_image=OSEM_image, kappa=kappa,
-                   mult_factors=mult_factors, additive_term=additive_term, acquired_data=acquired_data)
+    return Dataset(acquired_data, additive_term, mult_factors, OSEM_image, prior)
 
 
 if SRCDIR.is_dir():