astro-nest 0.7.2.dev2__tar.gz → 0.7.2.dev3__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {astro_nest-0.7.2.dev2 → astro_nest-0.7.2.dev3}/NEST/core.py +9 -3
- {astro_nest-0.7.2.dev2 → astro_nest-0.7.2.dev3}/PKG-INFO +1 -1
- {astro_nest-0.7.2.dev2 → astro_nest-0.7.2.dev3}/astro_nest.egg-info/PKG-INFO +1 -1
- {astro_nest-0.7.2.dev2 → astro_nest-0.7.2.dev3}/pyproject.toml +1 -1
- {astro_nest-0.7.2.dev2 → astro_nest-0.7.2.dev3}/NEST/__init__.py +0 -0
- {astro_nest-0.7.2.dev2 → astro_nest-0.7.2.dev3}/NEST/_version.py +0 -0
- {astro_nest-0.7.2.dev2 → astro_nest-0.7.2.dev3}/NEST/domain.pkl +0 -0
- {astro_nest-0.7.2.dev2 → astro_nest-0.7.2.dev3}/NEST/models/BaSTI.mlp +0 -0
- {astro_nest-0.7.2.dev2 → astro_nest-0.7.2.dev3}/NEST/models/BaSTI.sav +0 -0
- {astro_nest-0.7.2.dev2 → astro_nest-0.7.2.dev3}/NEST/models/BaSTI.scaler +0 -0
- {astro_nest-0.7.2.dev2 → astro_nest-0.7.2.dev3}/NEST/models/BaSTI_BPRP.mlp +0 -0
- {astro_nest-0.7.2.dev2 → astro_nest-0.7.2.dev3}/NEST/models/BaSTI_BPRP.sav +0 -0
- {astro_nest-0.7.2.dev2 → astro_nest-0.7.2.dev3}/NEST/models/BaSTI_BPRP.scaler +0 -0
- {astro_nest-0.7.2.dev2 → astro_nest-0.7.2.dev3}/NEST/models/BaSTI_HST_enhanced.mlp +0 -0
- {astro_nest-0.7.2.dev2 → astro_nest-0.7.2.dev3}/NEST/models/BaSTI_HST_enhanced.sav +0 -0
- {astro_nest-0.7.2.dev2 → astro_nest-0.7.2.dev3}/NEST/models/BaSTI_HST_enhanced.scaler +0 -0
- {astro_nest-0.7.2.dev2 → astro_nest-0.7.2.dev3}/NEST/models/BaSTI_HST_enhanced_BPRP.mlp +0 -0
- {astro_nest-0.7.2.dev2 → astro_nest-0.7.2.dev3}/NEST/models/BaSTI_HST_enhanced_BPRP.sav +0 -0
- {astro_nest-0.7.2.dev2 → astro_nest-0.7.2.dev3}/NEST/models/BaSTI_HST_enhanced_BPRP.scaler +0 -0
- {astro_nest-0.7.2.dev2 → astro_nest-0.7.2.dev3}/NEST/models/Dartmouth.mlp +0 -0
- {astro_nest-0.7.2.dev2 → astro_nest-0.7.2.dev3}/NEST/models/Dartmouth.sav +0 -0
- {astro_nest-0.7.2.dev2 → astro_nest-0.7.2.dev3}/NEST/models/Dartmouth.scaler +0 -0
- {astro_nest-0.7.2.dev2 → astro_nest-0.7.2.dev3}/NEST/models/Dartmouth_BPRP.mlp +0 -0
- {astro_nest-0.7.2.dev2 → astro_nest-0.7.2.dev3}/NEST/models/Dartmouth_BPRP.sav +0 -0
- {astro_nest-0.7.2.dev2 → astro_nest-0.7.2.dev3}/NEST/models/Dartmouth_BPRP.scaler +0 -0
- {astro_nest-0.7.2.dev2 → astro_nest-0.7.2.dev3}/NEST/models/Geneva.mlp +0 -0
- {astro_nest-0.7.2.dev2 → astro_nest-0.7.2.dev3}/NEST/models/Geneva.sav +0 -0
- {astro_nest-0.7.2.dev2 → astro_nest-0.7.2.dev3}/NEST/models/Geneva.scaler +0 -0
- {astro_nest-0.7.2.dev2 → astro_nest-0.7.2.dev3}/NEST/models/Geneva_BPRP.mlp +0 -0
- {astro_nest-0.7.2.dev2 → astro_nest-0.7.2.dev3}/NEST/models/Geneva_BPRP.sav +0 -0
- {astro_nest-0.7.2.dev2 → astro_nest-0.7.2.dev3}/NEST/models/Geneva_BPRP.scaler +0 -0
- {astro_nest-0.7.2.dev2 → astro_nest-0.7.2.dev3}/NEST/models/MIST.mlp +0 -0
- {astro_nest-0.7.2.dev2 → astro_nest-0.7.2.dev3}/NEST/models/MIST.sav +0 -0
- {astro_nest-0.7.2.dev2 → astro_nest-0.7.2.dev3}/NEST/models/MIST.scaler +0 -0
- {astro_nest-0.7.2.dev2 → astro_nest-0.7.2.dev3}/NEST/models/MIST_BPRP.mlp +0 -0
- {astro_nest-0.7.2.dev2 → astro_nest-0.7.2.dev3}/NEST/models/MIST_BPRP.sav +0 -0
- {astro_nest-0.7.2.dev2 → astro_nest-0.7.2.dev3}/NEST/models/MIST_BPRP.scaler +0 -0
- {astro_nest-0.7.2.dev2 → astro_nest-0.7.2.dev3}/NEST/models/NN_BaSTI.json +0 -0
- {astro_nest-0.7.2.dev2 → astro_nest-0.7.2.dev3}/NEST/models/NN_BaSTI_BPRP.json +0 -0
- {astro_nest-0.7.2.dev2 → astro_nest-0.7.2.dev3}/NEST/models/NN_BaSTI_HST_BPRP.json +0 -0
- {astro_nest-0.7.2.dev2 → astro_nest-0.7.2.dev3}/NEST/models/NN_BaSTI_HST_enhanced.json +0 -0
- {astro_nest-0.7.2.dev2 → astro_nest-0.7.2.dev3}/NEST/models/NN_BaSTI_HST_enhanced_BPRP.json +0 -0
- {astro_nest-0.7.2.dev2 → astro_nest-0.7.2.dev3}/NEST/models/NN_Dartmouth.json +0 -0
- {astro_nest-0.7.2.dev2 → astro_nest-0.7.2.dev3}/NEST/models/NN_Dartmouth_BPRP.json +0 -0
- {astro_nest-0.7.2.dev2 → astro_nest-0.7.2.dev3}/NEST/models/NN_Geneva.json +0 -0
- {astro_nest-0.7.2.dev2 → astro_nest-0.7.2.dev3}/NEST/models/NN_Geneva_BPRP.json +0 -0
- {astro_nest-0.7.2.dev2 → astro_nest-0.7.2.dev3}/NEST/models/NN_MIST.json +0 -0
- {astro_nest-0.7.2.dev2 → astro_nest-0.7.2.dev3}/NEST/models/NN_MIST_BPRP.json +0 -0
- {astro_nest-0.7.2.dev2 → astro_nest-0.7.2.dev3}/NEST/models/NN_PARSEC.json +0 -0
- {astro_nest-0.7.2.dev2 → astro_nest-0.7.2.dev3}/NEST/models/NN_PARSEC_BPRP.json +0 -0
- {astro_nest-0.7.2.dev2 → astro_nest-0.7.2.dev3}/NEST/models/NN_SYCLIST_BPRP.json +0 -0
- {astro_nest-0.7.2.dev2 → astro_nest-0.7.2.dev3}/NEST/models/NN_YaPSI.json +0 -0
- {astro_nest-0.7.2.dev2 → astro_nest-0.7.2.dev3}/NEST/models/NN_YaPSI_BPRP.json +0 -0
- {astro_nest-0.7.2.dev2 → astro_nest-0.7.2.dev3}/NEST/models/PARSEC.mlp +0 -0
- {astro_nest-0.7.2.dev2 → astro_nest-0.7.2.dev3}/NEST/models/PARSEC.sav +0 -0
- {astro_nest-0.7.2.dev2 → astro_nest-0.7.2.dev3}/NEST/models/PARSEC.scaler +0 -0
- {astro_nest-0.7.2.dev2 → astro_nest-0.7.2.dev3}/NEST/models/PARSEC_BPRP.mlp +0 -0
- {astro_nest-0.7.2.dev2 → astro_nest-0.7.2.dev3}/NEST/models/PARSEC_BPRP.sav +0 -0
- {astro_nest-0.7.2.dev2 → astro_nest-0.7.2.dev3}/NEST/models/PARSEC_BPRP.scaler +0 -0
- {astro_nest-0.7.2.dev2 → astro_nest-0.7.2.dev3}/NEST/models/YaPSI.mlp +0 -0
- {astro_nest-0.7.2.dev2 → astro_nest-0.7.2.dev3}/NEST/models/YaPSI.sav +0 -0
- {astro_nest-0.7.2.dev2 → astro_nest-0.7.2.dev3}/NEST/models/YaPSI.scaler +0 -0
- {astro_nest-0.7.2.dev2 → astro_nest-0.7.2.dev3}/NEST/models/YaPSI_BPRP.mlp +0 -0
- {astro_nest-0.7.2.dev2 → astro_nest-0.7.2.dev3}/NEST/models/YaPSI_BPRP.sav +0 -0
- {astro_nest-0.7.2.dev2 → astro_nest-0.7.2.dev3}/NEST/models/YaPSI_BPRP.scaler +0 -0
- {astro_nest-0.7.2.dev2 → astro_nest-0.7.2.dev3}/NEST/tutorial.ipynb +0 -0
- {astro_nest-0.7.2.dev2 → astro_nest-0.7.2.dev3}/astro_nest.egg-info/SOURCES.txt +0 -0
- {astro_nest-0.7.2.dev2 → astro_nest-0.7.2.dev3}/astro_nest.egg-info/dependency_links.txt +0 -0
- {astro_nest-0.7.2.dev2 → astro_nest-0.7.2.dev3}/astro_nest.egg-info/top_level.txt +0 -0
- {astro_nest-0.7.2.dev2 → astro_nest-0.7.2.dev3}/readme.md +0 -0
- {astro_nest-0.7.2.dev2 → astro_nest-0.7.2.dev3}/setup.cfg +0 -0
|
@@ -407,6 +407,9 @@ class AgeModel:
|
|
|
407
407
|
ages = self.ages
|
|
408
408
|
|
|
409
409
|
ages = np.array([age for age in ages if np.any(np.isnan(age)) == False])
|
|
410
|
+
|
|
411
|
+
if len(ages) == 0:
|
|
412
|
+
raise ValueError('No valid age samples available to compute population age (maybe all stars are out of domain ?)')
|
|
410
413
|
|
|
411
414
|
if ages.shape[1] == 1:
|
|
412
415
|
return np.median(ages)
|
|
@@ -415,7 +418,7 @@ class AgeModel:
|
|
|
415
418
|
loop = range(n_mc)
|
|
416
419
|
if self.use_tqdm:
|
|
417
420
|
loop = tqdm(loop)
|
|
418
|
-
|
|
421
|
+
epsilon = np.clip(1/ages.shape[0],0.001,0.1)
|
|
419
422
|
for i in loop:
|
|
420
423
|
random_star_indices = np.random.choice(list(range(ages.shape[0])), size=ages.shape[0], replace=True)
|
|
421
424
|
random_star_indices = random_star_indices.astype(int)
|
|
@@ -425,12 +428,15 @@ class AgeModel:
|
|
|
425
428
|
age = random_star_ages[j]
|
|
426
429
|
pdf, bins = np.histogram(age,bins=nbins,range=(min_age,max_age))
|
|
427
430
|
pdf = pdf.astype(float)
|
|
428
|
-
pdf +=
|
|
431
|
+
pdf += epsilon
|
|
429
432
|
global_pdf *= pdf
|
|
430
433
|
best_age = bins[np.argmax(global_pdf)] + (bins[1]-bins[0])/2
|
|
431
434
|
if best_age != bins[0]+(bins[1]-bins[0])/2:
|
|
432
435
|
pdfs.append(bins[np.argmax(global_pdf)] + (bins[1]-bins[0])/2)
|
|
433
436
|
|
|
437
|
+
if len(pdfs) == 0:
|
|
438
|
+
raise ValueError('No valid population age could be computed from the samples')
|
|
439
|
+
|
|
434
440
|
population_age = np.median(pdfs)
|
|
435
441
|
|
|
436
442
|
return population_age
|
|
@@ -633,7 +639,7 @@ class AgeModel:
|
|
|
633
639
|
#raise ValueError('Plotting individual isochrones is only available for the BaSTI model at the moment')
|
|
634
640
|
if type(plot_isochrone) is bool and plot_isochrone:
|
|
635
641
|
if self.ages is not None and self.ages.shape[1] > 1:
|
|
636
|
-
isochrone_ages = [self.population_age()]
|
|
642
|
+
isochrone_ages = [self.population_age(check_domain=check_domain)]
|
|
637
643
|
else:
|
|
638
644
|
isochrone_ages = [np.median(age)]
|
|
639
645
|
if type(plot_isochrone) is float or type(plot_isochrone) is int:
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|