Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
87 commits
Select commit Hold shift + click to select a range
4d50b9c
Updating my Fork. Will add comments. Created Isochrone Binary
Oct 5, 2020
434273f
Added some DocQuotes
Oct 8, 2020
6323f72
Created Binary_Cluster and matching scheme
Oct 17, 2020
f864a38
Created mechanism for finding potential errors in loga generation
Oct 30, 2020
1abdae5
Modified Model Sampling and Debugged Phase assignment
Nov 2, 2020
3116b88
Rename gravity as logg and added comments
Nov 2, 2020
19bfe77
Renaming and commenting
Nov 2, 2020
046d358
Ryota Inagaki latest version
Nov 9, 2020
f3ade00
Keep Prototype
Nov 16, 2020
29cba44
Getting rid of unnecessary data in Isochrone files and Other adjustments
Nov 30, 2020
905b2e2
With updates
Dec 2, 2020
4eeda9b
Deleted everything from Local Copy repasted from Github and my reform…
Dec 3, 2020
c3b64b2
PrePep8 state for synthetic
Dec 3, 2020
c97f330
Made changes to SECMOD Treatment
Dec 11, 2020
6c35ba5
Some debugging done in synthetic and reformatter
Dec 14, 2020
38dad09
Creating Test Notebooks
Dec 15, 2020
56f995a
Rerun notebooks
Dec 15, 2020
a061e49
Testing
Dec 17, 2020
4cc1c1c
Today: Made sure that secondaries are initially less massive than pri…
Dec 18, 2020
99c027d
Altering Mass Matching Algorithm to increase cluster mass
Dec 19, 2020
79cb818
Doing tests on error demonstration notebook
Dec 19, 2020
39c7890
Playing with the mass matching
Dec 20, 2020
8b0ddf9
Creating adjustment factor for cluster creation
Dec 20, 2020
a28eebb
Tinkering with adjustment factors as temporary remedy
Dec 21, 2020
af7ccff
adjustment factor FOR SOLAR Z only
Dec 21, 2020
a480b1e
Adjustment factor for Z solar only
Dec 21, 2020
ca7ff40
Adjustment of the loga == 0 case
Dec 21, 2020
f5eff3f
Trying out runtime tests
Dec 22, 2020
48c1020
Edited and Filled out the Demonstration Notebooks
Dec 24, 2020
e2f3ece
Prettify Codes and Adding to Test Notebooks
Jan 4, 2021
3d79fa1
Correcting some spacing errors
RyotaInagaki1 Jan 4, 2021
5b0e44f
Added Documentation Links
RyotaInagaki1 Jan 4, 2021
8f6d575
Update README.md
RyotaInagaki1 Jan 4, 2021
c010e0d
Update test_bpass_assumptions_and_etc.py
RyotaInagaki1 Jan 4, 2021
1ce0840
Update test_bpass_assumptions_and_etc.py
RyotaInagaki1 Jan 4, 2021
ea61517
Unit test fix?
Jan 4, 2021
0747361
Edits to the Example Notebooks
Jan 4, 2021
8a139ac
Fixing Example Notebooks
Jan 4, 2021
984ac18
Increased leniency on matching massive stars
RyotaInagaki1 Jan 6, 2021
23eaeac
Fixes to setup
Jan 6, 2021
2f0c281
Rerun some test notebooks
RyotaInagaki1 Jan 8, 2021
faecc44
Cluster error demonstrations
RyotaInagaki1 Jan 8, 2021
5c3beaf
Fixes
RyotaInagaki1 Mar 14, 2021
31aa0f9
Reran one test notebook
RyotaInagaki1 Mar 14, 2021
93c0df9
Found Mistake in dev branch
RyotaInagaki1 Mar 17, 2021
f6216fd
Found Error in evolution
RyotaInagaki1 Mar 18, 2021
2815fea
Found Bugs
RyotaInagaki1 Mar 18, 2021
7290811
Changes to synthetic before checkout
RyotaInagaki1 Mar 19, 2021
a69269e
Found Bug IN Evolution and working with synthetic
RyotaInagaki1 Mar 23, 2021
7d80d28
Delete an untitled notebook
RyotaInagaki1 Mar 23, 2021
802cfe6
Cleaning up Spring 2021 version.
RyotaInagaki1 Mar 23, 2021
b9b8d2c
Fixing Matching Criteria
RyotaInagaki1 Mar 24, 2021
aac9d5c
Fixing Matching
RyotaInagaki1 Mar 24, 2021
f974d90
Decided to divide up code and Revise Usage of IFMR
RyotaInagaki1 Apr 2, 2021
c24d6b1
Added a draft of faster version of atmosphere generation
RyotaInagaki1 Apr 5, 2021
b070d10
One step closer~
RyotaInagaki1 Apr 9, 2021
5921dab
Found a Bug In Mass Listing
RyotaInagaki1 Apr 9, 2021
24aafaf
Drafting a Vectorized version of photometry generation.
RyotaInagaki1 Apr 9, 2021
eebd8c2
Working Around Vectorization Tweaks; TO TEST
RyotaInagaki1 Apr 10, 2021
f55b0dd
Need to stash changes before pull
RyotaInagaki1 Apr 10, 2021
0aaeed7
Git forces me to commit
RyotaInagaki1 Apr 10, 2021
d785daa
Added a few instance attributes for debugging. Also made less restric…
RyotaInagaki1 Apr 15, 2021
e2eccef
Found a bug in thhe IFMR applier
RyotaInagaki1 Apr 16, 2021
8fb22a1
De-regulation of the matching
RyotaInagaki1 Apr 22, 2021
83d616a
Officially Added Unit tests
RyotaInagaki1 Apr 23, 2021
1416249
Reinserted ResolvedCluster to address issues
RyotaInagaki1 Apr 27, 2021
ed14a0f
Fixed Deletion message due to the sampling
RyotaInagaki1 May 17, 2021
6249c3d
New Plots
RyotaInagaki1 May 25, 2021
956768a
Commit just in case
RyotaInagaki1 Jun 1, 2021
4ec114c
Did a bit of a dive through code: found a bug
RyotaInagaki1 Jun 3, 2021
dd46e83
Update test_BPASS_cluster.py
RyotaInagaki1 Jun 5, 2021
4d959fb
Debugged and found two things to fix: rerunning of notebooks. More to…
RyotaInagaki1 Jun 8, 2021
10c2ff5
Most Recent Version
RyotaInagaki1 Jun 14, 2021
b8fec2d
Adding in features for BPASS cluster interpolation
RyotaInagaki1 Jun 28, 2021
d2775d2
Checkpoint Inteprolation done and is being tested Tuesday 6/29/2021
RyotaInagaki1 Jun 30, 2021
74f70d5
Did my first run, organizing a bit of code again
RyotaInagaki1 Jun 30, 2021
2918d5b
Making the interpolation checks solely based on non-merged pairs
RyotaInagaki1 Jul 2, 2021
aed4ab6
July 4th commit
RyotaInagaki1 Jul 4, 2021
381fcf1
Structural Changes to filling_in_primaries_and_secondaries
RyotaInagaki1 Jul 7, 2021
ff5e9b8
Overdue Commit: Resolve Phase assignment and Trying to Deal with remo…
RyotaInagaki1 Jul 19, 2021
5641558
July 22 Commit Checkpoint
RyotaInagaki1 Jul 23, 2021
42a8e97
July 25 commits fix in badly interpolated?
RyotaInagaki1 Jul 26, 2021
44d9cb7
Putting Plug to unrealistic values
RyotaInagaki1 Aug 8, 2021
758e80e
Caching feature
RyotaInagaki1 Aug 11, 2021
4a7c643
Fixing Names for bounds
RyotaInagaki1 Aug 12, 2021
2c2891a
Fixes
RyotaInagaki1 Aug 12, 2021
5eee809
Last Commit of my tenure
RyotaInagaki1 Aug 17, 2021
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

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

1,154 changes: 1,154 additions & 0 deletions Cluster_Mass_Error_Demonstration/Error Demonstration 10^9 yr old Salpeter.ipynb

Large diffs are not rendered by default.

273 changes: 273 additions & 0 deletions Cluster_Mass_Error_Demonstration/iso_7.00_0.00_01000_m10.fits

Large diffs are not rendered by default.

208 changes: 208 additions & 0 deletions Cluster_Mass_Error_Demonstration/iso_7.00_0.70_00100_p00.fits

Large diffs are not rendered by default.

374 changes: 374 additions & 0 deletions Cluster_Mass_Error_Demonstration/iso_9.00_0.70_00100_p00.fits

Large diffs are not rendered by default.

24 changes: 24 additions & 0 deletions CreateAllIsoFiles.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Makes the Isochrone Files
from spisea import IsochroneMakerReformattedVersionNew
from spisea.IsochroneMakerReformattedVersionNew import reformatter, extractor
import time
import math
# For interpreting meanings of the metallicities (possible met values)
# see Appendix A of the write up/paper
mets = ["zem5", "zem4", "zem3", "z001", "z002", "z003", "z004", "z005",
"z008", "z010", "z014", "z020", "z030", "z040"]
for met in mets:
for x in range(51):
t1=time.time()
# TODO: replace "/g/lu/scratch/ryotainagaki/BPASS_tester_newReformatTest/"
# with absolute path to your directory of
# reformatted fitsmodels
# that were created by the reformatter function
# TODO: replace "/g/lu/scratch/ryotainagaki/BPASS_iso_filesTimedIsolated/" with
# absolute path to your intended directory
# of isochrone files
extractor(round(6.0 + 0.1 * x,1), met,"/g/lu/scratch/ryotainagaki/" +
"BPASS_tester_newReformatTest/",
"/g/lu/scratch/ryotainagaki/BPASS_iso_filesTimedIsolated/",0.05)
t2 = time.time()
print(t2 - t1)
6 changes: 6 additions & 0 deletions GenerateIsoFiles.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
from spisea import evolution

bpass = evolution.BPASS()
# Temporary comment out:
# bpass.run_formatter()
bpass.run_extractor()
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# SPISEA: Stellar Population Interface for Stellar Evolution and Atmospheres
# Ryota Inagaki's fork of SPISEA

SPISEA is an python package that generates single-age, single-metallicity
populations (i.e. star clusters). It gives the user control over many parameters:
Expand Down
4,166 changes: 4,166 additions & 0 deletions Test_Plots/TestPlot_7.0_MIST_0.1.ipynb

Large diffs are not rendered by default.

4,170 changes: 4,170 additions & 0 deletions Test_Plots/TestPlot_7.0_MIST_1.0.ipynb

Large diffs are not rendered by default.

2,276 changes: 2,276 additions & 0 deletions Test_Plots/TestPlot_8.2_MIST_1.0.ipynb

Large diffs are not rendered by default.

1,974 changes: 1,974 additions & 0 deletions Test_Plots/TestPlot_8.2_Parsec_1.0.ipynb

Large diffs are not rendered by default.

2,997 changes: 2,997 additions & 0 deletions Test_Plots/TestPlot_9.0_MIST_0.1.ipynb

Large diffs are not rendered by default.

1,555 changes: 1,555 additions & 0 deletions Test_Plots/TestPlot_9.2_MIST_0.1.ipynb

Large diffs are not rendered by default.

2,766 changes: 2,766 additions & 0 deletions Test_Plots/TestPlot_9.3_MIST_0.1.ipynb

Large diffs are not rendered by default.

264 changes: 264 additions & 0 deletions Test_Plots/iso_7.00_0.00_01000_m10.fits

Large diffs are not rendered by default.

842 changes: 842 additions & 0 deletions Test_Plots/iso_7.00_0.00_01000_m10_IBprimary.fits

Large diffs are not rendered by default.

1,336 changes: 1,336 additions & 0 deletions Test_Plots/iso_7.00_0.00_01000_m10_IBsecondary.fits

Large diffs are not rendered by default.

33 changes: 33 additions & 0 deletions Test_Plots/iso_7.00_0.00_01000_m10_IBsingle.fits

Large diffs are not rendered by default.

231 changes: 231 additions & 0 deletions Test_Plots/iso_7.00_0.00_01000_p00.fits

Large diffs are not rendered by default.

988 changes: 988 additions & 0 deletions Test_Plots/iso_7.00_0.00_01000_p00_IBprimary.fits

Large diffs are not rendered by default.

1,216 changes: 1,216 additions & 0 deletions Test_Plots/iso_7.00_0.00_01000_p00_IBsecondary.fits

Large diffs are not rendered by default.

44 changes: 44 additions & 0 deletions Test_Plots/iso_7.00_0.00_01000_p00_IBsingle.fits

Large diffs are not rendered by default.

98 changes: 98 additions & 0 deletions Test_Plots/iso_8.20_0.00_00100_p00.fits

Large diffs are not rendered by default.

1,072 changes: 1,072 additions & 0 deletions Test_Plots/iso_8.20_0.00_00100_p00_IBprimary.fits

Large diffs are not rendered by default.

937 changes: 937 additions & 0 deletions Test_Plots/iso_8.20_0.00_00100_p00_IBsecondary.fits

Large diffs are not rendered by default.

43 changes: 43 additions & 0 deletions Test_Plots/iso_8.20_0.00_00100_p00_IBsingle.fits

Large diffs are not rendered by default.

155 changes: 155 additions & 0 deletions Test_Plots/iso_8.20_0.00_02000_p00.fits

Large diffs are not rendered by default.

770 changes: 770 additions & 0 deletions Test_Plots/iso_8.20_0.00_02000_p00_IBprimary.fits

Large diffs are not rendered by default.

1,037 changes: 1,037 additions & 0 deletions Test_Plots/iso_8.20_0.00_02000_p00_IBsecondary.fits

Large diffs are not rendered by default.

35 changes: 35 additions & 0 deletions Test_Plots/iso_8.20_0.00_02000_p00_IBsingle.fits

Large diffs are not rendered by default.

440 changes: 440 additions & 0 deletions Test_Plots/iso_9.00_0.00_00100_m10.fits

Large diffs are not rendered by default.

884 changes: 884 additions & 0 deletions Test_Plots/iso_9.00_0.00_00100_m10_IBprimary.fits

Large diffs are not rendered by default.

2,134 changes: 2,134 additions & 0 deletions Test_Plots/iso_9.00_0.00_00100_m10_IBsecondary.fits

Large diffs are not rendered by default.

65 changes: 65 additions & 0 deletions Test_Plots/iso_9.00_0.00_00100_m10_IBsingle.fits

Large diffs are not rendered by default.

396 changes: 396 additions & 0 deletions Test_Plots/iso_9.20_0.00_02000_m10.fits

Large diffs are not rendered by default.

818 changes: 818 additions & 0 deletions Test_Plots/iso_9.20_0.00_02000_m10_IBprimary.fits

Large diffs are not rendered by default.

1,697 changes: 1,697 additions & 0 deletions Test_Plots/iso_9.20_0.00_02000_m10_IBsecondary.fits

Large diffs are not rendered by default.

55 changes: 55 additions & 0 deletions Test_Plots/iso_9.20_0.00_02000_m10_IBsingle.fits

Large diffs are not rendered by default.

359 changes: 359 additions & 0 deletions Test_Plots/iso_9.30_0.00_01000_m10.fits

Large diffs are not rendered by default.

549 changes: 549 additions & 0 deletions Test_Plots/iso_9.30_0.00_01000_m10_IBprimary.fits

Large diffs are not rendered by default.

1,785 changes: 1,785 additions & 0 deletions Test_Plots/iso_9.30_0.00_01000_m10_IBsecondary.fits

Large diffs are not rendered by default.

51 changes: 51 additions & 0 deletions Test_Plots/iso_9.30_0.00_01000_m10_IBsingle.fits

Large diffs are not rendered by default.

551 changes: 551 additions & 0 deletions spisea/IsochroneMakerReformattedVersionNew.py

Large diffs are not rendered by default.

162 changes: 162 additions & 0 deletions spisea/Sanity_Checks_Logg.ipynb
Original file line number Diff line number Diff line change
@@ -0,0 +1,162 @@
{
"cells": [
{
"cell_type": "code",
"execution_count": 3,
"id": "a0fe5409-e821-4b35-b1c7-9d989c521e03",
"metadata": {},
"outputs": [],
"source": [
"import numpy as np\n",
"import astropy.constants as cs\n",
"import astropy.units as un\n",
"\n",
"R1 = 1.0\n"
]
},
{
"cell_type": "markdown",
"id": "af3a1b29-e189-4396-b09d-c85846c45c57",
"metadata": {},
"source": [
"First Star: The Sun!"
]
},
{
"cell_type": "code",
"execution_count": 5,
"id": "138c0605-c54a-45f3-be27-139f67eecd09",
"metadata": {},
"outputs": [
{
"data": {
"text/latex": [
"$4.4380676 \\; \\mathrm{}$"
],
"text/plain": [
"<Quantity 4.43806763>"
]
},
"execution_count": 5,
"metadata": {},
"output_type": "execute_result"
}
],
"source": [
"np.log10((1)* cs.GM_sun /\n",
" (((10 ** (0) *\n",
" cs.R_sun) ** 2)) *\n",
" un.s * un.s/un.cm)"
]
},
{
"cell_type": "code",
"execution_count": 6,
"id": "f6c7ec80-a162-46c5-ac1b-871f239442a7",
"metadata": {},
"outputs": [
{
"data": {
"text/plain": [
"4.437750562820388"
]
},
"execution_count": 6,
"metadata": {},
"output_type": "execute_result"
}
],
"source": [
"np.log10(274*10**2)"
]
},
{
"cell_type": "code",
"execution_count": 7,
"id": "feeb3bad-a051-4cd1-9935-a6bd7be8508e",
"metadata": {},
"outputs": [
{
"data": {
"text/latex": [
"$4.3043234 \\; \\mathrm{}$"
],
"text/plain": [
"<Quantity 4.30432336>"
]
},
"execution_count": 7,
"metadata": {},
"output_type": "execute_result"
}
],
"source": [
"np.log10((1.100)* cs.GM_sun /\n",
" (((10 ** (np.log10(1.2234)) *\n",
" cs.R_sun) ** 2)) *\n",
" un.s * un.s/un.cm)"
]
},
{
"cell_type": "code",
"execution_count": 8,
"id": "f856df29-4a00-49fb-9fc4-7ffa3ae033ed",
"metadata": {},
"outputs": [
{
"data": {
"text/latex": [
"$4.5234521 \\; \\mathrm{}$"
],
"text/plain": [
"<Quantity 4.52345205>"
]
},
"execution_count": 8,
"metadata": {},
"output_type": "execute_result"
}
],
"source": [
"np.log10((0.907)* cs.GM_sun /\n",
" (((10 ** (np.log10(0.8632)) *\n",
" cs.R_sun) ** 2)) *\n",
" un.s * un.s/un.cm)"
]
},
{
"cell_type": "code",
"execution_count": null,
"id": "59d92ab4-a301-4750-b34d-6bc30a419a68",
"metadata": {},
"outputs": [],
"source": [
"np.log10((0.907)* cs.GM_sun /\n",
" (((10 ** (np.log10(0.8632)) *\n",
" cs.R_sun) ** 2)) *\n",
" un.s * un.s/un.cm)"
]
}
],
"metadata": {
"kernelspec": {
"display_name": "astroconda",
"language": "python",
"name": "astroconda"
},
"language_info": {
"codemirror_mode": {
"name": "ipython",
"version": 3
},
"file_extension": ".py",
"mimetype": "text/x-python",
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.7.10"
}
},
"nbformat": 4,
"nbformat_minor": 5
}
Loading