Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
5,741 changes: 5,741 additions & 0 deletions sedkit/data/models/evolutionary/SANDee/SAND_z-0.15_a-0.05_age.txt

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not familiar with the values from the evo model, but are the first values for age supposed to be zero @efrain-alvarado-iii ?

Large diffs are not rendered by default.

4,945 changes: 4,945 additions & 0 deletions sedkit/data/models/evolutionary/SANDee/SAND_z-0.15_a0.15_age.txt

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@efrain-alvarado-iii , I am a bit confused about the naming of the evolutionary models, what does each name mean? For example, [SAND_z-0.15_a0.15_age.txt], what does the z, a mean in the names?

Large diffs are not rendered by default.

5,846 changes: 5,846 additions & 0 deletions sedkit/data/models/evolutionary/SANDee/SAND_z-0.15_a0.3_age.txt

Large diffs are not rendered by default.

4,441 changes: 4,441 additions & 0 deletions sedkit/data/models/evolutionary/SANDee/SAND_z-0.35_a0.0_age.txt

Large diffs are not rendered by default.

5,295 changes: 5,295 additions & 0 deletions sedkit/data/models/evolutionary/SANDee/SAND_z-0.35_a0.2_age.txt

Large diffs are not rendered by default.

4,895 changes: 4,895 additions & 0 deletions sedkit/data/models/evolutionary/SANDee/SAND_z-0.35_a0.4_age.txt

Large diffs are not rendered by default.

5,359 changes: 5,359 additions & 0 deletions sedkit/data/models/evolutionary/SANDee/SAND_z-0.6_a0.0_age.txt

Large diffs are not rendered by default.

4,831 changes: 4,831 additions & 0 deletions sedkit/data/models/evolutionary/SANDee/SAND_z-0.6_a0.2_age.txt

Large diffs are not rendered by default.

4,811 changes: 4,811 additions & 0 deletions sedkit/data/models/evolutionary/SANDee/SAND_z-0.6_a0.4_age.txt

Large diffs are not rendered by default.

5,289 changes: 5,289 additions & 0 deletions sedkit/data/models/evolutionary/SANDee/SAND_z-0.85_a0.1_age.txt

Large diffs are not rendered by default.

5,165 changes: 5,165 additions & 0 deletions sedkit/data/models/evolutionary/SANDee/SAND_z-0.85_a0.3_age.txt

Large diffs are not rendered by default.

5,820 changes: 5,820 additions & 0 deletions sedkit/data/models/evolutionary/SANDee/SAND_z-1.1_a0.15_age.txt

Large diffs are not rendered by default.

5,438 changes: 5,438 additions & 0 deletions sedkit/data/models/evolutionary/SANDee/SAND_z-1.1_a0.35_age.txt

Large diffs are not rendered by default.

4,890 changes: 4,890 additions & 0 deletions sedkit/data/models/evolutionary/SANDee/SAND_z-1.3_a0.15_age.txt

Large diffs are not rendered by default.

5,235 changes: 5,235 additions & 0 deletions sedkit/data/models/evolutionary/SANDee/SAND_z-1.3_a0.35_age.txt

Large diffs are not rendered by default.

5,410 changes: 5,410 additions & 0 deletions sedkit/data/models/evolutionary/SANDee/SAND_z-1.5_a0.3_age.txt

Large diffs are not rendered by default.

5,835 changes: 5,835 additions & 0 deletions sedkit/data/models/evolutionary/SANDee/SAND_z-1.75_a0.3_age.txt

Large diffs are not rendered by default.

5,374 changes: 5,374 additions & 0 deletions sedkit/data/models/evolutionary/SANDee/SAND_z-1.95_a0.3_age.txt

Large diffs are not rendered by default.

5,275 changes: 5,275 additions & 0 deletions sedkit/data/models/evolutionary/SANDee/SAND_z-2.2_a0.35_age.txt

Large diffs are not rendered by default.

6,038 changes: 6,038 additions & 0 deletions sedkit/data/models/evolutionary/SANDee/SAND_z-2.4_a0.4_age.txt

Large diffs are not rendered by default.

5,611 changes: 5,611 additions & 0 deletions sedkit/data/models/evolutionary/SANDee/SAND_z0.1_a0.0_age.txt

Large diffs are not rendered by default.

5,354 changes: 5,354 additions & 0 deletions sedkit/data/models/evolutionary/SANDee/SAND_z0.1_a0.15_age.txt

Large diffs are not rendered by default.

5,616 changes: 5,616 additions & 0 deletions sedkit/data/models/evolutionary/SANDee/SAND_z0.3_a0.0_age.txt

Large diffs are not rendered by default.

5,194 changes: 5,194 additions & 0 deletions sedkit/data/models/evolutionary/SANDee/SAND_z0.3_a0.15_age.txt

Large diffs are not rendered by default.

10 changes: 8 additions & 2 deletions sedkit/isochrone.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,10 @@

# A list of all supported evolutionary models
try:
EVO_MODELS = [os.path.basename(m).replace('.txt', '') for m in glob.glob(str(importlib.resources.files('sedkit')/ 'data/models/evolutionary/*'))]
EVO_MODELS = [os.path.basename(m).replace('.txt', '') for m in
glob.glob(str(importlib.resources.files('sedkit') / 'data/models/evolutionary/*.txt')) +
glob.glob(str(importlib.resources.files('sedkit') / 'data/models/evolutionary/SANDee/*.txt'))]

# Fails RTD build for some reason
except:
EVO_MODELS = ['COND03', 'dmestar_solar', 'DUSTY00', 'f2_solar_age', 'hybrid_solar_age', 'nc+03_age','nc+0.0_age', 'nc-03_age', 'nc_solar_age','nc+0.5_age','nc-0.5_age', 'parsec12_solar','ATMO_NEQ_strong','ATMO_NEQ_strong_MIRI','chaubrier_2022.txt']
Expand All @@ -54,7 +57,10 @@ def __init__(self, name, units=None, verbose=True, **kwargs):

# Set the path
self.name = name
self.path = str(importlib.resources.files('sedkit')/ 'data/models/evolutionary/{}.txt').format(self.name)
self.path = str(importlib.resources.files('sedkit') / 'data/models/evolutionary/{}.txt').format(self.name)

if not os.path.exists(self.path):

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this should work, since all the checks are being passed, but I think we could possibly format the two attempts to get the path, instead of just having a if statement that is going to be true even if the evo model you attempt is not the Sandee nor the one's already added. Does that make sense?

self.path = str(importlib.resources.files('sedkit') / 'data/models/evolutionary/SANDee/{}.txt').format(self.name)
self._age_units = None
self._mass_units = None
self._radius_units = None
Expand Down
Loading