From 600af99c9b5430b68520943fd7818fa7c2c0d23e Mon Sep 17 00:00:00 2001
From: Charlotte Bond <czb@star.sr.bham.ac.uk>
Date: Mon, 31 Mar 2014 16:10:16 +0100
Subject: [PATCH] updating functions

---
 src/mirror_maps/FT_remove_curvature_from_mirror_map.m | 4 ++--
 src/mirror_maps/FT_remove_elements_outside_map.m      | 4 ++--
 src/mirror_maps/virgo_maps/FT_plot_virgo_map.m        | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

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 1ccba9d..3ed8c22 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 33ac38c..989f6e4 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 58f74f8..6098224 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
-- 
GitLab