From 30638574acffff3025e43d621607c1b4fa3aeb3d Mon Sep 17 00:00:00 2001 From: Volker Hoffmann Date: Fri, 21 Aug 2015 13:47:04 +0200 Subject: feat: return empty blacklist by default; we should really just ignore the first Myr of collisions --- Helpers/impact_helpers.py | 7 +++++-- 1 file 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] -- cgit v1.1