Skip to content

Commit

Permalink
Adds more aggressive version parsing.
Browse files Browse the repository at this point in the history
It turns out that requiring the version to be < 2.4.17.dev+feature-blending does not suffice because 2.4.17 fails that test. Thus, "<" is now changed to "!=", and will be reverted to 2.5.0 once released.
  • Loading branch information
aprsa committed Feb 26, 2025
1 parent 9b81ed1 commit a7ec893
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions phoebe/atmospheres/passbands.py
Original file line number Diff line number Diff line change
Expand Up @@ -554,7 +554,7 @@ def load(cls, archive, load_content=True):

if load_content:
# TODO: replace with < parse('2.5.0') when 2.5.0 is released
if parse(self.phoebe_version) <= parse('2.4.17.dev+feature-blending'):
if parse(self.phoebe_version) != parse('2.4.17.dev+feature-blending'):
if 'blackbody:Inorm' in self.content:
# 2.4.17+ passbands include bb_teffs; older versions do not.
if 'bb_teffs' not in hdul:
Expand All @@ -577,7 +577,7 @@ def load(cls, archive, load_content=True):
hdul['ck_teffs'].data.columns.change_name('teff', 'teffs')
hdul['ck_loggs'].data.columns.change_name('logg', 'loggs')
hdul['ck_abuns'].data.columns.change_name('abun', 'abuns')

if 'ck2004:ext' in self.content:
hdul['ck_ebvs'].data.columns.change_name('ebv', 'ebvs')
hdul['ck_rvs'].data.columns.change_name('rv', 'rvs')
Expand All @@ -604,7 +604,7 @@ def load(cls, archive, load_content=True):
continue

if f'{atm.name}:Inorm' in self.content:
basic_axes = tuple([np.array(list(hdul[f'{atm.prefix}_{name.upper()}'].data[name])) for name in atm.basic_axis_names])
basic_axes = tuple([np.array(list(hdul[f'{atm.prefix}_{name}'].data[name])) for name in atm.basic_axis_names])
self.ndp[atm.name] = ndpolator.Ndpolator(basic_axes=basic_axes)
self.ndp[atm.name].register('inorm@photon', None, hdul[f'{atm.prefix}npgrid'].data)
self.ndp[atm.name].register('inorm@energy', None, hdul[f'{atm.prefix}negrid'].data)
Expand Down

0 comments on commit a7ec893

Please sign in to comment.