diff --git a/snapshotprocessor.py b/snapshotprocessor.py index e1cf944..af0103a 100644 --- a/snapshotprocessor.py +++ b/snapshotprocessor.py @@ -1354,28 +1354,38 @@ class SnapshotProcessor(HDF5Container): return alpha_g def _sinks(self): - header = [ - "Id", - "M", - "dmf", - "x", - "y", - "z", - "vx", - "vy", - "vz", - "rot_period", - "lx", - "ly", - "lz", - "acc_rate", - "acc_lum", - "age", - "int_lum", - "Teff", - ] + csv_name = f"{self.path}/output_{self.num:05}/sink_{self.num:05}.csv" - df = pd.read_csv(csv_name, header=None, names=header) + + f = open(csv_name) + first_line = f.readline() + f.close() + + if first_line[1] == "#": + header = first_line[3:-1].split(",") + df = pd.read_csv(csv_name, header=None, names=header, skiprows=2) + else: + header = [ + "id", + "msink", + "dmfsink", + "x", + "y", + "z", + "vx", + "vy", + "vz", + "rot_period", + "lx", + "ly", + "lz", + "acc_rate", + "acc_lum", + "age", + "int_lum", + "Teff", + ] + df = pd.read_csv(csv_name, header=None, names=header) return {key: df[key].values for key in df} def _pspec(self, **kwargs):