diff --git a/1_preprocessing/gtSetup.m b/1_preprocessing/gtSetup.m index 13bf54d734949abf514d5ae4c52f336bfa98853e..693a297b299c5451b50343ef039005b3938b3dec 100644 --- a/1_preprocessing/gtSetup.m +++ b/1_preprocessing/gtSetup.m @@ -100,8 +100,8 @@ close('all'); global GT_MATLAB_HOME interactive = true; -parameters=[]; -list=[]; +parameters = []; +list = []; %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % check for a pre-existing parameters file @@ -202,16 +202,15 @@ while ~hasChosen end end +% if already exists a parameters.mat in the analysis directory, use it. tmpacqdir = parameters.acq.dir; parameters_name = fullfile(tmpacqdir,'parameters.mat'); - if exist(parameters_name,'file') p=load(parameters_name,'parameters'); p.parameters.acq.dir = parameters.acq.dir; parameters = p.parameters; disp('Using parameters file in the analysis directory...') disp(parameters_name) - clear p end parameters_name = fullfile(parameters.acq.dir,'parameters.mat'); @@ -222,7 +221,8 @@ parameters_name = fullfile(parameters.acq.dir,'parameters.mat'); %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % check the default names etc before making directories % set up directory structure in this location - +parameters.acq.dir +parameters.acq.collection_dir disp(['setting up directory structure in ' parameters.acq.dir]); [~,msg]=mkdir(parameters.acq.dir); disp(msg) @@ -551,9 +551,6 @@ if strcmpi(check,'n') disp('You can start the process later by running:') disp(' load(parameters)') disp(' gtCopyCorrectUndistortWrapper(parameters)') - if ~isempty(xopmsg) - disp(xopmsg) - end return end @@ -562,11 +559,6 @@ disp('Starting data copying using OAR') disp(' ') gtCopyCorrectUndistortWrapper(parameters); -% display xop message -if ~isempty(xopmsg) - disp(xopmsg) -end - clear msg check end % end of function