diff --git a/zUtil_Cryst/gtVectorCryst2Lab.m b/zUtil_Cryst/gtVectorCryst2Lab.m index 0a30e32c38cae6ca3b1b16e4cbefa2df7bb68c41..a59ffdaca741b3e44f7ac645ff15c6c69d91cd22 100644 --- a/zUtil_Cryst/gtVectorCryst2Lab.m +++ b/zUtil_Cryst/gtVectorCryst2Lab.m @@ -56,7 +56,7 @@ elseif isnumeric(mode) elseif ischar(mode) && strcmp(mode, 'diag') if M ~= N gtError('gtVectorCryst2Lab:wrong_mode', ... - ['''diag'' mode needs as many vectors as matrices!']); + '''diag'' mode needs as many vectors as matrices!'); end diag = true; else @@ -113,7 +113,7 @@ elseif M > 1 && N > 1 Vc = reshape(Vc.', [3 1 1 M]); % Multiply and sum along 1st axis to reproduce Vs = Vc . g - Vs = permute(squeeze(sum(bsxfun(@times, Vc, g), 1)), [mode]); + Vs = permute(squeeze(sum(bsxfun(@times, Vc, g), 1)), mode); else gtError('gtVectorCryst2Lab:wrong_input_size', ... diff --git a/zUtil_Parameters/gtSubList.m b/zUtil_Parameters/gtSubList.m index 94fc64f25fe2191e48ac28ccb23a6b614e8d2be1..c593bac11d126bc93987b2e15114f0b5057b72a2 100644 --- a/zUtil_Parameters/gtSubList.m +++ b/zUtil_Parameters/gtSubList.m @@ -1,21 +1,25 @@ function sublist = gtSubList(list, varargin) +% GTSUBLIST Creates sub-list to give to gtModifyStructure +% sublist = gtSubList(list, varargin) +% ----------------------------------- +% based on a list created using make_parameters / build_list, +% make a sublist suitable for gtModifyStructure, containing only the +% requested fields. % -% based on a list created using make_parameters / build_list, -% make a sublist suitable for gtModifyStructure, containing only the -% requested fields. -% -% input, for example: gtSubList(list.acq, 'name', 'dir', energy') -% output: sublist, a 3x2 cell for gtModifyStructure +% input, for example: gtSubList(list.acq, 'name', 'dir', energy') +% output: sublist, a 3x2 cell for gtModifyStructure % preallocate sublist sublist=cell(length(varargin), 2); -for i=1:length(varargin) - ndx=find(strcmp(list(:,1), varargin{i})); +for ii=1:length(varargin) + ndx=find(strcmp(list(:,1), varargin{ii})); if ~isempty(ndx) - sublist{i,1}=list{ndx, 1}; - sublist{i,2}=list{ndx, 2}; + sublist{ii,1}=list{ndx, 1}; + sublist{ii,2}=list{ndx, 2}; else - disp(sprintf('problem with input to gtSubList - field name %s not found in main list', varargin{i})) + disp(['problem with input to gtSubList - field name ' varargin{ii} ' not found in main list']) end -end \ No newline at end of file +end + +end % end of function diff --git a/zUtil_Parameters/make_parameters.m b/zUtil_Parameters/make_parameters.m index 0ed6e1c163d1058640359fa6a593aeacfb70fdd5..b77527eaac9d9a16f2ba3c9c6f06b2c6d5b0254b 100644 --- a/zUtil_Parameters/make_parameters.m +++ b/zUtil_Parameters/make_parameters.m @@ -1,7 +1,7 @@ function [parameters, list] = make_parameters(version) % MAKE_PARAMETERS Create a parameters.mat file with empty fields -% [parameters, list] = make_parameters(version,debug) -% --------------------------------------------------- +% [parameters, list] = make_parameters(version) +% --------------------------------------------- % % INPUT: % version = -1 (load a specific .mat file) @@ -18,26 +18,25 @@ function [parameters, list] = make_parameters(version) % Creates a .mat file with description for each field in the parameters.mat to be used with gtModifyStructure.m % - disp('Getting the field list of parameters...') - switch (version) - case -1 - filename = inputwdefault('Insert filepath of the mat file to load', ... - './parameters.mat'); - pars = load(filename, 'parameters'); - pars = pars.parameters; - list = complete_structure(pars, [], true, '__'); - parameters = build_structure(list, '__'); - case 0 - list = build_list_v0(); - parameters = build_structure(list, '__'); - case 1 - list = build_list_v1(); - parameters = build_structure(list, '__'); - case 2 - list = build_list_v2(); - parameters = build_structure(list, '__'); - parameters.version.number = 2; - end -end % end of function - +disp('Getting the field list of parameters...') +switch (version) + case -1 + filename = inputwdefault('Insert filepath of the mat file to load', ... + './parameters.mat'); + pars = load(filename, 'parameters'); + pars = pars.parameters; + list = complete_structure(pars, [], true, '__'); + parameters = build_structure(list, '__'); + case 0 + list = build_list_v0(); + parameters = build_structure(list, '__'); + case 1 + list = build_list_v1(); + parameters = build_structure(list, '__'); + case 2 + list = build_list_v2(); + parameters = build_structure(list, '__'); + parameters.version.number = 2; +end +end % end of function