Skip to content

Commit

Permalink
Rename Dpim to Dp in file
Browse files Browse the repository at this point in the history
  • Loading branch information
etpeterson committed Aug 14, 2023
1 parent 4053698 commit f1bc6a3
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 39 deletions.
2 changes: 1 addition & 1 deletion phantoms/MR_XCAT_qMRI/sim_ivim_sig.py
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ def XCAT_to_MR_DCE(XCAT, TR, TE, bvalue, D, f, Ds, b0=3, ivim_cont = True):
generic_data[name] = {
'D': np.mean(Dim[selector], axis=0),
'f': np.mean(fim[selector], axis=0),
'Dpim': np.mean(Dpim[selector], axis=0),
'Dp': np.mean(Dpim[selector], axis=0),
'data': signals
}
generic_data['config'] = {
Expand Down
76 changes: 38 additions & 38 deletions tests/IVIMmodels/unit_tests/generic.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"Myocardium LV": {
"D": 0.0024,
"f": 0.14999999999999997,
"Dpim": 0.08,
"Dp": 0.08,
"data": [
0.34898972165246894,
0.34101242160675377,
Expand All @@ -27,7 +27,7 @@
"myocardium RV": {
"D": 0.0024,
"f": 0.14999999999999997,
"Dpim": 0.07999999999999999,
"Dp": 0.07999999999999999,
"data": [
0.24871440181457757,
0.23850273859717308,
Expand All @@ -52,7 +52,7 @@
"myocardium ra": {
"D": 0.0015,
"f": 0.07000000000000002,
"Dpim": 0.07000000000000002,
"Dp": 0.07000000000000002,
"data": [
0.3701390037402836,
0.3547247709293157,
Expand All @@ -77,7 +77,7 @@
"Blood RV": {
"D": 0.0030000000000000005,
"f": 1.0,
"Dpim": 0.1,
"Dp": 0.1,
"data": [
0.17106052259021262,
0.16582622007452907,
Expand All @@ -102,7 +102,7 @@
"Blood RA": {
"D": 0.0029999999999999996,
"f": 1.0,
"Dpim": 0.09999999999999998,
"Dp": 0.09999999999999998,
"data": [
0.3703033790249206,
0.3624481744017803,
Expand All @@ -127,7 +127,7 @@
"body": {
"D": 0.0016236203565420872,
"f": 0.4753571532049581,
"Dpim": 0.07819939418114051,
"Dp": 0.07819939418114051,
"data": [
0.14414367264868502,
0.14254894780713223,
Expand All @@ -152,7 +152,7 @@
"muscle": {
"D": 0.0022959754525911096,
"f": 0.07800932022121823,
"Dpim": 0.020599452033620267,
"Dp": 0.020599452033620267,
"data": [
0.08757654862963136,
0.08674376658664566,
Expand All @@ -177,7 +177,7 @@
"Liver": {
"D": 0.0015,
"f": 0.11000000000000007,
"Dpim": 0.1,
"Dp": 0.1,
"data": [
0.20764655512452465,
0.20304949087263294,
Expand All @@ -202,7 +202,7 @@
"gall bladder": {
"D": 0.002997327922401265,
"f": 0.10616955533913808,
"Dpim": 0.023182496720710072,
"Dp": 0.023182496720710072,
"data": [
0.3493065062338589,
0.3459177539619973,
Expand All @@ -227,7 +227,7 @@
"Right Lung": {
"D": 0.0010502135295603014,
"f": 0.15212112147976886,
"Dpim": 0.057475643163223775,
"Dp": 0.057475643163223775,
"data": [
0.236116775520707,
0.22538994140048546,
Expand All @@ -252,7 +252,7 @@
"Left Lung": {
"D": 0.001795835055926347,
"f": 0.14561457009902096,
"Dpim": 0.06618528947223794,
"Dp": 0.06618528947223794,
"data": [
0.20219391502392353,
0.20040984981695986,
Expand All @@ -277,7 +277,7 @@
"esophagus": {
"D": 0.00167,
"f": 0.31999999999999995,
"Dpim": 0.030000000000000002,
"Dp": 0.030000000000000002,
"data": [
0.47740725510389664,
0.45186638152227837,
Expand All @@ -302,7 +302,7 @@
"esophagus cont": {
"D": 0.00167,
"f": 0.31999999999999995,
"Dpim": 0.030000000000000002,
"Dp": 0.030000000000000002,
"data": [
0.4908291180811218,
0.46298734193501884,
Expand All @@ -327,7 +327,7 @@
"st wall": {
"D": 0.0015,
"f": 0.29999999999999993,
"Dpim": 0.012,
"Dp": 0.012,
"data": [
0.33972021704324323,
0.33489876248808564,
Expand All @@ -352,7 +352,7 @@
"Stomach Contents": {
"D": 0.0018682099526511075,
"f": 0.39258798069650686,
"Dpim": 0.024967378215835983,
"Dp": 0.024967378215835983,
"data": [
0.3560052458252937,
0.34991932799935316,
Expand All @@ -377,7 +377,7 @@
"pancreas": {
"D": 0.0012999999999999997,
"f": 0.14999999999999997,
"Dpim": 0.01,
"Dp": 0.01,
"data": [
0.2607580651974088,
0.2531536308045649,
Expand All @@ -402,7 +402,7 @@
"Right kydney cortex": {
"D": 0.00212,
"f": 0.09699999999999998,
"Dpim": 0.02,
"Dp": 0.02,
"data": [
0.15963378893525246,
0.15592535517239714,
Expand All @@ -427,7 +427,7 @@
"right kidney medulla": {
"D": 0.0020900000000000003,
"f": 0.158,
"Dpim": 0.018999999999999993,
"Dp": 0.018999999999999993,
"data": [
0.15514794064191945,
0.15102045477128537,
Expand All @@ -452,7 +452,7 @@
"Left kidney cortex": {
"D": 0.00212,
"f": 0.09699999999999999,
"Dpim": 0.019999999999999997,
"Dp": 0.019999999999999997,
"data": [
0.2865960334102167,
0.28242548008727403,
Expand All @@ -477,7 +477,7 @@
"left kidney medulla": {
"D": 0.0020900000000000003,
"f": 0.158,
"Dpim": 0.018999999999999996,
"Dp": 0.018999999999999996,
"data": [
0.28071870508429503,
0.27599110495416473,
Expand All @@ -502,7 +502,7 @@
"adrenal": {
"D": 0.0020427033152408346,
"f": 0.29620728443102123,
"Dpim": 0.009645041271999775,
"Dp": 0.009645041271999775,
"data": [
0.2826787411763678,
0.27831009499717363,
Expand All @@ -527,7 +527,7 @@
"Right Renal Pelvis": {
"D": 0.0023226345557043155,
"f": 0.08526206184364574,
"Dpim": 0.011505159298527953,
"Dp": 0.011505159298527953,
"data": [
0.23845594027974554,
0.2340885887968851,
Expand All @@ -552,7 +552,7 @@
"Left Renal Pelvis": {
"D": 0.0033466566117599994,
"f": 0.4828160165372796,
"Dpim": 0.08583973481164611,
"Dp": 0.08583973481164611,
"data": [
0.29934044796894144,
0.2932737029677877,
Expand All @@ -577,7 +577,7 @@
"spleen": {
"D": 0.0012999999999999997,
"f": 0.19999999999999998,
"Dpim": 0.03000000000000001,
"Dp": 0.03000000000000001,
"data": [
0.20825262009604234,
0.20694704899515484,
Expand All @@ -602,7 +602,7 @@
"Ribs": {
"D": 0.0014138413075201123,
"f": 0.048836057003191935,
"Dpim": 0.07342330265121569,
"Dp": 0.07342330265121569,
"data": [
0.12711214146958372,
0.1263954809552108,
Expand All @@ -627,7 +627,7 @@
"Cortical Bone": {
"D": 0.0018204574812188043,
"f": 0.06101911742238941,
"Dpim": 0.05451769101112701,
"Dp": 0.05451769101112701,
"data": [
0.009390143914629926,
0.009099037389799763,
Expand All @@ -652,7 +652,7 @@
"Spine": {
"D": 0.0006031655633456552,
"f": 0.45466020103939103,
"Dpim": 0.030877998160001693,
"Dp": 0.030877998160001693,
"data": [
0.2074391650883512,
0.20328222351873226,
Expand All @@ -677,7 +677,7 @@
"spinal cord": {
"D": 0.0024875668530619454,
"f": 0.1558555380447055,
"Dpim": 0.05700680211778108,
"Dp": 0.05700680211778108,
"data": [
0.14968537510540572,
0.1474358467818982,
Expand All @@ -702,7 +702,7 @@
"Bone Marrow": {
"D": 0.002140130838029838,
"f": 0.09242722776276355,
"Dpim": 0.10195846277645583,
"Dp": 0.10195846277645583,
"data": [
0.1137767818468923,
0.11195565594192901,
Expand All @@ -727,7 +727,7 @@
"Artery": {
"D": 0.0029999999999999988,
"f": 1.0,
"Dpim": 0.09999999999999998,
"Dp": 0.09999999999999998,
"data": [
0.22834647271477249,
0.2231054294831425,
Expand All @@ -752,7 +752,7 @@
"Vein": {
"D": 0.002999999999999999,
"f": 1.0,
"Dpim": 0.09999999999999999,
"Dp": 0.09999999999999999,
"data": [
0.22441397394228915,
0.22020896097441717,
Expand All @@ -777,7 +777,7 @@
"asc lower intestine": {
"D": 0.00131,
"f": 0.6899999999999998,
"Dpim": 0.028999999999999998,
"Dp": 0.028999999999999998,
"data": [
0.2954735243830286,
0.2906352588520771,
Expand All @@ -802,7 +802,7 @@
"trans lower intestine": {
"D": 0.0013099999999999997,
"f": 0.6899999999999997,
"Dpim": 0.029000000000000012,
"Dp": 0.029000000000000012,
"data": [
0.3059958856171849,
0.3033478430012246,
Expand All @@ -827,7 +827,7 @@
"desc lower intestine": {
"D": 0.00131,
"f": 0.6899999999999997,
"Dpim": 0.029000000000000015,
"Dp": 0.029000000000000015,
"data": [
0.3321131178872771,
0.32853831493658764,
Expand All @@ -852,7 +852,7 @@
"small intestine": {
"D": 0.00131,
"f": 0.6899999999999998,
"Dpim": 0.02900000000000001,
"Dp": 0.02900000000000001,
"data": [
0.30074425040279856,
0.2944845452430382,
Expand All @@ -877,7 +877,7 @@
"pericardium": {
"D": 0.0030000000000000005,
"f": 0.07000000000000002,
"Dpim": 0.009999999999999998,
"Dp": 0.009999999999999998,
"data": [
0.32000494407805,
0.3088654009375722,
Expand All @@ -902,7 +902,7 @@
"Cartilage": {
"D": 0.0026870215041229625,
"f": 0.38563517334297287,
"Dpim": 0.012404465173409039,
"Dp": 0.012404465173409039,
"data": [
0.22023434588419283,
0.21765363810860222,
Expand All @@ -927,7 +927,7 @@
"Fat": {
"D": 0.0015908888071378827,
"f": 0.4858910413604801,
"Dpim": 0.10124472949421114,
"Dp": 0.10124472949421114,
"data": [
0.04347759306594482,
0.04331055503018695,
Expand Down

0 comments on commit f1bc6a3

Please sign in to comment.