Commit cdb2dd76 authored by Simone Liuzzo's avatar Simone Liuzzo

order of pinholes corrected (lattice order)

parent 11c38622
......@@ -2,7 +2,7 @@ function qemb = qemoptics(qemres,qemb,qemb0)
%QEMOPTICS Compute optical parameters for the fitted machine
nbpm=length(qemres.bpmidx);
[idx,j,kdx]=unique([qemres.bpmidx qemres.id07idx qemres.id25idx qemres.d01idx qemres.d17idx qemres.d27idx]); %#ok<ASGLU>
[idx,j,kdx]=unique([qemres.bpmidx qemres.d01idx qemres.id07idx qemres.d17idx qemres.id25idx qemres.d27idx]); %#ok<ASGLU>
orbit0=findsyncorbit(qemb.at,qemres.ct,qemres.bpmidx);
dpp=orbit0(5,1);
......@@ -11,10 +11,10 @@ dpp=orbit0(5,1);
lindata=lindata(kdx);
qemb.lindata=lindata(1:nbpm); % BPM results
qemb.id07data=lindata(nbpm+1); % ID07 results
qemb.id25data=lindata(nbpm+2); % ID25 results
qemb.d01data=lindata(nbpm+3); % D01 results
qemb.d17data=lindata(nbpm+4); % D17 results
qemb.d01data=lindata(nbpm+1); % D01 results
qemb.id07data=lindata(nbpm+2); % ID07 results
qemb.d17data=lindata(nbpm+3); % D17 results
qemb.id25data=lindata(nbpm+4); % ID25 results
qemb.d27data=lindata(nbpm+5); % D27 results
dispersion=cat(2,qemb.lindata.Dispersion)';
qemb.tunes=qemb.pm.fulltunes;
......
......@@ -3,12 +3,13 @@ function mess=semdisp(qemb,qemres,semres)
nbpm=length(qemres.bpmidx);
alllist=1:nbpm; % all BPMS
% this order should be identical to the one in qemoptics.m
d01=nbpm+1; % D01 pinhole
id07=nbpm+2; % ID07
d17=nbpm+3; % D17
id25=nbpm+4; % ID25
d27=nbpm+5; % D27
pinholelist =[d01 id07 d17 id25 d27];
pinholelist =[d01 id07 d17 id25 d27]; % this order should be identical to the one in qemoptics.m
pinholename={'D01';'ID07';'D17';'ID25';'D27'};
emittances=qemb.emittances;
......
Markdown is supported
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