nsabrams · nsabrams · Feb 21, 2025 · Mar 18, 2025 · Apr 26, 2025 · Apr 26, 2025
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,6 @@
+# SPISEA-generated isochrones from test functions
+spisea/tests/isochrones/
+
 # Compiled files
 *.py[co]
 *.a
@@ -51,4 +54,7 @@ distribute-*.tar.gz
 
 # OS Generated Files
 .DS_Store
-._*
+._*
+
+# Test files generated
+spisea/tests/isochrones
diff --git a/docs/add_filters.rst b/docs/add_filters.rst
@@ -12,8 +12,10 @@ If the user wants to add new photometric filters to SPISEA, there are 4 main ste
      call the new function in ``filters.py`` when the new filter
      string is called.
   4) Edit the ``get_obs_str()`` function in ``synthetic.py`` to
-      convert between column name and filter string (e.g input string
-      for get_filter_info) for the new filters.
+     convert between column name and filter string (e.g input string
+     for get_filter_info) for the new filters.
+  5) Add the filter to the ``filt_list`` in the ``test_filters()`` function in ``tests/test_models.py`` to
+     ensure the filter can be loaded properly.
 
 Additional documentation on this is coming soon. In the meantime, let us know on the  Github `issue tracker
 <https://github.com/astropy/SPISEA/issues>`_ if you'd like to

diff --git a/docs/conf.py b/docs/conf.py
@@ -25,9 +25,9 @@
 author = 'Matthew Hosek Jr, Jessica R. Lu, Casey Y. Lam'
 
 # The short X.Y version
-version = '2.2'
+version = '2.4'
 # The full version, including alpha/beta/rc tags
-release = '2.2'
+release = '2.4'
 
 
 

diff --git a/docs/contributors.rst b/docs/contributors.rst
@@ -37,8 +37,14 @@ what operating system is used
 
 Sage Hironaka Remulla -- added Rubin Observatory filters
 
-Lingfeng Wei -- bugfix to improve creation of iso_dir in IsochronePhot
+Lingfeng Wei -- bugfix to improve creation of iso_dir in
+IsochronePhot, implemented faster cluster generation and test
+functions for primary and companion star mass generation (v2.3),
+updated random state generators (v2.4)
 
 Macy Huston -- New metallicity bound + isochrone filter checks,
 imf_mass_lim bugfix, roman filter bugfix, added Euclid filters, Synthpop compatibility
-updates (v2.2)
+updates (v2.2), improvements for reading in/updated existing isochrone
+files, Vega mag to ST mag conversion function (v2.4)
+
+Anna Pusack -- Added IRTF L-band filter support
diff --git a/docs/filters.rst b/docs/filters.rst
@@ -7,16 +7,16 @@ Photometric Filters
 The user can specify what filters are used for synthetic photometry
 when defining the :ref:`isochrone_objects`.  Each filter is
 identified by a unique string, and an array of such strings
-are passed into the Isochrone call. 
+are passed into the Isochrone call.
 
 For example::
-  
+
     # Use the HST WFC3-IR F127M and F153M filters, along with NIRC2 Kp
     filt_list = ['wfc3,ir,f127m', 'wfc3,ir,f153m', 'nirc2,Kp']
     my_iso = synthetic.IsochronePhot(logAge, AKs, dist, metallicity=0,
                             evo_model=evo_model, atm_func=atm_func,
                             red_law=red_law, filters=filt_list)
-    
+
 These strings follow the format ``<telescope/filter_set>,<filter>``.
 Note that there is no space after the comma, and case matters.
 
@@ -35,24 +35,25 @@ Available filters:
 * GAIA
 * HAWK-I
 * Hubble Space Telescope
+* IRTF
 * Johnson-Cousins
 * Johnson-Glass
 * JWST
 * Keck NIRC
 * Keck NIRC2
-* NACO 
+* NACO
 * PanStarrs 1
 * Roman Space Telescope
 * UKIRT
 * Vera C. Rubin Observatory
 * VISTA
 * ZTF
 
-  
+
 Filter Sets
 ------------
 
-   
+
 **2MASS**
 
 `Two-Micron Sky Survey <https://old.ipac.caltech.edu/2mass/>`_
@@ -83,9 +84,10 @@ Example: ``'decam,r'``
 
 **Euclid**
 
-`Euclid (NISP) space telescope filters <https://doi.org/10.5270/esa-kx8w57c>`_
+Euclid space telescope `NISP filters <https://doi.org/10.5270/esa-kx8w57c>`_
+and `VIS single filter <https://svo2.cab.inta-csic.es/svo/theory/fps/index.php?id=Euclid/VIS.vis>`_
 
-Filters: Y, J, H
+Filters: VIS, Y, J, H
 
 Example: ``'euclid,Y'``
 
@@ -145,10 +147,10 @@ Example: ``'jg,K'``
 
 JWST NIRCam filters, downloaded from `NIRCam website <https://jwst-docs.stsci.edu/display/JTI/NIRCam+Filters#NIRCamFilters-filt_trans>`_. The filter functions in the nircam_throughputs/modAB_mean/nrc_plus_ote folder is used.
 
-Filters: F070W, F090W,  F115W, F140M, F150W, F150W2, F162M, F164N, F182M, F187N, F200W, F210M, F212N, F250M, F277W, F300M, F322W2, F323N, F335M, F356W, F360M, F405N, F410M, F430M,  F444W, F460M, F466N, F470N, F480M 
+Filters: F070W, F090W,  F115W, F140M, F150W, F150W2, F162M, F164N, F182M, F187N, F200W, F210M, F212N, F250M, F277W, F300M, F322W2, F323N, F335M, F356W, F360M, F405N, F410M, F430M,  F444W, F460M, F466N, F470N, F480M
 
 Example: ``'jwst,F356W'``
-						
+
 
 **Keck NIRC**
 
@@ -236,3 +238,11 @@ Example: ``'vista,Y'``
 Filters: g, r, i
 
 Example: ``'ztf,g'``
+
+**IRTF**
+
+`IRTF NSFCam <https://irtfweb.ifa.hawaii.edu/~nsfcam2/Filter_Profiles.html>`_
+
+Filters: L
+
+Example: ``'nsfcam,L'``
diff --git a/docs/index.rst b/docs/index.rst
@@ -82,6 +82,27 @@ releases will be co-authors in future SPISEA software papers.
 
 Change Log
 ----------
+2.4 (2026-03-20)
+  * Added backward compatibility for isochrone file names created
+    before v2.3
+  * When reading isochrone from existing file, only keep user
+    requested filters in resulting table.
+  * Changed the global random seed to a random generator within each class,
+    but still retaining the reproducibility. Test cluster files in
+    test_data also updated accordingly for testing purposes
+  * Added filter support for IRTF L-band
+  * Added conversion function between ST mags and Vega mags
+
+2.3 (2026-02-10)
+  * Achieves faster cluster generation (factor of about 2x) by using
+    replacing ragged arrays with masked arrays when calculating
+    multiplicity properties
+  * Added new test functions (and associated test data files) ensuring
+    that the primary mass and companion
+    mass distibutions remain the same as generated with SPISEA <= v2.2
+  * Added support to Euclid VIS filter
+
+
 2.2 (2026-01-16)
   * Compatibility updates for SPISEA to work with `SynthPop
     <https://synthpop.readthedocs.io/en/latest/>`_. Updates include:

diff --git a/docs/make_isochrone.rst b/docs/make_isochrone.rst
@@ -9,7 +9,10 @@ total extinction, and metallicity, along with the :ref:`atmo_models`,
 :ref:`evo_models`, and :ref:`ext_law`. 
 
 If the IsochronePhot sub-class is used then synthetic photometry
-will be produced. The :ref:`filters` are defined as additional inputs.
+will be produced. The :ref:`filters` are defined as additional
+inputs. The output photometry is in terms of vega mags, but the user
+can also calculate the required conversion to AB mags or ST mags using
+the functions in :ref:`Photometry Conversion Functions <phot_conversions>`. 
 
 An example of making an IsochronePhot object::
 
@@ -76,10 +79,9 @@ Tips and Tricks: The IsochronePhot Object
 
   * **WARNING**: When IsochronePhot checks to see if the desired
     isochrone table already exists, it checks all isochrone properties
-    except for the photometric filters (evolution models, atmosphere
-    models, and reddening law are encoded in the table meta-data).
+    (evolution models, atmosphere models, and reddening law are encoded in the table meta-data).
     If any of these parameters do not match, then the isochrone will
-    be re-calculated.
+    be re-calculated. 
 
     However, to keep the isochrone filenames reasonable, only the
     age, extinction, distance, and metallicity are encoded in the
@@ -91,13 +93,6 @@ Tips and Tricks: The IsochronePhot Object
     that users specify different iso_dir paths when making isochrones
     with different evolution models, atmosphere models, or reddening
     laws.*
-
-  * **WARNING**: IsochronePhot does not check existing
-    isochrone tables to see if the photometric filters match
-    those specified by the user. *So, if the user wishes to generate an
-    isochrone with different filters, we recommend either using a
-    different iso_dir path or setting the keyword recomp=True (see
-    docs below).*
 
 Base Isochrone Class
 ----------------------------
@@ -112,3 +107,13 @@ Isochrone Sub-classes
 .. autoclass:: synthetic.IsochronePhot
 	       :show-inheritance:
 		:members: make_photometry, plot_CMD, plot_mass_magnitude
+
+
+Photometry Conversion Functions
+-----------------------------
+.. _phot_conversions:
+
+.. autofunction:: synthetic.calc_ab_vega_filter_conversion
+
+.. autofunction:: synthetic.calc_st_vega_filter_conversion
+