Commit ffa4ae40 authored by henryjandrew's avatar henryjandrew
Browse files

resolved conflict

parent e423c824
......@@ -11,11 +11,11 @@ function theta = get_angle_from_point_to_wedge_face( obj, point, use_main_face )
if ~ita_diffraction_point_is_of_dim3( point )
error( 'Point has to be of dimension 3' );
end
if any( ~obj.point_outside_wedge( point ) )
%{
if any( ~obj.point_outside_wedge( point ) ) commented out!
error('Point(s) must be outside the wedge');
end
%}
if nargin < 3
use_main_face = true;
end
......
......@@ -5,9 +5,10 @@ function res = point_facing_main_side( obj, point )
% 'n2' -> source is facing opposite face of wedge
if ~obj.point_outside_wedge( point )
error( 'Source position(s) must be outside the wedge!' );
end
%}
%% begin
% Coordinate transformation with aperture location as origin
% e_z = repmat( obj.aperture_direction, dim(1), 1 );
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment