@@ -64,15 +64,16 @@ def test_ivim_fit_saved(name, bvals, data, algorithm, xfail, kwargs, tolerances,
64
64
signal , ratio = signal_helper (data ["data" ])
65
65
66
66
tolerances = tolerances_helper (tolerances , ratio , data ["noise" ])
67
- [f_fit , Dp_fit , D_fit ] = fit .osipi_fit (signal , bvals )
67
+ #[f_fit, Dp_fit, D_fit] = fit.osipi_fit(signal, bvals)
68
+ fit_result = fit .osipi_fit (signal , bvals )
68
69
def to_list_if_needed (value ):
69
70
return value .tolist () if isinstance (value , np .ndarray ) else value
70
71
test_result = {
71
72
"name" : name ,
72
73
"algorithm" : algorithm ,
73
- "f_fit" : to_list_if_needed (f_fit ),
74
- "Dp_fit" : to_list_if_needed (Dp_fit ),
75
- "D_fit" : to_list_if_needed (D_fit ),
74
+ "f_fit" : to_list_if_needed (fit_result [ 'f' ] ),
75
+ "Dp_fit" : to_list_if_needed (fit_result [ 'D*' ] ),
76
+ "D_fit" : to_list_if_needed (fit_result [ 'D' ] ),
76
77
"f" : to_list_if_needed (data ['f' ]),
77
78
"Dp" : to_list_if_needed (data ['Dp' ]),
78
79
"D" : to_list_if_needed (data ['D' ]),
@@ -83,9 +84,9 @@ def to_list_if_needed(value):
83
84
84
85
record_property ('test_data' , test_result )
85
86
86
- npt .assert_allclose (data ['f' ], f_fit , rtol = tolerances ["rtol" ]["f" ], atol = tolerances ["atol" ]["f" ])
87
+ npt .assert_allclose (data ['f' ], fit_result [ 'f' ] , rtol = tolerances ["rtol" ]["f" ], atol = tolerances ["atol" ]["f" ])
87
88
88
89
if data ['f' ]< 0.80 : # we need some signal for D to be detected
89
90
npt .assert_allclose (data ['D' ], fit_result ['D' ], rtol = tolerances ["rtol" ]["D" ], atol = tolerances ["atol" ]["D" ])
90
91
if data ['f' ]> 0.03 : #we need some f for D* to be interpretable
91
- npt .assert_allclose (data ['Dp' ], Dp_fit , rtol = tolerances ["rtol" ]["Dp" ], atol = tolerances ["atol" ]["Dp" ])
92
+ npt .assert_allclose (data ['Dp' ], fit_result [ 'D*' ] , rtol = tolerances ["rtol" ]["Dp" ], atol = tolerances ["atol" ]["Dp" ])
0 commit comments