Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
dc45dc3
initial commit for adding COSMIC into SPISEA
nsabrams Jan 27, 2026
135a055
fixed initial merge conflicts
nsabrams Jan 27, 2026
478c328
fixed a few more small conflicts
nsabrams Jan 27, 2026
ce9e51e
Merge branch 'tmp_spisea_main' into cosmic
nsabrams Jan 27, 2026
9b68b94
added EVOMODEL names and removed low temp black bodies
nsabrams Jan 29, 2026
6a442bf
added fix to companion system idxs
nsabrams Feb 21, 2026
2bf310d
added fix for cosmic systems that don't make it to the end of bcm
nsabrams Feb 22, 2026
3e7f7a9
handle if there are no disrupted binary companions
nsabrams Feb 22, 2026
39d3c4c
no longer handle if some binaries didn't make it. Just raise exception
nsabrams Feb 23, 2026
2bf5f69
cleaned up some cosmic things
nsabrams Mar 25, 2026
887c03a
update bse dict
nsabrams Mar 29, 2026
973e186
change method for getting filter name
nsabrams Mar 31, 2026
527ab28
added read out when cosmic has a mismatch issue
nsabrams Apr 3, 2026
c24c3c6
update BSE dict to use 0.02 for solar metallicity
nsabrams Apr 15, 2026
b189241
rotate cosmic kicks to be with respect to binary inclination
nsabrams Apr 15, 2026
2c28c43
added code to remove systems cosmic drops and save them to file
nsabrams Apr 15, 2026
7c95b47
attempt to fix removal of failing binaries
nsabrams Apr 16, 2026
8476e07
fix dropping systems
nsabrams Apr 17, 2026
e453f36
initial merge with BD branch and other SPISEA updates
nsabrams Jun 11, 2026
3994949
switched to sum of rows for kicks
nsabrams Jun 12, 2026
809acc2
switch recomp isochrone to false
nsabrams Jun 12, 2026
b6b678c
fixed interpolator call issue
nsabrams Jun 12, 2026
252f2a6
fixed companion mass checks
nsabrams Jun 15, 2026
bd69b57
added unit and integration tests via claude
nsabrams Jun 16, 2026
5a57481
updated to new cosmic default bsedict but kept zsolar = 0.02
nsabrams Jun 16, 2026
07f3d53
added copy=True to accomidate more updated versions of numpy and pandas
nsabrams Jun 16, 2026
d5905b9
added docs for cosmic
nsabrams Jun 17, 2026
c14fb3d
removed backup merge conflict files
nsabrams Jun 17, 2026
1293ea8
updated contributors file
nsabrams Jun 17, 2026
9b39f7d
fixed tiny path typo in docs
nsabrams Jun 17, 2026
6cb5e17
fixed merge conflicts
nsabrams Jun 18, 2026
1548f21
edited test to make sure cluster mass within 2 percent rather than sp…
nsabrams Jun 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,544 changes: 1,544 additions & 0 deletions docs/Cluster_w_COSMIC.ipynb

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/atmo_models.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
Atmosphere Model Object
========================================
Stellar atmosphere models are defined as functions in
``popstar/atmospheres.py``. These can be called by::
``spisea/atmospheres.py``. These can be called by::

from popstar import atmospheres
atmo = atmospheres.<function_name>
Expand Down
4 changes: 2 additions & 2 deletions docs/contributors.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Dongwon Kim -- code testing/debugging
Siyao Jia -- helped with early code and documentation development

Natasha Abrams -- developed resolved multiplicity capabilities
(ResolvedMultiplicityDK class)
(ResolvedMultiplicityDK class) and added COSMIC support.

Michael Medford -- developed resolved multiplicity capabilities
(ResolvedMultiplicityDK class)
Expand Down Expand Up @@ -50,4 +50,4 @@ and increased filter name flexibility for synphot

Anna Pusack -- Added IRTF L-band filter support

Caitlin Begbie -- added brown dwarf physics and capabilities
Caitlin Begbie -- added brown dwarf physics and capabilities
54 changes: 0 additions & 54 deletions docs/contributors_BACKUP_57328.rst

This file was deleted.

36 changes: 0 additions & 36 deletions docs/contributors_BASE_57328.rst

This file was deleted.

38 changes: 0 additions & 38 deletions docs/contributors_LOCAL_57328.rst

This file was deleted.

50 changes: 0 additions & 50 deletions docs/contributors_REMOTE_57328.rst

This file was deleted.

10 changes: 10 additions & 0 deletions docs/evo_models.rst
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,18 @@ Below is a table of the evolution model grids currently supported by SPISEA.
- 6.00 - 10.00
- -0.5, 0, 0.5
- Marley et al. (2021)
* - ``COSMIC`` :sup:`b`
- 0.08 - 150
- -
- -2.3 - 0.18
- Breivik et al. (2020)

.. rubric:: Footnotes

:sup:`a` Actual maximum value given by the Sonora models (Marley et al., 2021) relies on the age of the cluster. For example, for log(Age)=6.0, the mass range is limited to 0.0005 - 0.011 M\ :sub:`⊙`.

:sup:`b` COSMIC evolves the stars externally and does not use SPISEA's standard isochrone-grid architecture. Instead, it uses a custom atmosphere grid that is created on the fly. See Breivik et al. (2020) for more details on COSMIC. When COSMIC is used, the IFMR is ignored.

Please note the stellar mass range, age range, and metallicity values of the evolution
model grid you choose:

Expand Down Expand Up @@ -142,4 +149,7 @@ Specific Evolution Model Classes
:show-inheritance:

.. autoclass:: evolution.Phillips2020
:show-inheritance:

.. autoclass:: evolution.COSMIC
:show-inheritance:
13 changes: 12 additions & 1 deletion docs/make_isochrone.rst
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,18 @@ Tips and Tricks: The IsochronePhot Object
reddening law have changed, the original file will be overwritten
by the new isochrone.

*To avoid files from being unintentially overwritten, we recommend
*To avoid files from being unintentionally overwritten, we recommend
that users specify different iso_dir paths when making isochrones
with different evolution models, atmosphere models, or reddening
laws.*

* For external evolution models (i.e. COSMIC), you should use
IsochronePhotExternalEvolution
instead of IsochronePhot. This is because those evolution models do not have isochrones but
instead evolve the stars externally. The first time you run a new AKs, metallicity, or distance,
this will take ~10-20 mins because it is creating a new atmosphere grid. This table is saved in the
specified iso_dir, under the filename atm_<aks>_<dist>_<z>.fits.

Base Isochrone Class
----------------------------
.. autoclass:: synthetic.Isochrone
Expand All @@ -108,6 +115,10 @@ Isochrone Sub-classes
:show-inheritance:
:members: make_photometry, plot_CMD, plot_mass_magnitude

.. autoclass:: synthetic.IsochronePhotExternalEvolution
:show-inheritance:
:members: make_photometry, plot_CMD, plot_mass_magnitude


Photometry Conversion Functions
-----------------------------
Expand Down
5 changes: 5 additions & 0 deletions docs/multiplicity.rst
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@ returned in the ``star_systems`` table off the cluster object is the
same for both unresolved and resolved multiplicity classes: it
represents the combined photometry of all stars within a given system.

For most selected evolution models, the multiples are evolved as single stars.
To evolve binaries (does not support higher order multiples), you should use one of the ``MultiplicityResolved`` classes
and the ``COSMIC`` evolution model.
See the example jupyter notebook `Cluster_w_COSMIC.ipynb <https://github.com/astropy/SPISEA/blob/main/docs/Cluster_w_COSMIC.ipynb>`_ for an example.


Unresolved Multiplicity Classes
------------------------------------------
Expand Down
Loading