Commit e686e1f1 authored by Simone Liuzzo's avatar Simone Liuzzo

only ID v bumps setting, faster convergence (not ok for inj cell)

parent cf75b9bb
......@@ -10,11 +10,11 @@ tic;
disp(['---- ID ' num2str(idnum,'%.2d') ' -----']);
%setpropbump('h','id',rc,idnum,filedata);
%setpropbump('v','id',rc,idnum,filedata);
setpropbump('v','id',rc,idnum,filedata);
disp(['---- BM ' num2str(idnum,'%.2d') ' -----']);
setpropbump('h','bm',rc,idnum,filedata);
setpropbump('v','bm',rc,idnum,filedata);
%setpropbump('h','bm',rc,idnum,filedata);
%setpropbump('v','bm',rc,idnum,filedata);
t1(idnum) = toc
......@@ -385,15 +385,15 @@ LinConstr3V=atlinconstraint(...
rbump=ring0;
if bump(1)==0 && ang(1) ==0 % only V
rbump=atmatch(rbump,VariabV,[LinConstr1V LinConstr3V],10^-14,10,3,@lsqnonlin);%,'fminsearch');%
rbump=atmatch(rbump,VariabV,[LinConstr1V LinConstr3V],10^-10,10,3,@lsqnonlin);%,'fminsearch');%
elseif bump(2)==0 && ang(2) ==0 % only H
rbump=atmatch(rbump,VariabH,[LinConstr1H LinConstr3H],10^-14,10,3,@lsqnonlin);%,'fminsearch');%
rbump=atmatch(rbump,VariabH,[LinConstr1H LinConstr3H],10^-10,10,3,@lsqnonlin);%,'fminsearch');%
else
%rbump=atmatch(rbump,VariabH,[LinConstr1 LinConstr3],10^-14,10,3,@fminsearch);%,'fminsearch');%
rbump=atmatch(rbump,VariabH,[LinConstr1H LinConstr3H],10^-14,10,3,@lsqnonlin);%,'fminsearch');%
rbump=atmatch(rbump,VariabV,[LinConstr1V LinConstr3V],10^-14,10,3,@lsqnonlin);%,'fminsearch');%
rbump=atmatch(rbump,VariabH,[LinConstr1H LinConstr3H],10^-10,10,3,@lsqnonlin);%,'fminsearch');%
rbump=atmatch(rbump,VariabV,[LinConstr1V LinConstr3V],10^-10,10,3,@lsqnonlin);%,'fminsearch');%
end
......
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