Merge pull request #18 from MilesCranmer/main

Fix bugs in latest Python
ArtificialStellarPopulations · Mar 28, 2024 · c69a908 · c69a908
2 parents cfaf229 + cc8e972
commit c69a908
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/artpop/stars/isochrones.py b/src/artpop/stars/isochrones.py
@@ -630,7 +630,7 @@ def __init__(self, log_age, feh, phot_system, mist_path=MIST_PATH,
             logger.debug('Using nearest log_age = {:.2f}'.format(self.log_age))
 
         # store phot_system as list to allow multiple photometric systems
-        if type(phot_system) == str:
+        if isinstance(phot_system, str):
             phot_system = [phot_system]
 
         # fetch first isochrone grid, interpolating on [Fe/H] if necessary

diff --git a/src/artpop/util.py b/src/artpop/util.py
@@ -51,7 +51,7 @@ def check_random_state(seed):
         return np.random.mtrand._rand
     if isinstance(seed, (numbers.Integral, np.integer)):
         return np.random.RandomState(seed)
-    if isinstance(seed, np.random.RandomState):
+    if isinstance(seed, np.random.RandomState) or isinstance(np.random.Generator):
         return seed
     if type(seed)==list:
         if type(seed[0])==int: