aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVolker Hoffmann <volker@cheleb.net>2015-08-21 13:47:04 +0200
committerVolker Hoffmann <volker@cheleb.net>2015-08-21 13:47:04 +0200
commit30638574acffff3025e43d621607c1b4fa3aeb3d (patch)
tree842c72f9b4622b8146dadd93e41edfb637ebe3ad
parent70137eb4c78662d8c51042348fe3e7acf2b046c5 (diff)
feat: return empty blacklist by default; we should really just ignore the first Myr of collisions
-rw-r--r--Helpers/impact_helpers.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/Helpers/impact_helpers.py b/Helpers/impact_helpers.py
index cc90715..3f7b6be 100644
--- a/Helpers/impact_helpers.py
+++ b/Helpers/impact_helpers.py
@@ -201,7 +201,7 @@ def scale_production_function(crc_all, Dmin=1.0, Dmax=300.0):
return nscale, mscale
-def load(run):
+def load(run, return_blacklist=False):
"""
Load a given simulation. Beware of hardcoded paths.
@@ -301,7 +301,10 @@ def load(run):
# dfe["time"] -= tblowup
# Blacklist
- blacklist = np.load("%s/Blacklist_1Rhill.npz" % blckdir)["blacklist"]
+ if return_blacklist:
+ blacklist = np.load("%s/Blacklist_1Rhill.npz" % blckdir)["blacklist"]
+ else:
+ blacklist = np.atleast_1d([])
# Time Filter
# dfc = dfc[dfc.time>1.0e7]