Correct conical shape for the mirror

This commit is contained in:
Thomas Dehaeze 2018-07-11 15:48:39 +02:00
parent b347442859
commit 6a3af445dc
2 changed files with 2 additions and 2 deletions

View File

@ -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);

View File

@ -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