Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions galsim/zernike.py
Original file line number Diff line number Diff line change
Expand Up @@ -421,14 +421,15 @@ def describe_zernike(j):
first = True
out = "sqrt({}) * (".format(var)

# i, k indicate powers of x and y, respectively.
for (i, k), val in np.ndenumerate(arr):
if val != 0:
if not first:
out += " + "
first = False
ival = int(np.round(val))
if ival != 1:
out += str(int(np.round(val)))
if ival != 1 or (i == 0 and k == 0):
out += str(ival)
if i >= 1:
out += "x"
if i >= 2:
Expand All @@ -442,8 +443,6 @@ def describe_zernike(j):
out = out.replace("(-1x", "(-x")
out = out.replace("(-1y", "(-y")
out = out.replace("+ -", "- ")
if out == "sqrt(1) * ()":
out = "sqrt(1) * (1)"
return out


Expand Down
1 change: 1 addition & 0 deletions tests/test_zernike.py
Original file line number Diff line number Diff line change
Expand Up @@ -760,6 +760,7 @@ def test_describe_zernike():
assert galsim.zernike.describe_zernike(3) == "sqrt(4) * (y)"
assert galsim.zernike.describe_zernike(4) == "sqrt(3) * (-1 + 2y^2 + 2x^2)"
assert galsim.zernike.describe_zernike(10) == "sqrt(8) * (-3xy^2 + x^3)"
assert galsim.zernike.describe_zernike(11) == "sqrt(5) * (1 - 6y^2 + 6y^4 - 6x^2 + 12x^2y^2 + 6x^4)"

Z22str = (
"sqrt(7) * (-1 + 12y^2 - 30y^4 + 20y^6 + 12x^2"
Expand Down
Loading