diff --git a/src/mirror_maps/FT_remove_curvature_from_mirror_map.m b/src/mirror_maps/FT_remove_curvature_from_mirror_map.m index 1ccba9d5d7709f8957788f095bac86b580d1da8c..3ed8c228de3429be9f3cb4e6370ddd5b0e7778f7 100755 --- a/src/mirror_maps/FT_remove_curvature_from_mirror_map.m +++ b/src/mirror_maps/FT_remove_curvature_from_mirror_map.m @@ -1,6 +1,6 @@ % %-------------------------------------------------------------------------- -% function [map_out,Rc_out, delta_x0, delta_y0] = +% function [map_out,Rc_out, zoffset] = % FT_remove_curvature_from_mirror_map(map_in,Rc_in,w, display) % % A function for Matlab which tries to fit a sphere to the mirror surface @@ -64,7 +64,7 @@ function [map_out,Rc_out,zoffset]=FT_remove_curvature_from_mirror_map(map,Rc_in, % set options for fminsearch ('help optimset' gives the list of options) - options=optimset('Display',disp_str, 'TolX', 1e-03, 'TolFun',1e-09, 'MaxIter', 100000); + options=optimset('Display',disp_str, 'TolX', 1e-02, 'TolFun',1e-09, 'MaxIter', 100000); % create link to test function below f=@testfunc; diff --git a/src/mirror_maps/FT_remove_elements_outside_map.m b/src/mirror_maps/FT_remove_elements_outside_map.m index 33ac38c3bed90d8b143e6ea89e20fc24484c3137..989f6e4941c1bcb8a35abb1f24bf084385f49ef3 100644 --- a/src/mirror_maps/FT_remove_elements_outside_map.m +++ b/src/mirror_maps/FT_remove_elements_outside_map.m @@ -43,8 +43,8 @@ function [map] = FT_remove_elements_outside_map(map) D=2*radius; % Remove unnecessary points (nan points) outside the valid map grid. - Rx = round((ceil(D+2)/2)); - Ry = round((ceil(D+2)/2)); + Rx = round((ceil(D+4)/2)); + Ry = round((ceil(D+4)/2)); if 2*Ry<mygrid.ypoints && 2*Rx<mygrid.xpoints x0 = round(map.x0); y0 = round(map.y0); diff --git a/src/mirror_maps/virgo_maps/FT_plot_virgo_map.m b/src/mirror_maps/virgo_maps/FT_plot_virgo_map.m index 58f74f8d7918b00dddc88fc2c007d955126253ca..6098224447ebc1d7c32cefadf0baa4f6bbc63df0 100755 --- a/src/mirror_maps/virgo_maps/FT_plot_virgo_map.m +++ b/src/mirror_maps/virgo_maps/FT_plot_virgo_map.m @@ -106,7 +106,7 @@ c_max=max(abs([z_max z_min])); set(gca, 'CLim', [-c_max c_max]); set(gca, 'ZLim', [-c_max c_max]); -cmap=flip_colormap; +cmap=FT_flip_colormap; colormap(cmap); % Set a tile and align it to the left in order to leave enough space