From cb3e5bdc5774dac4ad6ca453614e0f58038771c4 Mon Sep 17 00:00:00 2001 From: arokem Date: Fri, 31 Mar 2017 14:48:25 -0700 Subject: [PATCH 1/5] Get the ISBI 2013 data from UW Researchworks. --- dipy/data/fetcher.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dipy/data/fetcher.py b/dipy/data/fetcher.py index 9fbb157c0a..65ebdd1ca4 100644 --- a/dipy/data/fetcher.py +++ b/dipy/data/fetcher.py @@ -252,10 +252,10 @@ def fetcher(): fetch_isbi2013_2shell = _make_fetcher( "fetch_isbi2013_2shell", pjoin(dipy_home, 'isbi2013'), - 'https://dl.dropboxusercontent.com/u/2481924/isbi2013_merlet/', - ['2shells-1500-2500-N64-SNR-30.nii.gz', - '2shells-1500-2500-N64.bval', - '2shells-1500-2500-N64.bvec'], + 'https://digital.lib.washington.edu/researchworks/bitstream/handle/1773/38465/', + ['phantom64.nii.gz', + 'phantom64.bval', + 'phantom64.bvec'], ['phantom64.nii.gz', 'phantom64.bval', 'phantom64.bvec'], ['42911a70f232321cf246315192d69c42', '90e8cf66e0f4d9737a3b3c0da24df5ea', @@ -401,7 +401,7 @@ def fetcher(): 'https://ndownloader.figshare.com/files/', ['5305243', '5305246', '5305249'], ['ivim.nii.gz', 'ivim.bval', 'ivim.bvec'], - ['cda596f89dc2676af7d9bf1cabccf600', + ['cda596f89dc2676af7d9bf1cabccf600', 'f03d89f84aa9a9397103a400e43af43a', 'fb633a06b02807355e49ccd85cb92565'], doc="Download IVIM dataset") From 966f42583c9f329fe2efb74e86c3316feea68437 Mon Sep 17 00:00:00 2001 From: arokem Date: Wed, 12 Apr 2017 18:23:09 -0700 Subject: [PATCH 2/5] Replace links to Dropbox with links to a permanent repo. --- dipy/data/fetcher.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/dipy/data/fetcher.py b/dipy/data/fetcher.py index 65ebdd1ca4..9c5650102f 100644 --- a/dipy/data/fetcher.py +++ b/dipy/data/fetcher.py @@ -276,10 +276,8 @@ def fetcher(): fetch_sherbrooke_3shell = _make_fetcher( "fetch_sherbrooke_3shell", pjoin(dipy_home, 'sherbrooke_3shell'), - 'https://dl.dropboxusercontent.com/u/2481924/sherbrooke_data/', - ['3shells-1000-2000-3500-N193.nii.gz', - '3shells-1000-2000-3500-N193.bval', - '3shells-1000-2000-3500-N193.bvec'], +"https://digital.lib.washington.edu/researchworks/bitstream/handle/1773/38475/", + ['HARDI193.nii.gz', 'HARDI193.bval', 'HARDI193.bvec'], ['HARDI193.nii.gz', 'HARDI193.bval', 'HARDI193.bvec'], ['0b735e8f16695a37bfbd66aab136eb66', 'e9b9bb56252503ea49d31fb30a0ac637', @@ -335,7 +333,7 @@ def fetcher(): fetch_syn_data = _make_fetcher( "fetch_syn_data", pjoin(dipy_home, 'syn_test'), - 'https://dl.dropboxusercontent.com/u/5918983/', +"https://digital.lib.washington.edu/researchworks/bitstream/handle/1773/38476/", ['t1.nii.gz', 'b0.nii.gz'], ['t1.nii.gz', 'b0.nii.gz'], ['701bda02bb769655c7d4a9b1df2b73a6', @@ -387,7 +385,7 @@ def fetcher(): fetch_bundles_2_subjects = _make_fetcher( "fetch_bundles_2_subjects", pjoin(dipy_home, 'exp_bundles_and_maps'), - 'https://dl.dropboxusercontent.com/u/2481924/', +'https://digital.lib.washington.edu/researchworks/bitstream/handle/1773/38477/', ['bundles_2_subjects.tar.gz'], ['bundles_2_subjects.tar.gz'], ['97756fbef11ce2df31f1bedf1fc7aac7'], @@ -402,8 +400,8 @@ def fetcher(): ['5305243', '5305246', '5305249'], ['ivim.nii.gz', 'ivim.bval', 'ivim.bvec'], ['cda596f89dc2676af7d9bf1cabccf600', - 'f03d89f84aa9a9397103a400e43af43a', - 'fb633a06b02807355e49ccd85cb92565'], + 'f03d89f84aa9a9397103a400e43af43a', + 'fb633a06b02807355e49ccd85cb92565'], doc="Download IVIM dataset") From 138ffe73a0cbcde073ec567965052a535dc839a5 Mon Sep 17 00:00:00 2001 From: arokem Date: Wed, 12 Apr 2017 18:57:09 -0700 Subject: [PATCH 3/5] Get a couple more data-sets onto a permanent URL. --- dipy/data/fetcher.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dipy/data/fetcher.py b/dipy/data/fetcher.py index 9c5650102f..dda887feac 100644 --- a/dipy/data/fetcher.py +++ b/dipy/data/fetcher.py @@ -363,8 +363,7 @@ def fetcher(): fetch_scil_b0 = _make_fetcher( "fetch_scil_b0", dipy_home, - 'http://scil.dinf.usherbrooke.ca/wp-content/data/', - ['datasets_multi-site_all_companies.zip'], +"https://digital.lib.washington.edu/researchworks/bitstream/handle/1773/38479", ['datasets_multi-site_all_companies.zip'], ['datasets_multi-site_all_companies.zip'], None, doc="Download b=0 datasets from multiple MR systems (GE, Philips, Siemens) \ @@ -374,7 +373,7 @@ def fetcher(): fetch_viz_icons = _make_fetcher("fetch_viz_icons", pjoin(dipy_home, "icons"), - 'https://dl.dropboxusercontent.com/u/2481924/', +"https://digital.lib.washington.edu/researchworks/bitstream/handle/1773/38478", ['icomoon.tar.gz'], ['icomoon.tar.gz'], ['94a07cba06b4136b6687396426f1e380'], From 699e2441d88baa32234d9775392c01fdd1982e8d Mon Sep 17 00:00:00 2001 From: arokem Date: Wed, 12 Apr 2017 19:24:39 -0700 Subject: [PATCH 4/5] Last data set off dropbox. --- dipy/data/fetcher.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dipy/data/fetcher.py b/dipy/data/fetcher.py index dda887feac..9b461403a8 100644 --- a/dipy/data/fetcher.py +++ b/dipy/data/fetcher.py @@ -317,7 +317,7 @@ def fetcher(): fetch_taiwan_ntu_dsi = _make_fetcher( "fetch_taiwan_ntu_dsi", pjoin(dipy_home, 'taiwan_ntu_dsi'), - "http://dl.dropbox.com/u/2481924/", +"https://digital.lib.washington.edu/researchworks/bitstream/handle/1773/38480/", ['taiwan_ntu_dsi.nii.gz', 'tawian_ntu_dsi.bval', 'taiwan_ntu_dsi.bvec', 'license_taiwan_ntu_dsi.txt'], ['DSI203.nii.gz', 'DSI203.bval', 'DSI203.bvec', 'DSI203_license.txt'], From 30c2db017076f2bb429fe582bd09d25edbe062e6 Mon Sep 17 00:00:00 2001 From: arokem Date: Wed, 12 Apr 2017 19:34:22 -0700 Subject: [PATCH 5/5] Fix some typos. --- dipy/data/fetcher.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dipy/data/fetcher.py b/dipy/data/fetcher.py index 9b461403a8..9dc5943926 100644 --- a/dipy/data/fetcher.py +++ b/dipy/data/fetcher.py @@ -318,8 +318,7 @@ def fetcher(): "fetch_taiwan_ntu_dsi", pjoin(dipy_home, 'taiwan_ntu_dsi'), "https://digital.lib.washington.edu/researchworks/bitstream/handle/1773/38480/", - ['taiwan_ntu_dsi.nii.gz', 'tawian_ntu_dsi.bval', - 'taiwan_ntu_dsi.bvec', 'license_taiwan_ntu_dsi.txt'], + ['DSI203.nii.gz', 'DSI203.bval', 'DSI203.bvec', 'DSI203_license.txt'], ['DSI203.nii.gz', 'DSI203.bval', 'DSI203.bvec', 'DSI203_license.txt'], ['950408c0980a7154cb188666a885a91f', '602e5cb5fad2e7163e8025011d8a6755', @@ -363,7 +362,8 @@ def fetcher(): fetch_scil_b0 = _make_fetcher( "fetch_scil_b0", dipy_home, -"https://digital.lib.washington.edu/researchworks/bitstream/handle/1773/38479", ['datasets_multi-site_all_companies.zip'], +"https://digital.lib.washington.edu/researchworks/bitstream/handle/1773/38479/", + ['datasets_multi-site_all_companies.zip'], ['datasets_multi-site_all_companies.zip'], None, doc="Download b=0 datasets from multiple MR systems (GE, Philips, Siemens) \ @@ -373,7 +373,7 @@ def fetcher(): fetch_viz_icons = _make_fetcher("fetch_viz_icons", pjoin(dipy_home, "icons"), -"https://digital.lib.washington.edu/researchworks/bitstream/handle/1773/38478", +"https://digital.lib.washington.edu/researchworks/bitstream/handle/1773/38478/", ['icomoon.tar.gz'], ['icomoon.tar.gz'], ['94a07cba06b4136b6687396426f1e380'],