Merge pull request #135 from astropy/dev

v2.2 update

Author: mwhosek

docs/conf.py

@@ -25,9 +25,9 @@
 author = 'Matthew Hosek Jr, Jessica R. Lu, Casey Y. Lam'
 
 # The short X.Y version
-version = '2.1.15'
+version = '2.2'
 # The full version, including alpha/beta/rc tags
-release = '2.1.15'
+release = '2.2'
 
 
 

docs/contributors.rst

@@ -40,4 +40,5 @@ Sage Hironaka Remulla -- added Rubin Observatory filters
 Lingfeng Wei -- bugfix to improve creation of iso_dir in IsochronePhot
 
 Macy Huston -- New metallicity bound + isochrone filter checks,
-imf_mass_lim bugfix, roman filter bugfix
+imf_mass_lim bugfix, roman filter bugfix, added Euclid filters, Synthpop compatibility
+updates (v2.2)

docs/filters.rst

@@ -31,6 +31,7 @@ Available filters:
 * 2MASS
 * CTIO_OSIRIS
 * DeCam
+* Euclid
 * GAIA
 * HAWK-I
 * Hubble Space Telescope
@@ -80,6 +81,14 @@ Filters: u, g, r, i, z, Y
 
 Example: ``'decam,r'``
 
+**Euclid**
+
+`Euclid (NISP) space telescope filters <https://doi.org/10.5270/esa-kx8w57c>`_
+
+Filters: Y, J, H
+
+Example: ``'euclid,Y'``
+
 **GAIA**
 
 The `GAIA Space Telescope filters <https://www.cosmos.esa.int/web/gaia/iow_20180316>`_.

docs/index.rst

@@ -82,6 +82,21 @@ releases will be co-authors in future SPISEA software papers.
 
 Change Log
 ----------
+2.2 (2026-01-16)
+  * Compatibility updates for SPISEA to work with `SynthPop
+    <https://synthpop.readthedocs.io/en/latest/>`_. Updates include:
+   * Low mass objects below the isochrone grid can optionally be kept
+     in clusters (off by default) and will have
+     ``current_mass=initial_mass`` and ``phase=98``, with no other
+     evolutionary information or photometry.
+   * Evolution model versions are now logged in IsochronePhot files
+     and checked if present.
+   * The option ``synthpop_extension`` is now available for MISTv1
+     version=1.2 evolution. This fills in the missing parameter space
+     down to initial mass 0.1Msun in isochrones where needed. Use of
+     this option will require downloading updated isochrone files.
+   * Added support for Euclid filters. 
+    
 2.1.15 (2025-10-25)
   * Updated Roman filter name from outdated w146 to current f146. From
     now on a STScI CDBS data version from 2024-03-22 or later is

filt_func/euclid/H.dat

@@ -79,12 +79,17 @@ class StellarEvolution(object):
 
     z_list: list
         List of metallicities
+
+    model_version_name: string
+        Name of the model class plus additional details like version
+        numbers and rotation if relevant.
     """
     def __init__(self, model_dir, age_list, mass_list, z_list):
         self.model_dir = model_dir
         self.z_list = z_list
         self.mass_list = mass_list
         self.age_list = age_list
+        self.model_version_name = "None"
 
         return
 
@@ -93,6 +98,7 @@ def __init__(self):
         r"""
         Define intrinsic properties for Geneva stellar models.
         """
+        self.model_version_name = "Geneva"
         # populate list of model masses (in solar masses)
         mass_list = [(0.1 + i*0.005) for i in range(181)]
 
@@ -171,6 +177,10 @@ class Ekstrom12(StellarEvolution):
         If true, then use rotating Ekstrom models. Default is true.
     """
     def __init__(self, rot=True):
+        if rot:
+            self.model_version_name = "Ekstrom12-rot"
+        else:
+            self.model_version_name = "Ekstrom12-norot"
         # define metallicity parameters for Ekstrom+12 models
         self.z_list = [0.014]
 
@@ -401,6 +411,7 @@ def __init__(self):
         models.
         """
         # populate list of model masses (in solar masses)
+        self.model_version_name = "Parsec1.2s"
         #mass_list = [(0.1 + i*0.005) for i in range(181)]
 
         # define metallicity parameters for Parsec models
@@ -551,6 +562,7 @@ def __init__(self):
         Define intrinsic properties for the Pisa (Tognelli+11) stellar
         models.
         """
+        self.model_version_name = "Pisa"
         # define metallicity parameters for Pisa models
         self.z_list = [0.015]
 
@@ -710,6 +722,7 @@ class Baraffe15(StellarEvolution):
     Downloaded from `BHAC15 site <http://perso.ens-lyon.fr/isabelle.baraffe/BHAC15dir/BHAC15_tracks>`_.
     """
     def __init__(self):
+        self.model_version_name = "Baraffe15"
         # define metallicity parameters for Baraffe models
         self.z_list = [0.015]
 
@@ -1008,8 +1021,14 @@ class MISTv1(StellarEvolution):
         was downloaded from MIST website on 2/2017, while Version 1.2
         was downloaded on 8/2018 (solar metallicity)
         and 4/2019 (other metallicities). Default is 1.2.
+        
+    synthpop_extension: boolean (default False)
+        If True, the isochrones are extended down to a minimum initial
+        mass of 0.1Msun using grids interpolated via SynthPop. If False,
+        the web-downloaded MIST isochrones are used with their varying  
+        lower mass limits. True option is only valid for version=1.2.
     """
-    def __init__(self, version=1.2):
+    def __init__(self, version=1.2, synthpop_extension=False):
         # define metallicity parameters for MIST models
         self.z_list = [0.0000014,   # [Fe/H] = -4.00
                        0.0000045,   # [Fe/H] = -3.50
@@ -1032,15 +1051,28 @@ def __init__(self, version=1.2):
 
         # Set version directory
         self.version = version
-        if self.version == 1.0:
+        self.synthpop_extension = synthpop_extension
+        if (self.version == 1.0) and (not synthpop_extension):
+            self.model_version_name = 'MISTv1.0'
             version_dir = 'v1.0/'
+        elif (self.version == 1.0) and synthpop_extension:
+            raise ValueError('Synthpop isochrone extension not supported for MISTv1.0 isochrones')
         elif self.version == 1.2:
+            self.model_version_name = 'MISTv1.2'
             version_dir = 'v1.2/'
         else:
             raise ValueError('Version {0} not supported for MIST isochrones'.format(version))
 
         # Specify location of model files
         self.model_dir = models_dir+'MISTv1/' + version_dir
+        if self.synthpop_extension:
+            self.model_version_name = self.model_version_name + '-synthpop'
+            self.model_extension_dir = models_dir+'MISTv1/' + version_dir[:-1] + '-synthpop/'
+            if not os.path.exists(self.model_extension_dir):
+                raise ValueError(f'Missing {self.model_extension_dir}. Please download the latest SPISEA data at https://w.astro.berkeley.edu/~jlu/spisea/spisea_models.tar.gz.')
+
+        else:
+            self.model_extension_dir = None
 
         # Specifying metallicity
         self.z_solar = 0.0142
@@ -1060,8 +1092,8 @@ def __init__(self, version=1.2):
                            0.025: 'z025/',
                            0.045: 'z045/'}
 
-        # Define required evo_grid number
-        self.evo_grid_min = 1.1
+        # Define required evo_grid number (now 1.2 for synthpop extension)
+        self.evo_grid_min = 1.2
 
     def isochrone(self, age=1.e8, metallicity=0.0):
         r"""
@@ -1096,10 +1128,18 @@ def isochrone(self, age=1.e8, metallicity=0.0):
 
         # generate isochrone file string
         full_iso_file = self.model_dir + 'iso/' + z_dir + iso_file
+        if self.synthpop_extension:
+            addl_iso_file = self.model_extension_dir + 'iso/' + z_dir + iso_file
 
         # return isochrone data. Column locations depend on
         # version
         iso = Table.read(full_iso_file, format='fits')
+        if self.synthpop_extension:
+            addl_iso = Table.read(addl_iso_file, format='fits')
+            for row in addl_iso:
+                iso.add_row(row)
+            iso.sort('col3')
+            iso.meta['comments2'] = addl_iso.meta['comments']
         if self.version == 1.0:
             iso.rename_column('col7', 'Z')
             iso.rename_column('col2', 'logAge')
@@ -1232,6 +1272,10 @@ class MergedBaraffePisaEkstromParsec(StellarEvolution):
         If true, then use rotating Ekstrom models. Default is true.
     """
     def __init__(self, rot=True):
+        if rot:
+            self.model_version_name = "MergedBaraffePisaEkstromParsec-rot"
+        else:
+            self.model_version_name = "MergedBaraffePisaEkstromParsec-norot"
         # populate list of model masses (in solar masses)
         mass_list = [(0.1 + i*0.005) for i in range(181)]
 
@@ -1283,6 +1327,7 @@ def isochrone(self, age=1.e8, metallicity=0.0):
         age_idx = np.where(abs(np.array(self.age_list) - log_age) == min(abs(np.array(self.age_list) - log_age)) )[0][0]
         iso_file = 'iso_{0:.2f}.fits'.format(self.age_list[age_idx])
 
+        
         # find closest metallicity value
         z_idx = np.where(abs(np.array(self.z_list) - z_defined) == min(abs(np.array(self.z_list) - z_defined)) )[0][0]
         z_dir = self.z_file_map[self.z_list[z_idx]]
@@ -1291,7 +1336,16 @@ def isochrone(self, age=1.e8, metallicity=0.0):
         full_iso_file = self.model_dir + z_dir + iso_file
 
         # return isochrone data
-        iso = Table.read(full_iso_file, format='fits')
+        try:
+            # FITS version of file (older model evolution grids)
+            iso = Table.read(full_iso_file, format='fits')
+        except:
+            # ASCII version of files (newer model evo grids
+            iso_file = 'iso_{0:.2f}.dat'.format(self.age_list[age_idx])
+            full_iso_file = self.model_dir + z_dir + iso_file
+            
+            iso = Table.read(full_iso_file, format='ascii')
+            
         iso.rename_column('col1', 'mass')
         iso.rename_column('col2', 'logT')
         iso.rename_column('col3', 'logL')
@@ -1325,6 +1379,10 @@ class MergedPisaEkstromParsec(StellarEvolution):
         If true, then use rotating Ekstrom models. Default is true.
     """
     def __init__(self, rot=True):
+        if rot:
+            self.model_version_name = "MergedPisaEkstromParsec-rot"
+        else:
+            self.model_version_name = "MergedPisaEkstromParsec-norot"
         # populate list of model masses (in solar masses)
         mass_list = [(0.1 + i*0.005) for i in range(181)]
 
@@ -1422,6 +1480,7 @@ def __init__(self):
         Define intrinsic properties for merged Siess-meynetMaeder-Padova 
         stellar models.
         """
+        self.model_version_name = "MergedSiessGenevaPadova"
         # populate list of model masses (in solar masses)
         mass_list = [(0.1 + i*0.005) for i in range(181)]
 

filt_func/euclid/J.dat

@@ -437,7 +437,7 @@ def get_rubin_filt(name):
     try:
         t = Table.read('{0}/rubin/{1}.dat'.format(filters_dir, name), format='ascii')
     except:
-        raise ValueError('Could not find Rubin LSST filter file {0}/total_/{1}.dat'.format(filters_dir, name))
+        raise ValueError('Could not find Rubin LSST filter file {0}/rubin/{1}.dat'.format(filters_dir, name))
 
     wavelength = t[t.keys()[0]]
     transmission = t[t.keys()[1]]
@@ -450,3 +450,25 @@ def get_rubin_filt(name):
                                        name='rubin_{0}'.format(name))
 
     return spectrum
+
+def get_euclid_filt(name):
+    """
+    Define the Euclid filters as a pysynphot spectrum object
+    """
+    # Read in filter info
+    try:
+        t = Table.read('{0}/euclid/{1}.dat'.format(filters_dir, name), format='ascii')
+    except:
+        raise ValueError('Could not find Euclid filter file {0}/euclid/{1}.dat'.format(filters_dir, name))
+
+    wavelength = t[t.keys()[0]]
+    transmission = t[t.keys()[1]]
+
+    # Convert wavelength to Angstroms
+    wavelength = wavelength * 10
+
+    # Make spectrum object
+    spectrum = pysynphot.ArrayBandpass(wavelength, transmission, waveunits='angstrom',
+                                       name='euclid_{0}'.format(name))
+
+    return spectrum