diff --git a/init_data.m b/init_data.m index c5fe32e..e1c6fa8 100644 --- a/init_data.m +++ b/init_data.m @@ -46,7 +46,7 @@ opts_nano_hexapod = struct('actuator', 'lorentz'); initializeNanoHexapod(opts_nano_hexapod); %% Initialize the Mirror -initializeMirror(); +initializeMirror(struct('shape', 'conical')); %% Initialize Sample opts_sample = struct('mass', 20); diff --git a/initialize/initializeMirror.m b/initialize/initializeMirror.m index ee075d7..29866df 100644 --- a/initialize/initializeMirror.m +++ b/initialize/initializeMirror.m @@ -40,7 +40,7 @@ function [mirror] = initializeMirror(opts_param) mirror.shape = [mirror.shape; sqrt(mirror.sphere_radius^2-(z-mirror.jacobian-mirror.h)^2) z]; end elseif strcmp(opts.shape, 'conical') - mirror.shape = [mirror.shape; mirror.rad+mirror.h/tand(opts.ang) mirror.h]; + mirror.shape = [mirror.shape; mirror.rad+mirror.h/tand(opts.angle) mirror.h]; else error('Shape should be either conical or spherical'); end