summaryrefslogtreecommitdiffstats
path: root/src/Python/ccpi
diff options
context:
space:
mode:
authorEdoardo Pasca <edo.paskino@gmail.com>2017-10-24 16:37:21 +0100
committerEdoardo Pasca <edo.paskino@gmail.com>2017-10-24 16:37:21 +0100
commit455ca86825c157512f61441d3d27b8148ca795a7 (patch)
tree8693ff12018998998df117b2dbfdc015a28ff97f /src/Python/ccpi
parent7f6e90ed9569e6f935813d8ceb6b3c00feed3bc0 (diff)
downloadregularization-455ca86825c157512f61441d3d27b8148ca795a7.tar.gz
regularization-455ca86825c157512f61441d3d27b8148ca795a7.tar.bz2
regularization-455ca86825c157512f61441d3d27b8148ca795a7.tar.xz
regularization-455ca86825c157512f61441d3d27b8148ca795a7.zip
Add regularization step
Add regularization step OS seems to work
Diffstat (limited to 'src/Python/ccpi')
-rw-r--r--src/Python/ccpi/reconstruction/FISTAReconstructor.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/Python/ccpi/reconstruction/FISTAReconstructor.py b/src/Python/ccpi/reconstruction/FISTAReconstructor.py
index f43966c..c903712 100644
--- a/src/Python/ccpi/reconstruction/FISTAReconstructor.py
+++ b/src/Python/ccpi/reconstruction/FISTAReconstructor.py
@@ -363,6 +363,9 @@ class FISTAReconstructor():
except Exception():
subsets = 0
#return subsets
+ else:
+ self.setParameter(subsets=subsets)
+
angles = self.getParameter('projector_geometry')['ProjectionAngles']
@@ -371,7 +374,7 @@ class FISTAReconstructor():
# subsets + 1)
binsDiscr, binEdges = numpy.histogram(angles, bins=subsets)
# get rearranged subset indices
- IndicesReorg = numpy.zeros((numpy.shape(angles)))
+ IndicesReorg = numpy.zeros((numpy.shape(angles)), dtype=numpy.int32)
counterM = 0
for ii in range(binsDiscr.max()):
counter = 0