Correcting for forgotten merge

Author: oliverchampion

.gitignore

@@ -16,6 +16,11 @@ md5sums.txt
 *.gz
 *.zip
 *.tmp
+*.asv
+src/original/ASD_MemorialSloanKettering/MRI-QAMPER_IVIM/test_data
+src/original/ASD_MemorialSloanKettering/MRI-QAMPER_IVIM/output_files
+
+
 
 # Unit test / coverage reports
 .tox/

src/original/ASD_MemorialSloanKettering/MRI-QAMPER_IVIM/demo_QAMPER_IVIM.m

@@ -9,9 +9,9 @@
 %       bval_file: b-value information (txt file)
 %       roi_nii: single-volume mask ROI image (NIfTI)
 
-
-qamper_path = 'path:\to\MRI-QAMPER_IVIM'; %path where the MRI-QAMPER folder is located
-addpath(genpath(qamper_path));
+%%% add quamper to main path
+%qamper_path = 'path:\to\MRI-QAMPER_IVIM'; %path where the MRI-QAMPER folder is located
+%addpath(genpath(qamper_path));
 
 % Uncomment below and substitute the names of your files
 % img_nii = '702-D2019_10_08.nii';

src/original/ASD_MemorialSloanKettering/MRI-QAMPER_IVIM/getTestData.m

@@ -1,16 +1,22 @@
 function [img_nii,bval_file,roi_nii] = getTestData
 
 [d,~,~] = fileparts(which('getTestData'));
-test_data_folder = fullfile(d,'test_data');
+d1 = fileparts(d);        % one level up
+d2 = fileparts(d1);       % two levels up
+d3 = fileparts(d2);       % three levels up
+d4 = fileparts(d3);       % three levels up
+test_data_folder = fullfile(d4, 'download');
 if ~exist(test_data_folder,'dir')
     mkdir(test_data_folder);
 end
 
-zenodo_url = 'https://zenodo.org/records/14605039/files/OSIPI_TF24_data_phantoms.zip';
-save_zip = fullfile(test_data_folder,'OSIPI_TF24_data_phantoms.zip');
-websave(save_zip,zenodo_url);
-unzip(save_zip, test_data_folder);
+if ~exist(fullfile(test_data_folder,'OSIPI_TF24_data_phantoms.zip'),'file')
+    zenodo_url = 'https://zenodo.org/records/14605039/files/OSIPI_TF24_data_phantoms.zip';
+    save_zip = fullfile(test_data_folder,'OSIPI_TF24_data_phantoms.zip');
+    websave(save_zip,zenodo_url);
+    unzip(save_zip, test_data_folder);
+end
 
-img_nii = fulllfile(test_data_folder,'Data','brain.nii.gz');
-bval_file = fulllfile(test_data_folder,'Data','brain.bval');
-roi_nii = fulllfile(test_data_folder,'Data','brain_mask_gray_matter.nii.gz');
+img_nii = fullfile(test_data_folder,'Data','brain.nii.gz');
+bval_file = fullfile(test_data_folder,'Data','brain.bval');
+roi_nii = fullfile(test_data_folder,'Data','brain_mask_gray_matter.nii.gz');