diff --git a/+sr/beamlines_angle_bumps.m b/+sr/beamlines_angle_bumps.m index 0f04537bfeabb653730acef3309eab1092d96544..7b53c9ac0f6e0be570117ed4e901a1d928c60ee9 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