Skip to content

perf: use an interpolant for maxk for Moffat profile, drop support for trunc option #196

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

Merged
beckermr merged 8 commits into from
Feb 18, 2026
Merged

perf: use an interpolant for maxk for Moffat profile, drop support for trunc option #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8087935
fix: do not support trunc or high maxk thresholds for Moffat profiles
beckermr Feb 12, 2026
1846f04
test: fix tests and exclude the jax galsim error
beckermr Feb 12, 2026
f4f8bef
perf: use an approximation for maxk for Moffat profiles
beckermr Feb 12, 2026
52b0017
perf: use 100 insteadof 500
beckermr Feb 12, 2026
976bbe6
style: pre the commit
beckermr Feb 12, 2026
efc4afb
doc: add dev notebook
beckermr Feb 12, 2026
a5254e5
fix: try simpler ways to build moffat splines
beckermr Feb 16, 2026
2979e22
feat: use a more efficient rational function approximation
beckermr Feb 18, 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
1,008 changes: 1,008 additions & 0 deletions dev/notebooks/moffat_maxk_interp.ipynb
View file
Open in desktop

Large diffs are not rendered by default.

280 changes: 183 additions & 97 deletions jax_galsim/moffat.py
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion tests/GalSim
Open in desktop
Submodule GalSim updated 1 files
+1 −4 tests/test_moffat.py
1 change: 1 addition & 0 deletions tests/galsim_tests_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,3 +145,4 @@ allowed_failures:
- "module 'jax_galsim' has no attribute 'LookupTable2D'"
- "module 'jax_galsim' has no attribute 'zernike'"
- "Invalid TFORM4: 1PE(7)" # see https://github.com/astropy/astropy/issues/15477
- "JAX-GalSim does not support truncated Moffat"
2 changes: 1 addition & 1 deletion tests/jax/test_benchmarks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ def test_benchmark_invert_ab_noraise(benchmark, kind):


def _run_benchmark_moffat_init():
return jgs.Moffat(beta=2.5, half_light_radius=0.6, trunc=1.2).scale_radius
return jgs.Moffat(beta=2.5, half_light_radius=0.6).scale_radius


@pytest.mark.parametrize("kind", ["run"])
Expand Down
2 changes: 0 additions & 2 deletions tests/jax/test_jitting.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,11 @@ def test_eq(self, other):

def test_moffat_jitting():
# Test Moffat objects
fwhm_backwards_compatible = 1.3178976627539716
objects = [
galsim.Moffat(beta=5.0, flux=0.2, scale_radius=1.0, gsparams=gsparams),
galsim.Moffat(
beta=2.0,
half_light_radius=1.0,
trunc=5 * fwhm_backwards_compatible,
flux=1.0,
gsparams=gsparams,
),
Expand Down
3 changes: 0 additions & 3 deletions tests/jax/test_moffat_comp_galsim.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,6 @@ def test_moffat_comp_galsim_maxk():
galsim.Moffat(beta=1.22, scale_radius=23, flux=23),
galsim.Moffat(beta=3.6, scale_radius=2, flux=23),
galsim.Moffat(beta=12.9, scale_radius=5, flux=23),
galsim.Moffat(beta=1.22, scale_radius=7, flux=23, trunc=30),
galsim.Moffat(beta=3.6, scale_radius=9, flux=23, trunc=50),
galsim.Moffat(beta=12.9, scale_radius=11, flux=23, trunc=1000),
]
threshs = [1.0e-3, 1.0e-4, 0.03]
print("\nbeta \t trunc \t thresh \t kValue(maxk) \t jgs-maxk \t gs-maxk")
Expand Down
2 changes: 0 additions & 2 deletions tests/jax/test_vmapping.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,11 @@ def test_eq(self, other):
def test_moffat_vmapping():
# Test Moffat objects

fwhm_backwards_compatible = 1.3178976627539716
objects = [
galsim.Moffat(beta=5.0, flux=0.2, scale_radius=1.0),
galsim.Moffat(
beta=2.0,
half_light_radius=1.0,
trunc=5 * fwhm_backwards_compatible,
flux=1.0,
),
]
Expand Down