Skip to content

fix: raise errors for invalid shears and invalid PixelScale WCS classes #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
beckermr wants to merge 3 commits into from
Closed

fix: raise errors for invalid shears and invalid PixelScale WCS classes #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
11c473b
fix: raise errors for invalid shears
beckermr May 14, 2026
062c9ed
fix: mock up equinox
beckermr May 14, 2026
e5ee401
fix: more array equals
beckermr May 14, 2026
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: 7 additions & 0 deletions tests/galsim_test_helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@
# and/or other materials provided with the distribution.
#

try:
import equinox
except ImportError:
class equinox():
EquinoxRuntimeError = RuntimeError

import pytest
import numpy as np
import galsim
Expand Down Expand Up @@ -52,6 +58,7 @@
"pytest",
"run_slow",
"runtests",
"equinox",
]

# This file has some helper functions that are used by tests from multiple files to help
Expand Down
26 changes: 10 additions & 16 deletions tests/test_shear.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,23 +176,17 @@ def test_shear_initialization():
assert_raises(TypeError,galsim.Shear,g1=0.3,e2=0.2)
assert_raises(TypeError,galsim.Shear,eta1=0.3,beta=0.*galsim.degrees)
assert_raises(TypeError,galsim.Shear,q=0.3)
if is_jax_galsim():
pass
else:
assert_raises(galsim.GalSimRangeError,galsim.Shear,q=1.3,beta=0.*galsim.degrees)
assert_raises(galsim.GalSimRangeError,galsim.Shear,g1=0.9,g2=0.6)
assert_raises(galsim.GalSimRangeError,galsim.Shear,e=-1.3,beta=0.*galsim.radians)
assert_raises(galsim.GalSimRangeError,galsim.Shear,e=1.3,beta=0.*galsim.radians)
assert_raises(galsim.GalSimRangeError,galsim.Shear,e1=0.7,e2=0.9)
assert_raises((galsim.GalSimRangeError, equinox.EquinoxRuntimeError),galsim.Shear,q=1.3,beta=0.*galsim.degrees)
assert_raises((galsim.GalSimRangeError, equinox.EquinoxRuntimeError),galsim.Shear,g1=0.9,g2=0.6)
assert_raises((galsim.GalSimRangeError, equinox.EquinoxRuntimeError),galsim.Shear,e=-1.3,beta=0.*galsim.radians)
assert_raises((galsim.GalSimRangeError, equinox.EquinoxRuntimeError),galsim.Shear,e=1.3,beta=0.*galsim.radians)
assert_raises((galsim.GalSimRangeError, equinox.EquinoxRuntimeError),galsim.Shear,e1=0.7,e2=0.9)
assert_raises(TypeError,galsim.Shear,g=0.5)
assert_raises(TypeError,galsim.Shear,e=0.5)
assert_raises(TypeError,galsim.Shear,eta=0.5)
if is_jax_galsim():
pass
else:
assert_raises(galsim.GalSimRangeError,galsim.Shear,eta=-0.5,beta=0.*galsim.radians)
assert_raises(galsim.GalSimRangeError,galsim.Shear,g=1.3,beta=0.*galsim.radians)
assert_raises(galsim.GalSimRangeError,galsim.Shear,g=-0.3,beta=0.*galsim.radians)
assert_raises((galsim.GalSimRangeError, equinox.EquinoxRuntimeError),galsim.Shear,eta=-0.5,beta=0.*galsim.radians)
assert_raises((galsim.GalSimRangeError, equinox.EquinoxRuntimeError),galsim.Shear,g=1.3,beta=0.*galsim.radians)
assert_raises((galsim.GalSimRangeError, equinox.EquinoxRuntimeError),galsim.Shear,g=-0.3,beta=0.*galsim.radians)
assert_raises(TypeError,galsim.Shear,e=0.3,beta=0.)
assert_raises(TypeError,galsim.Shear,eta=0.3,beta=0.)
assert_raises(TypeError,galsim.Shear,randomkwarg=0.1)
Expand Down Expand Up @@ -242,9 +236,9 @@ def test_shear_methods():
# check ==
s = galsim.Shear(g1 = g1[ind], g2 = g2[ind])
s2 = galsim.Shear(g1 = g1[ind], g2 = g2[ind])
np.testing.assert_equal(s == s2, True, err_msg = "Failed to check for equality")
np.testing.assert_array_equal(s == s2, True, err_msg = "Failed to check for equality")
# check !=
np.testing.assert_equal(s != s2, False, err_msg = "Failed to check for equality")
np.testing.assert_array_equal(s != s2, False, err_msg = "Failed to check for equality")


@timer
Expand Down
5 changes: 1 addition & 4 deletions tests/test_wcs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1186,10 +1186,7 @@ def test_pixelscale(run_slow):
assert wcs.world_origin == galsim.PositionD(0,0)

assert_raises(TypeError, galsim.PixelScale)
if is_jax_galsim():
pass
else:
assert_raises(TypeError, galsim.PixelScale, scale=galsim.PixelScale(scale))
assert_raises(TypeError, galsim.PixelScale, scale=galsim.PixelScale(scale))
assert_raises(TypeError, galsim.PixelScale, scale=scale, origin=galsim.PositionD(0,0))
assert_raises(TypeError, galsim.PixelScale, scale=scale, world_origin=galsim.PositionD(0,0))

Expand Down
Loading