From e686e1f11be2d082fad31ce6e57cccd453b05264 Mon Sep 17 00:00:00 2001 From: Simone Liuzzo Date: Mon, 19 Oct 2020 12:55:59 +0200 Subject: [PATCH] only ID v bumps setting, faster convergence (not ok for inj cell) --- +sr/beamlines_angle_bumps.m | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/+sr/beamlines_angle_bumps.m b/+sr/beamlines_angle_bumps.m index 0f04537..7b53c9a 100644 --- a/+sr/beamlines_angle_bumps.m +++ b/+sr/beamlines_angle_bumps.m @@ -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 -- GitLab