Commit 581852bf authored by beam dyn's avatar beam dyn
Browse files

synch with master

parents 2fbd5622 3df88751
......@@ -21,6 +21,7 @@ atmodel=ebs.model(pth);
bampl=[0:0.1:0.9,0.91:0.01:1.1]*(-15e-3);
injbumpmat=ebs.mathcinjectionbump(atmodel.ring,bampl);
dlmwrite('injbumpmat.cvs',[bampl' injbumpmat]);
dlmwrite('injbumpmat.cvs',[bampl' injbumpmat],....
'delimiter','\t','precision','%.6f');
end
......@@ -16,7 +16,7 @@ if isempty(npincels)
ff(ebs.model.pinhole_bm)={'d%.2d'};
npincels(ebs.model.pinhole_id)=1;
npincels(ebs.model.pinhole_bm)=1;
npincels=circshift(npincels,-3);
npincels=circshift(npincels,[0 -3]);
end
if nargin < 2, format='srdiag/emittance/'; end
......
......@@ -26,6 +26,7 @@ classdef atmodel < handle
%10: phiz/2pi/nux
%11: etaz
%12: eta'z
%13: s position (entrance)
%
%Default parameters:
%
......@@ -33,7 +34,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]
fileorder=[2 3 8 4 9 5 10 6 7 11 12 1 0 13]
locs=atmodel.getlocs() % Parameter indexing
prms=[2 3 5 6 8 10] % Default parameters
end
......@@ -274,12 +275,14 @@ classdef atmodel < handle
tune=lindata(end).mu/2/pi;
this.tunes_=tune;
tt=cat(1,lindata.SPos)/this.ll_;
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
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.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