aboutsummaryrefslogtreecommitdiff
path: root/mode_match.m
diff options
context:
space:
mode:
Diffstat (limited to 'mode_match.m')
-rw-r--r--mode_match.m4
1 files changed, 4 insertions, 0 deletions
diff --git a/mode_match.m b/mode_match.m
index c08ccd6..27affcb 100644
--- a/mode_match.m
+++ b/mode_match.m
@@ -45,6 +45,10 @@ n=4;
possible_lens_placement_trunc = round(possible_lens_placement*10^n)./10^n;
[possible_lens_placement_uniq, index] = unique(possible_lens_placement_trunc,'rows','stable'); %Unique solutions only
+<<<<<<< HEAD
+n_possible_lens_placement = min(5,size(possible_lens_placement_uniq,1));
+=======
pick_of_n_best_lens_placements = min(5,size(possible_lens_placement_uniq,1));
+>>>>>>> exper
end