Skip to content

Commit 25b29d9

Browse files
Oliver's approach
Dynamic scaling adjusted. Also boundaries adjusted Remove normalisation as signal isnormalized. Remove algorithm-specific tolerance boundaries such that default boundaries are used Take medians of parameters as means give some machine precission error...
1 parent c45231d commit 25b29d9

File tree

8 files changed

+312
-379
lines changed

8 files changed

+312
-379
lines changed

phantoms/MR_XCAT_qMRI/sim_ivim_sig.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -459,9 +459,9 @@ def parse_bvalues_file(file_path):
459459
signals = np.squeeze(voxels[int(voxels.shape[0] * voxel_selector_fraction)]).tolist()
460460
generic_data[name] = {
461461
'noise': noise,
462-
'D': np.mean(Dim[selector], axis=0),
463-
'f': np.mean(fim[selector], axis=0),
464-
'Dp': np.mean(Dpim[selector], axis=0),
462+
'D': np.median(Dim[selector], axis=0),
463+
'f': np.median(fim[selector], axis=0),
464+
'Dp': np.median(Dpim[selector], axis=0),
465465
'data': signals
466466
}
467467
generic_data['config'] = {

tests/IVIMmodels/unit_tests/algorithms.json

Lines changed: 16 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -16,86 +16,32 @@
1616
],
1717
"IAR_LU_biexp": {
1818
"tolerances": {
19-
"rtol": {
20-
"f": 5,
21-
"D": 5,
22-
"Dp": 25
23-
},
24-
"atol": {
25-
"f": 1e-2,
26-
"D": 1e-2,
27-
"Dp": 1e-1
28-
}
19+
2920
}
3021
},
3122
"IAR_LU_modified_mix": {
3223
"tolerances": {
33-
"rtol": {
34-
"f": 5,
35-
"D": 5,
36-
"Dp": 25
37-
},
38-
"atol": {
39-
"f": 1e-2,
40-
"D": 1e-2,
41-
"Dp": 1e-1
42-
}
24+
4325
}
4426
},
4527
"IAR_LU_modified_topopro": {
4628
"tolerances": {
47-
"rtol": {
48-
"f": 5,
49-
"D": 5,
50-
"Dp": 25
51-
},
52-
"atol": {
53-
"f": 1e-2,
54-
"D": 1e-2,
55-
"Dp": 1e-1
56-
}
29+
5730
}
5831
},
5932
"IAR_LU_segmented_2step": {
6033
"tolerances": {
61-
"rtol": {
62-
"f": 5,
63-
"D": 5,
64-
"Dp": 25
65-
},
66-
"atol": {
67-
"f": 1e-2,
68-
"D": 1e-2,
69-
"Dp": 1e-1
70-
}
34+
7135
}
7236
},
7337
"IAR_LU_segmented_3step": {
7438
"tolerances": {
75-
"rtol": {
76-
"f": 5,
77-
"D": 5,
78-
"Dp": 25
79-
},
80-
"atol": {
81-
"f": 1e-2,
82-
"D": 1e-2,
83-
"Dp": 1e-1
84-
}
39+
8540
}
8641
},
8742
"IAR_LU_subtracted": {
8843
"tolerances": {
89-
"rtol": {
90-
"f": 5,
91-
"D": 5,
92-
"Dp": 25
93-
},
94-
"atol": {
95-
"f": 1e-2,
96-
"D": 1e-2,
97-
"Dp": 1e-1
98-
}
44+
9945
}
10046
},
10147
"ETP_SRI_LinearFitting": {
@@ -117,51 +63,31 @@
11763
"Dp": 0
11864
},
11965
"dynamic_rtol": {
120-
"offset": 0,
121-
"noise": 0,
122-
"ratio": 0,
123-
"noiseCrossRatio": 10,
124-
"f": 1,
66+
"offset": 0.001,
67+
"noise": 200,
68+
"scale_f": false,
69+
"f": 2,
12570
"D": 1,
126-
"Dp": 2
71+
"Dp": 3
12772
},
12873
"dynamic_atol": {
12974
"offset": 5e-2,
130-
"noise": 0,
131-
"ratio": 0,
132-
"noiseCrossRatio": 10,
75+
"noise": 10,
76+
"scale_f": false,
13377
"f": 1,
134-
"D": 1,
78+
"D": 0.001,
13579
"Dp": 2
13680
}
13781
}
13882
},
13983
"OGC_AmsterdamUMC_biexp_segmented": {
14084
"tolerances": {
141-
"rtol": {
142-
"f": 5,
143-
"D": 5,
144-
"Dp": 25
145-
},
146-
"atol": {
147-
"f": 1e-2,
148-
"D": 1e-2,
149-
"Dp": 1e-1
150-
}
85+
15186
}
15287
},
15388
"OJ_GU_seg": {
15489
"tolerances": {
155-
"rtol": {
156-
"f": 5,
157-
"D": 5,
158-
"Dp": 25
159-
},
160-
"atol": {
161-
"f": 1e-2,
162-
"D": 1e-2,
163-
"Dp": 1e-1
164-
}
90+
16591
}
16692
}
16793
}

0 commit comments

Comments
 (0)