Skip to content

Quick Fixes for numpy and path errors #217

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
lordrick94 merged 2 commits into from
Sep 13, 2025
Merged

Quick Fixes for numpy and path errors #217

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
02091ca
Quick Fixes for numpy and path errors
lordrick94 Aug 19, 2025
a53b342
Merge branch 'main' into ppxf_quick_fixes
profxj Sep 13, 2025
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
35 changes: 26 additions & 9 deletions frb/galaxies/ppxf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
import importlib_resources

import numpy as np
if not hasattr(np, "string_"):
np.string_ = np.bytes_ # NumPy 2.0 compatibility for old code

from matplotlib import pyplot as plt
#from goodies import closest
Expand Down Expand Up @@ -237,9 +239,9 @@ def fit_spectrum(spec, zgal, specresolution, tie_balmer=False,
#miles_dir = importlib_resources.files('ppxf.emiles_padova_chabrier')
if miles_dir is None:
miles_dir = importlib_resources.files('ppxf.miles_padova_chabrier')
#path4libcall = miles_dir + 'Mun1.30*.fits'
#path4libcall = miles_dir + 'Ech1.30*.fits'
path4libcall = miles_dir + 'Mch1.30*.fits'
#path4libcall = str(miles_dir / 'Mun1.30*.fits')
#path4libcall = str(miles_dir / 'Ech1.30*.fits')
path4libcall = str(miles_dir / 'Mch1.30*.fits')
miles = lib.miles(path4libcall, velscale, FWHM_gal, wave_gal=wave)

### Stuff for regularization dimensions
Expand Down Expand Up @@ -312,12 +314,27 @@ def FWHM_func(wave): # passed to generate emission line templates
if degree_add is None:
degree_add = -1
t = time.time()
ppfit = ppxf.ppxf(templates, galaxy, noise, velscale, start,
plot=False, moments=moments, degree=degree_add, vsyst=dv,
lam=np.exp(logLam), clean=False, regul=1. / regul_err,
reg_dim=reg_dim,component=component, gas_component=gas_component,
gas_names=gas_names, gas_reddening=gas_reddening, mdegree=degree_mult,
**kwargs)
# Build explicit bounds matching `start`/`moments`
# One [lo, hi] per parameter, per component, in the order [V, sigma, (h3,h4...)]
bounds = []
for mo in moments:
b = []
b.append([vel - 2000.0, vel + 2000.0]) # V bounds (km/s)
b.append([max(velscale/100.0, 5.0), 1000.0]) # sigma bounds (km/s)
for _ in range(max(0, mo - 2)): # any GH moments
b.append([-0.3, 0.3])
bounds.append(b)

ppfit = ppxf.ppxf(
templates, galaxy, noise, velscale, start,
plot=False, moments=moments, degree=degree_add, vsyst=dv,
lam=np.exp(logLam), clean=False, regul=1./regul_err, reg_dim=reg_dim,
component=component, gas_component=gas_component,
gas_names=gas_names, gas_reddening=gas_reddening, mdegree=degree_mult,
bounds=bounds, # <-- add this
**kwargs
)


print('Desired Delta Chi^2: %.4g' % np.sqrt(2 * galaxy.size))
print('Current Delta Chi^2: %.4g' % ((ppfit.chi2 - 1) * galaxy.size))
Expand Down