Commit 90a93f51 authored by Simone Liuzzo's avatar Simone Liuzzo
Browse files

reverted to previous version

parent 0138a539
......@@ -26,7 +26,6 @@ classdef atmodel < handle
%10: phiz/2pi/nux
%11: etaz
%12: eta'z
%13: s position (entrance)
%
%Default parameters:
%
......@@ -34,7 +33,7 @@ classdef atmodel < handle
%[theta/2Pi, betax, Phix/2PiNux, etax, betaz, Phiz/2PiNux]
properties (Constant, Access=protected, Hidden)
fileorder=[2 3 8 4 9 5 10 6 7 11 12 1 0 13]
fileorder=[2 3 8 4 9 5 10 6 7 11 12 1 0]
locs=atmodel.getlocs() % Parameter indexing
prms=[2 3 5 6 8 10] % Default parameters
end
......@@ -275,14 +274,12 @@ classdef atmodel < handle
tune=lindata(end).mu/2/pi;
this.tunes_=tune;
tt=cat(1,lindata.SPos)/this.ll_;
spos = cat(1,lindata.SPos);% element entrance positions
this.vlave=[[0.5*(tt(1:end-1)+tt(2:end));tt(end)] ... % theta (1)
avebeta ... % beta (2,3)
cat(1,lindata.alpha) ... % alpha (4,5)
avemu./tune(ones(ndata,1),:)/2/pi ... % phi (6,7)
avedisp ... % eta (8,9,10,11)
NaN*ones(ndata,1) (1:ndata)' ... % strength (12), id (13)
spos]; % s pos (14)
this.vlave=[[0.5*(tt(1:end-1)+tt(2:end));tt(end)] ... % theta
avebeta ... % beta
cat(1,lindata.alpha) ... % alpha
avemu./tune(ones(ndata,1),:)/2/pi ... % phi
avedisp ... % eta
NaN*ones(ndata,1) (1:ndata)']; % strength, id
% this.vlini=[spos ...
% cat(1,lindata.beta) ...
% cat(1,lindata.alpha) ...
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment