Correct conical shape for the mirror
This commit is contained in:
parent
b347442859
commit
6a3af445dc
@ -46,7 +46,7 @@ opts_nano_hexapod = struct('actuator', 'lorentz');
|
|||||||
initializeNanoHexapod(opts_nano_hexapod);
|
initializeNanoHexapod(opts_nano_hexapod);
|
||||||
|
|
||||||
%% Initialize the Mirror
|
%% Initialize the Mirror
|
||||||
initializeMirror();
|
initializeMirror(struct('shape', 'conical'));
|
||||||
|
|
||||||
%% Initialize Sample
|
%% Initialize Sample
|
||||||
opts_sample = struct('mass', 20);
|
opts_sample = struct('mass', 20);
|
||||||
|
@ -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];
|
mirror.shape = [mirror.shape; sqrt(mirror.sphere_radius^2-(z-mirror.jacobian-mirror.h)^2) z];
|
||||||
end
|
end
|
||||||
elseif strcmp(opts.shape, 'conical')
|
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
|
else
|
||||||
error('Shape should be either conical or spherical');
|
error('Shape should be either conical or spherical');
|
||||||
end
|
end
|
||||||
|
Loading…
Reference in New Issue
Block a user