From 7765ebe64dfa667ad8fb6c0c69e402e73e6ab9f9 Mon Sep 17 00:00:00 2001 From: Noe Brucy Date: Thu, 22 Jul 2021 14:25:17 +0200 Subject: [PATCH] [snap] improve sinks --- snapshotprocessor.py | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/snapshotprocessor.py b/snapshotprocessor.py index 38d6018..bfe269d 100644 --- a/snapshotprocessor.py +++ b/snapshotprocessor.py @@ -1350,15 +1350,6 @@ class SnapshotProcessor(HDF5Container): return alpha_g def _sinks(self): - csv_name = ( - self.path - + "/output_" - + str(self.num).zfill(5) - + "/sink_" - + str(self.num).zfill(5) - + ".csv" - ) - sinks = np.loadtxt(csv_name, delimiter=",") header = [ "Id", "M", @@ -1379,14 +1370,10 @@ class SnapshotProcessor(HDF5Container): "int_lum", "Teff", ] - if len(sinks) == 0: - sinks = np.zeros(len(header)) + csv_name = f"{self.path}/output_{self.num:05}/sink_{self.num:05}.csv" + df = pd.read_csv(csv_name, header=None, names=header) + return {key: df[key].values for key in df} - sinks_dict = {} - for key, a in zip(header, sinks): - sinks_dict[key] = a - - return sinks_dict def _pspec(self, **kwargs): outfile = self.pspec_filename