Skip to content

Commit f713909

Browse files
committed
fix: use keyword bvecs= in gradient_table() to fix dipy deprecation warning
1 parent 79794b6 commit f713909

6 files changed

Lines changed: 11 additions & 11 deletions

File tree

src/standardized/IAR_LU_biexp.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ def __init__(self, bvalues=None, thresholds=None, bounds=None, initial_guess=Non
5959
if self.bvalues is not None:
6060
bvec = np.zeros((self.bvalues.size, 3))
6161
bvec[:,2] = 1
62-
gtab = gradient_table(self.bvalues, bvec, b0_threshold=0)
62+
gtab = gradient_table(self.bvalues, bvecs=bvec, b0_threshold=0)
6363

6464
self.IAR_algorithm = IvimModelBiExp(gtab, bounds=self.bounds, initial_guess=self.initial_guess)
6565
else:

src/standardized/IAR_LU_modified_mix.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ def __init__(self, bvalues=None, thresholds=None, bounds=None, initial_guess=Non
5858
if self.bvalues is not None:
5959
bvec = np.zeros((self.bvalues.size, 3))
6060
bvec[:,2] = 1
61-
gtab = gradient_table(self.bvalues, bvec, b0_threshold=0)
61+
gtab = gradient_table(self.bvalues, bvecs=bvec, b0_threshold=0)
6262

6363
bounds = [[self.bounds["f"][0], self.bounds["Dp"][0]*1000, self.bounds["D"][0]*1000],
6464
[self.bounds["f"][1], self.bounds["Dp"][1]*1000, self.bounds["D"][1]*1000]]
@@ -90,7 +90,7 @@ def ivim_fit(self, signals, bvalues, **kwargs):
9090

9191
bvec = np.zeros((bvalues.size, 3))
9292
bvec[:,2] = 1
93-
gtab = gradient_table(bvalues, bvec, b0_threshold=0)
93+
gtab = gradient_table(bvalues, bvecs=bvec, b0_threshold=0)
9494

9595
self.IAR_algorithm = IvimModelVP(gtab, bounds=bounds, rescale_results_to_mm2_s=True)
9696

src/standardized/IAR_LU_modified_topopro.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ def __init__(self, bvalues=None, thresholds=None, bounds=None, initial_guess=Non
6161
if self.bvalues is not None:
6262
bvec = np.zeros((self.bvalues.size, 3))
6363
bvec[:,2] = 1
64-
gtab = gradient_table(self.bvalues, bvec, b0_threshold=0)
64+
gtab = gradient_table(self.bvalues, bvecs=bvec, b0_threshold=0)
6565

6666
bounds = [[self.bounds["f"][0], self.bounds["Dp"][0]*1000, self.bounds["D"][0]*1000],
6767
[self.bounds["f"][1], self.bounds["Dp"][1]*1000, self.bounds["D"][1]*1000]]
@@ -92,7 +92,7 @@ def ivim_fit(self, signals, bvalues, **kwargs):
9292

9393
bvec = np.zeros((bvalues.size, 3))
9494
bvec[:,2] = 1
95-
gtab = gradient_table(bvalues, bvec, b0_threshold=0)
95+
gtab = gradient_table(bvalues, bvecs=bvec, b0_threshold=0)
9696

9797
self.IAR_algorithm = IvimModelTopoPro(gtab, bounds=bounds, rescale_results_to_mm2_s=True)
9898

src/standardized/IAR_LU_segmented_2step.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ def __init__(self, bvalues=None, thresholds=None, bounds=None, initial_guess=Non
6060
if self.bvalues is not None:
6161
bvec = np.zeros((self.bvalues.size, 3))
6262
bvec[:,2] = 1
63-
gtab = gradient_table(self.bvalues, bvec, b0_threshold=0)
63+
gtab = gradient_table(self.bvalues, bvecs=bvec, b0_threshold=0)
6464
bounds = [[self.bounds["S0"][0], self.bounds["f"][0], self.bounds["Dp"][0], self.bounds["D"][0]], \
6565
[self.bounds["S0"][1], self.bounds["f"][1], self.bounds["Dp"][1], self.bounds["D"][1]]]
6666

@@ -97,7 +97,7 @@ def ivim_fit(self, signals, bvalues, thresholds=None, **kwargs):
9797

9898
bvec = np.zeros((bvalues.size, 3))
9999
bvec[:,2] = 1
100-
gtab = gradient_table(bvalues, bvec, b0_threshold=0)
100+
gtab = gradient_table(bvalues, bvecs=bvec, b0_threshold=0)
101101

102102
if self.thresholds is None:
103103
self.thresholds = 200

src/standardized/IAR_LU_segmented_3step.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ def __init__(self, bvalues=None, thresholds=None, bounds=None, initial_guess=Non
6060
if self.bvalues is not None:
6161
bvec = np.zeros((self.bvalues.size, 3))
6262
bvec[:,2] = 1
63-
gtab = gradient_table(self.bvalues, bvec, b0_threshold=0)
63+
gtab = gradient_table(self.bvalues, bvecs=bvec, b0_threshold=0)
6464

6565
# Adapt the bounds to the format needed for the algorithm
6666
bounds = [[self.bounds["S0"][0], self.bounds["f"][0], self.bounds["Dp"][0], self.bounds["D"][0]], \
@@ -99,7 +99,7 @@ def ivim_fit(self, signals, bvalues, **kwargs):
9999

100100
bvec = np.zeros((bvalues.size, 3))
101101
bvec[:,2] = 1
102-
gtab = gradient_table(bvalues, bvec, b0_threshold=0)
102+
gtab = gradient_table(bvalues, bvecs=bvec, b0_threshold=0)
103103

104104
self.IAR_algorithm = IvimModelSegmented3Step(gtab, bounds=bounds, initial_guess=initial_guess)
105105

src/standardized/IAR_LU_subtracted.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ def __init__(self, bvalues=None, thresholds=None, bounds=None, initial_guess=Non
5858
if self.bvalues is not None:
5959
bvec = np.zeros((self.bvalues.size, 3))
6060
bvec[:,2] = 1
61-
gtab = gradient_table(self.bvalues, bvec, b0_threshold=0)
61+
gtab = gradient_table(self.bvalues, bvecs=bvec, b0_threshold=0)
6262

6363
# Adapt the bounds to the format needed for the algorithm
6464
bounds = [[self.bounds["S0"][0], self.bounds["f"][0], self.bounds["Dp"][0], self.bounds["D"][0]], \
@@ -97,7 +97,7 @@ def ivim_fit(self, signals, bvalues, **kwargs):
9797

9898
bvec = np.zeros((bvalues.size, 3))
9999
bvec[:,2] = 1
100-
gtab = gradient_table(bvalues, bvec, b0_threshold=0)
100+
gtab = gradient_table(bvalues, bvecs=bvec, b0_threshold=0)
101101

102102
self.IAR_algorithm = IvimModelSubtracted(gtab, bounds=bounds, initial_guess=initial_guess)
103103

0 commit comments

Comments
 (0)