Skip to content

Commit d7fbb92

Browse files
author
IvanARashid
committed
Patched up error with arrays of Nones
1 parent eb3bb53 commit d7fbb92

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

src/wrappers/OsipiBase.py

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,17 @@ def osipi_fit(self, data=None, bvalues=None, thresholds=None, bounds=None, initi
4949

5050
# We should first check whether the attributes in the __init__ are not None
5151
# Then check if they are input here, if they are, these should overwrite the attributes
52-
use_bvalues = np.asarray(bvalues) if bvalues is not None else self.bvalues
52+
use_bvalues = bvalues if bvalues is not None else self.bvalues
5353
kwargs["bvalues"] = use_bvalues
54-
use_thresholds = np.asarray(thresholds) if self.bvalues is None else self.thresholds
55-
use_bounds = np.asarray(bounds) if self.bounds is None else self.bounds
56-
use_initial_guess = np.asarray(initial_guess) if self.initial_guess is None else self.initial_guess
54+
use_thresholds = thresholds if self.bvalues is None else self.thresholds
55+
use_bounds = bounds if self.bounds is None else self.bounds
56+
use_initial_guess = initial_guess if self.initial_guess is None else self.initial_guess
57+
58+
# Make sure we don't make arrays of None's
59+
if use_bvalues is not None: use_bvalues = np.asarray(use_bvalues)
60+
if use_thresholds is not None: use_thresholds = np.asarray(use_thresholds)
61+
if use_bounds is not None: use_bounds = np.asarray(use_bounds)
62+
if use_initial_guess is not None: use_initial_guess = np.asarray(use_initial_guess)
5763

5864
#args = [data, use_bvalues, use_thresholds]
5965
args = [data, use_thresholds]

0 commit comments

Comments
 (0)