Skip to content

Pull current SPISEA main into cosmic fork #4

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

Open
nsabrams wants to merge 224 commits into
base: cosmic
Choose a base branch
from
Open

Pull current SPISEA main into cosmic fork #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
224 commits
Select commit Hold shift + click to select a range
9e1673c
Adding planet IMF derivation
caitlinbegbie May 22, 2024
1949c38
Addition of BD IMF and updated name for exoplanet IMF
caitlinbegbie Jun 24, 2024
80f3e0d
Changes to BD_IMF
caitlinbegbie Jun 26, 2024
166e46c
Deleting outdated doc
caitlinbegbie Jun 26, 2024
e5a7bbc
New testing documents for brown dwarf changes
Jul 8, 2024
61b3b3b
changes to evolution, imf, and testing document
Jul 10, 2024
ec4edb9
some histogram changes
Jul 10, 2024
d2bc99b
Adding notebook with issues in multiplicity
Jul 15, 2024
261f72f
New BD changes
Jul 29, 2024
d0a1ab4
most current changes in testing documentation and IMF derivation
Jul 29, 2024
5379f36
Findings with companion objects being misclassified
Jul 31, 2024
aaa0ee2
Added code for successful brown dwarf implementation, and new issues …
Aug 9, 2024
0fa23fe
Testing improvements for Raithel phase designations
Aug 9, 2024
165ffa2
Outlined testing and issues with WDs and NSs
Aug 9, 2024
78d8712
Added outline of issues in this notebook (not Test_BD_Cluster)
Aug 9, 2024
3fb65af
Changes to multiplicity testing
Aug 14, 2024
2851408
Noncompanion exploration and companion decoding
Aug 14, 2024
1d66451
BD updates
Aug 19, 2024
0dcfdcf
Curiosities in BD assignment
Aug 22, 2024
cc856a4
Adding in BD temperatures
Sep 4, 2024
53f2fd9
Delete changes/Compact_Multiplicity.ipynb
caitlinbegbie Sep 4, 2024
c92297c
put in general path to csv
Sep 4, 2024
b93c57a
remove old debugging statements
Sep 4, 2024
7e048ea
Changing BD phase to 90
Sep 18, 2024
b00bdb1
Addition of Meisner 2023 for BD atmospheres of metallicities -1 - 0.3
Nov 4, 2024
c41774a
BD function for atmospheres
Nov 4, 2024
220e4da
Current progress in BD implementation
Nov 13, 2024
ef4f814
Notebook w/ Meisner vs. Phillips Flux Issues
Nov 19, 2024
a0e6c5a
Explanation of Meisner vs. Phillips flux issue
Nov 19, 2024
39fb1c2
implementation of new atmo model
Dec 2, 2024
dd19315
Addition of Phillips2020 evolution class
Jan 21, 2025
43a3f58
Fix variable name and runtime error
wei-lingfeng Feb 21, 2025
0e2ac34
Added Marley evolution class
Feb 25, 2025
96ec523
Merge branch 'astropy:main' into main
wei-lingfeng Mar 18, 2025
cfa2951
Evolution model changes and exploring intermediary data generation
Apr 15, 2025
fec691c
Fixes to chi-squared and nice results
Apr 16, 2025
e88571f
Add random generator support
wei-lingfeng Apr 26, 2025
fd875c5
Suppress divided by zero warnings
wei-lingfeng Apr 26, 2025
bb49170
Add verbose control
wei-lingfeng Apr 26, 2025
ce64564
Major Update: Accelerate generating resolved cluster by vectorization
wei-lingfeng Apr 26, 2025
d29717c
Merge remote-tracking branch 'origin' into dev
wei-lingfeng Apr 26, 2025
52acd64
Improvements to evolution merge region
Apr 29, 2025
3a9abd4
Added verbose control in IsochronePhot; Switched to super init
wei-lingfeng May 15, 2025
446c225
Merge branch 'astropy:dev' into dev
wei-lingfeng May 15, 2025
283387e
Finishing touches on IMF
Jul 19, 2025
8991819
Addition of brown dwarf specific multiplicity conditions.
Sep 15, 2025
01d3fa3
Enforcing brown dwarf binaries
Sep 15, 2025
a452fa7
Raise informative error message for age and metallicity ranges
wei-lingfeng Oct 9, 2025
8704f54
Add confirmation before generating isochrone when verbose=True; Chang…
wei-lingfeng Oct 9, 2025
f114b78
Updates to evo/atmo
Oct 24, 2025
1808607
Updating phase designation in interpolated regions
Nov 18, 2025
119340e
Fixed funny BD designations
Nov 18, 2025
19d14da
Cleaned up old IMF testing
Nov 18, 2025
057a873
Updates to model testing
Nov 18, 2025
84ab57e
Updated cluster generation notebook with BDs
Nov 21, 2025
e43229f
Delete BD model override feature
Nov 21, 2025
7e50182
Fixed docstrings for BD merged evolution model
Jan 23, 2026
ff7015b
adding euclid VIS
Jan 26, 2026
d8391c9
Update filters.rst
hustonm Jan 26, 2026
1906efe
Merge branch 'dev' of https://github.com/astropy/SPISEA into dev
wei-lingfeng Jan 30, 2026
d43fbf1
Passed all tests after merging with masked array companion mass updat…
wei-lingfeng Feb 2, 2026
50d3def
Merge branch 'main' of https://github.com/astropy/SPISEA into dev
wei-lingfeng Feb 2, 2026
1279e31
Fixed evo model error in test, passed all tests
wei-lingfeng Feb 2, 2026
e8e2ab7
Merge pull request #136 from astropy/euclid_vis
mwhosek Feb 4, 2026
9d051cb
Nothing but remove trailing white spaces
wei-lingfeng Feb 6, 2026
4cccd8c
Complete missing docstring
wei-lingfeng Feb 6, 2026
3237c57
Added IRTF NSFCam L filter, updated filters.py and synthetic.py
Rocketpack23 Feb 11, 2026
c100459
Edited filters.py to include irtf/nsfcam
Rocketpack23 Feb 11, 2026
e3f520c
Edited synthetic.py to include irtf/nsfcam
Rocketpack23 Feb 11, 2026
cde187d
Add random state testing
wei-lingfeng Feb 12, 2026
1d845f3
Revert back to np.random.seed and check companion consistency
wei-lingfeng Feb 19, 2026
7fcfb2f
Added star system random state test with the main branch
wei-lingfeng Feb 19, 2026
bd5591e
Merge pull request #138 from wei-lingfeng/dev_reproduce
mwhosek Feb 20, 2026
a81ad27
Updating to next version
Feb 20, 2026
fbdbb11
updating changelog
Feb 20, 2026
604319a
small cleanup, using np.isclose for reasonable value comparison tests
Feb 20, 2026
4e2407f
adding tests/isochrones/ so not tracked
Feb 21, 2026
5f36da8
removing test isochrones from git tracking
Feb 21, 2026
984e34f
fixing typo bug
Feb 21, 2026
2beaf10
adding v2.3 work
Feb 21, 2026
a6c0a02
Merge pull request #139 from astropy/dev
mwhosek Feb 21, 2026
e384cf1
add ST mag conversion
hustonm Feb 23, 2026
a7f2fe5
Merge branch 'dev' into photom_systems
hustonm Feb 23, 2026
5f29990
store verbose variable in IsochronePhot
hustonm Feb 23, 2026
b6c47af
Trim trailing white spaces
wei-lingfeng Feb 24, 2026
941dc92
Fixed minor typos and missing import
wei-lingfeng Feb 24, 2026
c42b10f
Added backward compatibility for isochrone file names
wei-lingfeng Feb 24, 2026
02c0feb
Added isochrone folder into gitignore
wei-lingfeng Feb 24, 2026
9283afd
Fixed r string warnings
wei-lingfeng Feb 24, 2026
67228f1
Adjusted check save file order
wei-lingfeng Feb 24, 2026
21bc2b3
Changed global random seed to random generator; Updated star systems …
wei-lingfeng Feb 24, 2026
5fd75f5
Remove unnecessary checkings
wei-lingfeng Feb 24, 2026
e753199
Added documentation on random number generator behavior; Added suppor…
wei-lingfeng Feb 25, 2026
fa230c6
Merge branch 'main' of https://github.com/astropy/SPISEA into dev
wei-lingfeng Feb 25, 2026
2b9e77e
Moved IMF testing under spisea/tests
wei-lingfeng Feb 26, 2026
138ca29
Optimized import and removed unused imports
wei-lingfeng Feb 26, 2026
bf01acb
Removed the extra parameter rng in generate_cluster and calc_multi, a…
wei-lingfeng Feb 26, 2026
b2ea3fb
started interp_AKs_grid setup with kwargs and variables
hustonm Feb 26, 2026
fc5b408
add Gaia EDR3 filters
hustonm Feb 26, 2026
6bcc972
Added missing blank line in docstring code block
wei-lingfeng Feb 26, 2026
345e6e4
MF=0 stipulation added for random companion counts
Feb 27, 2026
a8bc0f4
fixing BD binarity
Feb 27, 2026
1d9cdc2
updated filters.rst and dictionary in synthetic.py
Rocketpack23 Mar 5, 2026
382121b
Merge branch 'dev' into dev
mwhosek Mar 20, 2026
3ef3e50
Merge pull request #137 from Rocketpack23/dev
mwhosek Mar 20, 2026
374602d
Merge branch 'dev' into photom_systems
mwhosek Mar 20, 2026
8607236
Merge pull request #141 from astropy/photom_systems
mwhosek Mar 20, 2026
5da97c8
adding nsfcam,L to test_filters
Mar 20, 2026
9832414
Merge branch 'dev' into dev
mwhosek Mar 20, 2026
ec70d2d
Merge pull request #143 from wei-lingfeng/dev
mwhosek Mar 20, 2026
1eb0a8c
Merge branch 'dev' of https://github.com/astropy/SPISEA into dev
Mar 20, 2026
6198d8c
Merge branch 'grid_interp_AKs' into dev
hustonm Mar 20, 2026
c958a0a
resolve merge mistakes
Mar 20, 2026
8bfbbde
fixed assert euqal to isclose
Mar 20, 2026
4b3ebb0
updating version
Mar 20, 2026
83b2fd9
updating contributors
Mar 20, 2026
4cf9e28
adding irtf
Mar 20, 2026
e774eda
updating changelog
Mar 20, 2026
3c1440c
adding conversion funcs, docs about mag systems
Mar 20, 2026
39bafec
fixing links
Mar 20, 2026
7139c2c
Merge pull request #147 from astropy/dev
mwhosek Mar 20, 2026
fb3cdc2
update doc string
Mar 20, 2026
e414eee
Working on new packaging.
jluastro Apr 2, 2026
f9c8ed0
Explicitly specifying that there is only one package.
jluastro Apr 2, 2026
6699843
Explicitly specifying that there is only one package, again.
jluastro Apr 2, 2026
63ea1a4
Changed formatting of Hosek+20 figure notebooks and first few Begbie+…
Apr 3, 2026
ff63231
Adding Begbie+26 Figures 6+7
Apr 4, 2026
f0605b7
Replaced pickle files with fits files
wei-lingfeng Apr 7, 2026
d967b5f
Merge pull request #150 from wei-lingfeng/dev
mwhosek Apr 7, 2026
4dfdbac
add SODC extinction law from SynthPop
hustonm Apr 9, 2026
4fc570a
Corrected paper figures uploaded
Apr 17, 2026
5966859
Final figure changes
Apr 17, 2026
ba1c455
Changed log(a) distribution to interpolate stellar-->substellar
Apr 17, 2026
cf9fc0d
Adding cluster data files and reformatting figures with new filepaths
Apr 20, 2026
4507acf
messy code clean-up
Apr 20, 2026
f4f80b2
updating documentation with new BD functions/models
caitlinbegbie Apr 20, 2026
e0d48f3
debug SODC
hustonm Apr 27, 2026
9b703e7
debug VIS wavelength, add SODC citations
hustonm Apr 27, 2026
efc2a14
add test for SODC red law
hustonm Apr 27, 2026
ca7e8d2
add SODC extinction law to docs
hustonm Apr 30, 2026
75c8ba1
Merge pull request #151 from astropy/dev_mjh
mwhosek Apr 30, 2026
16f08c6
Add test_atmospheres_grid_timing for k93models extraction benchmark.
jluastro May 5, 2026
bc25085
do some filter cleanup
hustonm May 22, 2026
9a4a35d
adding more filters
hustonm May 22, 2026
19e6829
add OGLE R-wide filter
hustonm May 25, 2026
22e734b
doc cleanup
hustonm May 26, 2026
ec0284e
Enable all Gaia passband versions, adding EDR3 as recommended version
hustonm May 28, 2026
d9777f8
clean up ps1 and decam filter names
hustonm May 28, 2026
52791bc
make filter handling more generic so any synphot filters can be used
hustonm May 28, 2026
2e99d0c
file cleanup
hustonm May 28, 2026
329e4d8
update my constributions
hustonm May 28, 2026
6f6ca6a
add subaru hsc filters
hustonm May 28, 2026
459141c
debug calc_multi no companions case
Jun 1, 2026
f38b857
Merge remote-tracking branch 'upstream/dev' into feature/BDs
caitlinbegbie Jun 1, 2026
dd184f0
debug case where cluster generates no companions
Jun 1, 2026
85ee83e
debug case where cluster generates no companions
Jun 1, 2026
4c8677a
Fixes to all merge conflicts
caitlinbegbie Jun 1, 2026
df1a116
Committing changes from dev
caitlinbegbie Jun 1, 2026
75f2e04
Adding UKIRT Z and Y filters
caitlinbegbie Jun 1, 2026
0a68241
Updated documentation, including rst table replacements for evo and a…
caitlinbegbie Jun 2, 2026
76b8533
Add test case for cluster with multiplicity on but no generated compa…
Jun 2, 2026
ed63fca
resolve a couple easy numpy DepracationWarnings
Jun 3, 2026
9ded344
update DECam filters
Jun 5, 2026
c5f87c6
Figure changes for Begbie+26
caitlinbegbie Jun 5, 2026
2aa4829
Change to Figure 12
caitlinbegbie Jun 5, 2026
e85347f
Last changes to figures
caitlinbegbie Jun 5, 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
008639d
fix low mass companion handling in get_companions_table_new
Jun 17, 2026
963bb2c
allow metallicity slightly outside range for MIST so floating point d…
Jun 17, 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
a1bad5d
Merge pull request #108 from caitlinbegbie/feature/BDs
jluastro Jun 18, 2026
5541968
Merge branch 'dev' into dev_mjh
hustonm Jun 18, 2026
342c082
clean out duplicate _make_companions_table and remove decam,y filter …
Jun 18, 2026
9343ecd
Update grid_version and add some details to changelog for v3.0
Jun 18, 2026
7fc7d4b
Merge pull request #152 from astropy/dev_mjh
mwhosek Jun 18, 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
1b02b21
add bessell (1990) ubvri filters
hustonm Jul 1, 2026
ebcc2f3
document Bessell filters + add warning to existing ubv for I-filter
hustonm Jul 1, 2026
40abd15
small docs formatting bugfix
Jul 2, 2026
67b9175
more docs reformatting on changelog
Jul 2, 2026
3877917
updated version to 3.0
Jul 2, 2026
07c4874
debug Phillips2020 evo file age naming
hustonm Jul 2, 2026
8a9ad91
johnson-cousins I band note
hustonm Jul 2, 2026
23c16ba
Merge pull request #156 from astropy/fix_UBVRI
mwhosek Jul 2, 2026
0cb96a5
allow mag sys conversion for IsochronePhot object
hustonm Jul 6, 2026
122c51c
clarify MAGSYS in metadata and docstring
hustonm Jul 6, 2026
22d3271
clarify MAGSYS in metadata and docstring
hustonm Jul 6, 2026
0fed5ff
Fix documentation typo
hustonm Jul 7, 2026
1ce572a
added docstring to cosmic evo model
nsabrams Jul 7, 2026
d73f4cc
updated default evo model
nsabrams Jul 7, 2026
e3c30ea
refactored external evol in resolved clusters
nsabrams Jul 7, 2026
1bb0176
added sentence about cosmic being slower
nsabrams Jul 7, 2026
723c199
Merge pull request #154 from nsabrams/cosmic-BD-merge
jluastro Jul 10, 2026
ff936df
Merge branch 'dev' of https://github.com/astropy/SPISEA into iso_mag_sys
hustonm Jul 13, 2026
94e439c
mag_sys updates in COSMIC additions
hustonm Jul 14, 2026
2656cf4
update docs for mag sys
hustonm Jul 14, 2026
f0ac7bf
only keep requested filters in external evol isochrone
hustonm Jul 14, 2026
3763be9
Merge branch 'iso_mag_sys' of https://github.com/astropy/SPISEA into …
hustonm Jul 14, 2026
1ab4774
updated contribution:
hustonm Jul 14, 2026
5690e20
change MISTv1 synthpop_extension default to True
hustonm Jul 14, 2026
f35d519
Merge pull request #157 from astropy/iso_mag_sys
jluastro Jul 16, 2026
a689650
updating to v2.5
Jul 17, 2026
ba03bd5
updating changelog
Jul 17, 2026
58dad8e
Update index.rst
mwhosek Jul 18, 2026
4a5c4bb
Update index.rst
mwhosek Jul 18, 2026
d3de62b
changing installation page heading structure
Jul 18, 2026
bb5ff3a
Merge pull request #158 from astropy/dev
mwhosek Jul 18, 2026
a0bbc52
sphinx yaml stuff
Jul 18, 2026
8799070
adding setuptools for sphinx autodoc
Jul 18, 2026
f70d715
moving python version to 3.10, looks like setuptools fails post 3.11
Jul 18, 2026
c430ca1
looks like we need older setuptools
Jul 18, 2026
ccbe477
oops, need setup tools <= 81
Jul 18, 2026
cf67f1e
now fixing numpy - pysynphot compatibility issues
Jul 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
8 changes: 7 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# SPISEA-generated isochrones from test functions
spisea/tests/isochrones/

# Compiled files
*.py[co]
*.a
Expand Down Expand Up @@ -51,4 +54,7 @@ distribute-*.tar.gz

# OS Generated Files
.DS_Store
._*
._*

# Test files generated
spisea/tests/isochrones
2 changes: 1 addition & 1 deletion .readthedocs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ version: 2
build:
os: ubuntu-22.04
tools:
python: "3.7"
python: "3.10"


# Build documentation in the docs/ directory with Sphinx
Expand Down
674 changes: 674 additions & 0 deletions LICENSE.txt
View file
Open in desktop

Large diffs are not rendered by default.

16 changes: 0 additions & 16 deletions MANIFEST.in
View file
Open in desktop

This file was deleted.

Loading