Skip to content

Commit be01e0c

Browse files
authored
Change function name linoptions to opticsoptions (#396)
1 parent 7aa0e26 commit be01e0c

File tree

9 files changed

+11
-11
lines changed

9 files changed

+11
-11
lines changed

atmat/atplot/atplot.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
varargs=cellfun(@correct, varargs, 'UniformOutput',false);
9393
[dpargs,varargs]=getoption(varargs,{'dp','dct','df'});
9494
[srange,varargs]=getargs(varargs,[0 inf],'check',@(x) isnumeric(x) && numel(x)==2);
95-
[largs,varargs]=linoptions(varargs);
95+
[largs,varargs]=opticsoptions(varargs);
9696

9797
lindata=[];
9898

@@ -118,7 +118,7 @@
118118
if nargout>0, varargout={curve}; end
119119

120120
function [s,plotdata]=ringplot(ring,dpp,plotfun,varargin)
121-
[linargs,vargs] = linoptions(varargin);
121+
[linargs,vargs] = opticsoptions(varargin);
122122
[ringdata,lindata]=atlinopt6(ring,1:length(ring)+1,linargs{:}); %#ok<ASGLU>
123123
s=cat(1,lindata.SPos);
124124
plotdata=plotfun(lindata,ring,dpp,vargs{:});

atmat/atplot/plotfunctions/plBeamSize.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
varargout={plotdata};
2626
else % From atbaseplot
2727
[ring,dpp]=deal(varargin{1:2});
28-
[linargs,varargs]=linoptions(varargin(3:end));
28+
[linargs,varargs]=opticsoptions(varargin(3:end));
2929
[~,lindata]=atlinopt6(ring,1:length(ring)+1,linargs{:});
3030
s=cat(1,lindata.SPos);
3131
varargout={s,plBeamSize(lindata,ring,dpp,varargs{:})};

atmat/atplot/plotfunctions/plClosedOrbit.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
varargout={plotdata};
2626
else % From atbaseplot
2727
[ring,dpp]=deal(varargin{1:2});
28-
[linargs,varargs]=linoptions(varargin(3:end));
28+
[linargs,varargs]=opticsoptions(varargin(3:end));
2929
[~,lindata]=atlinopt6(ring,1:length(ring)+1,linargs{:});
3030
s=cat(1,lindata.SPos);
3131
varargout={s,plClosedOrbit(lindata,ring,dpp,varargs{:})};

atmat/atplot/plotfunctions/plEmitContrib.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
varargout={plotdata};
3131
else % From atbaseplot
3232
[ring,dpp]=deal(varargin{1:2});
33-
[linargs,varargs]=linoptions(varargin(3:end));
33+
[linargs,varargs]=opticsoptions(varargin(3:end));
3434
[~,lindata]=atlinopt6(ring,1:length(ring)+1,linargs{:});
3535
s=cat(1,lindata.SPos);
3636
varargout={s,plEmitContrib(lindata,ring,dpp,varargs{:})};

atmat/atplot/plotfunctions/plotB0curlyh.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
varargout={plotdata};
3232
else % From atbaseplot
3333
[ring,dpp]=deal(varargin{1:2});
34-
[linargs,varargs]=linoptions(varargin(3:end));
34+
[linargs,varargs]=opticsoptions(varargin(3:end));
3535
[~,lindata]=atlinopt6(ring,1:length(ring)+1,linargs{:});
3636
s=cat(1,lindata.SPos);
3737
varargout={s,plotB0curlyh(lindata,ring,dpp,varargs{:})};

atmat/atplot/plotfunctions/plotbetadisp.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
varargout={plotdata};
2626
else % From atbaseplot
2727
[ring,dpp]=deal(varargin{1:2});
28-
[linargs,varargs]=linoptions(varargin(3:end));
28+
[linargs,varargs]=opticsoptions(varargin(3:end));
2929
[~,lindata]=atlinopt6(ring,1:length(ring)+1,linargs{:});
3030
s=cat(1,lindata.SPos);
3131
varargout={s,plotbetadisp(lindata,ring,dpp,varargs{:})};

atmat/atplot/plotfunctions/plotbetadispcurlyh.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
varargout={plotdata};
2424
else % From atbaseplot
2525
[ring,dpp]=deal(varargin{1:2});
26-
[linargs,varargs]=linoptions(varargin(3:end));
26+
[linargs,varargs]=opticsoptions(varargin(3:end));
2727
[~,lindata]=atlinopt6(ring,1:length(ring)+1,linargs{:});
2828
s=cat(1,lindata.SPos);
2929
varargout={s,plotbetadispcurlyh(lindata,ring,dpp,varargs{:})};

atmat/atplot/plotfunctions/plotsqrtbetadispcurlyh.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
varargout={plotdata};
2424
else % From atbaseplot
2525
[ring,dpp]=deal(varargin{1:2});
26-
[linargs,varargs]=linoptions(varargin(3:end));
26+
[linargs,varargs]=opticsoptions(varargin(3:end));
2727
[~,lindata]=atlinopt6(ring,1:length(ring)+1,linargs{:});
2828
s=cat(1,lindata.SPos);
2929
varargout={s,plotsqrtbetadispcurlyh(lindata,ring,dpp,varargs{:})};

atmat/atutils/linoptions.m renamed to atmat/atutils/opticsoptions.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
function [linargs,opts] = linoptions(opts)
2-
%LINOPTIONS (private) extract arguments for atlinopt
1+
function [linargs,opts] = opticsoptions(opts)
2+
%OPTICSOPTIONS (private) extract arguments for atlinopt
33
%
44
% Separate the options for atlinopt
55

0 commit comments

Comments
 (0)