From 7d4a6c562ba8674f61e188a985e86a750e3ff25f Mon Sep 17 00:00:00 2001
From: Paul McCarthy <pauld.mccarthy@gmail.com>
Date: Sat, 11 Jun 2016 09:15:30 +0100
Subject: [PATCH] Expansion range takes into account all previous dimensions.
That makes no sense, I know.
---
fsl/data/imagewrapper.py | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/fsl/data/imagewrapper.py b/fsl/data/imagewrapper.py
index 14516c52a..59fd97cf7 100644
--- a/fsl/data/imagewrapper.py
+++ b/fsl/data/imagewrapper.py
@@ -476,8 +476,8 @@ def calcExpansion(slices, coverage):
expansion[dimx][1] = xhi
# And will span the union of
- # the range and coverage for
- # every other dimension.
+ # the coverage, and calculated
+ # range for every other dimension.
for dimy, ylo, yhi in reqRanges:
if dimy == dimx:
continue
@@ -487,9 +487,16 @@ def calcExpansion(slices, coverage):
# this duplication.
yLowCover, yHighCover = coverage[:, dimy, vol]
+ expLow, expHigh = expansion[ dimy]
- expansion[dimy][0] = min((ylo, yLowCover))
- expansion[dimy][1] = max((yhi, yHighCover))
+ if np.isnan(expLow): expLow = yLowCover
+ if np.isnan(expHigh): expHigh = yHighCover
+
+ expLow = min((ylo, yLowCover, expLow))
+ expHigh = max((yhi, yHighCover, expHigh))
+
+ expansion[dimy][0] = expLow
+ expansion[dimy][1] = expHigh
# Finish off this expansion by
# adding indices for the vector/
--
GitLab