diff --git a/dev/errmap.m b/dev/errmap.m index 96af161f01caff08c3013be2af6122938650ba45..d7508b83820847b47d04e08cf356ceae907410be 100644 --- a/dev/errmap.m +++ b/dev/errmap.m @@ -70,21 +70,27 @@ function errmap(fconf) a=[ones(length(X),1) X Y RHO2 RHO2.*X RHO2.*Y DELTA2]; c=a\W; u0=u0-(c(1)+x*c(2)+y*c(3)+rho2*c(4)+rho2.*x*c(5)+rho2.*y*c(6)+delta2*c(7)); + case 3 + a=[ones(length(X),1) X Y DELTA2]; + c=a\W; + u0=u0-(c(1)+x*c(2)+y*c(3)+delta2*c(4)); otherwise error("invalid aber value"); endswitch %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - printf('********************************\n'); - xf=c(5)*2*F^3*lambda/pi; - yf=c(6)*2*F^3*lambda/pi; - zf=c(4)*2*F^2*lambda/pi; -% phi=atan2((c(3)*lambda/(2*pi)-yf/F),(c(2)*lambda/(2*pi)-xf/F))*180/pi -% theta=((c(3)*lambda/(2*pi)-yf/F)/sind(phi))*180/pi - printf('Feed displacements:\n'); - printf('x=%f (mm)\n',1E3*xf); - printf('y=%f (mm)\n',1E3*yf); - printf('z=%f (mm)\n',1E3*zf); - printf('********************************\n'); + if(aber<3) + printf('********************************\n'); + xf=c(5)*2*F^3*lambda/pi; + yf=c(6)*2*F^3*lambda/pi; + zf=c(4)*2*F^2*lambda/pi; +% phi=atan2((c(3)*lambda/(2*pi)-yf/F),(c(2)*lambda/(2*pi)-xf/F))*180/pi +% theta=((c(3)*lambda/(2*pi)-yf/F)/sind(phi))*180/pi + printf('Feed displacements:\n'); + printf('x=%f (mm)\n',1E3*xf); + printf('y=%f (mm)\n',1E3*yf); + printf('z=%f (mm)\n',1E3*zf); + printf('********************************\n'); + end %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% else a=[ones(length(X),1) X Y]; diff --git a/dev/radrms.m b/dev/radrms.m index 72344f2144410a71e68bd868cd3e167d455da705..c23af1b0cb5d653ea1e4ed0cde73af4cc76d5743 100644 --- a/dev/radrms.m +++ b/dev/radrms.m @@ -1,4 +1,4 @@ -function radrms(fconf) +function [x y u]=radrms(fconf) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % Function: @@ -39,20 +39,29 @@ function radrms(fconf) [xm ym]=meshgrid(x0,x0); R=sqrt(xm.^2+ym.^2); d=5; - x0=y=[]; + x0=y=u=[]; for r=r0:r1-d z=(R>=r); z=z.*(R<r+d); i0=find(z>0); % imagesc(z) y=[y ;std(u3(i0))]; + u=[u ;mean(u3(i0))]; x0=[x0 ; r]; end dx=D/(mp-1)/k0; x=x0*dx; y(end-d:end)=y(end-d); + u(end-d:end)=u(end-d); + figure(9); plot(x,y,'*-'); grid minor on; axis([4.5 32]); + + figure(10); + plot(x,u,'*-'); + grid minor on; + axis([4.5 32]); end +