Skip to content

Commit abbd631

Browse files
remove IVIM_fit_full_volume
not entirely sure I am using it correctly
1 parent d03af5d commit abbd631

2 files changed

Lines changed: 17 additions & 24 deletions

File tree

src/standardized/OGC_AmsterdamUMC_Bayesian_biexp.py

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,8 @@ def ivim_fit_full_volume(self, signals, bvalues, initial_guess=None, **kwargs):
123123
Returns:
124124
_type_: _description_
125125
"""
126+
signals = self.reshape_to_voxelwise(signals)
127+
126128
bvalues=np.array(bvalues)
127129

128130
epsilon = 0.000001
@@ -138,4 +140,18 @@ def ivim_fit_full_volume(self, signals, bvalues, initial_guess=None, **kwargs):
138140
results["f"] = fit_results[1]
139141
results["Dp"] = fit_results[2]
140142

141-
return results
143+
return results
144+
145+
146+
147+
def reshape_to_voxelwise(self, data):
148+
"""
149+
reshapes multi-D input (spatial dims, bvvalue) data to 2D voxel-wise array
150+
Args:
151+
data (array): mulit-D array (data x b-values)
152+
Returns:
153+
out (array): 2D array (voxel x b-value)
154+
"""
155+
B = data.shape[-1]
156+
voxels = int(np.prod(data.shape[:-1])) # e.g., X*Y*Z
157+
return data.reshape(voxels, B)

src/standardized/OGC_AmsterdamUMC_biexp_segmented.py

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -87,26 +87,3 @@ def ivim_fit(self, signals, bvalues, **kwargs):
8787
results["Dp"] = fit_results[2]
8888

8989
return results
90-
91-
92-
def ivim_fit_full_volume(self, signals, bvalues, **kwargs):
93-
"""Perform the IVIM fit
94-
95-
Args:
96-
signals (array-like)
97-
bvalues (array-like, optional): b-values for the signals. If None, self.bvalues will be used. Default is None.
98-
99-
Returns:
100-
_type_: _description_
101-
"""
102-
signals = self.osipi_reshape_to_voxelwise(signals)
103-
104-
bvalues=np.array(bvalues)
105-
fit_results = self.OGC_algorithm_array(bvalues, signals, bounds=self.bounds, cutoff=self.thresholds, p0=self.initial_guess)
106-
107-
results = {}
108-
results["D"] = fit_results[0]
109-
results["f"] = fit_results[1]
110-
results["Dp"] = fit_results[2]
111-
112-
return results

0 commit comments

Comments
 (0)