From f66a86453bfaed80a83675a247e29c661052ca66 Mon Sep 17 00:00:00 2001
From: Charlotte Bond <czb@star.sr.bham.ac.uk>
Date: Thu, 12 Dec 2013 15:49:31 +0000
Subject: [PATCH] only return one value for A if not astigmatic
---
src/new/zernike_polynomials/FT_Rc_to_Znm.m | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/new/zernike_polynomials/FT_Rc_to_Znm.m b/src/new/zernike_polynomials/FT_Rc_to_Znm.m
index 42f609e..12c7fdc 100644
--- a/src/new/zernike_polynomials/FT_Rc_to_Znm.m
+++ b/src/new/zernike_polynomials/FT_Rc_to_Znm.m
@@ -52,9 +52,11 @@ function [A] = FT_Rc_to_Znm(Rc,R)
% Calculate Z20 amplitude
A(1) = (Ax+Ay)/2;
- % Calculate Z22 astigmatic amplitude
- A(2) = 2*(Ax-A(1));
-
+ if length(Rc)>1
+ % Calculate Z22 astigmatic amplitude
+ A(2) = 2*(Ax-A(1));
+ end
+
% Convert amplitudes to nm
A = 1e9*A;
--
GitLab