noe/pipeline
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

extension subfolders

Browse Source
This commit is contained in:
Noe Brucy
2021-07-24 20:53:21 +02:00
parent 35e5a767cb
commit 35cf8ff401
4 changed files with 37 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
snapshotprocessor.py
+10 -18
View File
@@ -312,24 +312,17 @@ class SnapshotProcessor(HDF5Container):
else:
tag_name = ""
self.filename = (
self.path_out + "/postproc_" + tag_name + format(num, "05") + ".h5"
)
self.cells_filename = (
self.path_out + "/cells_" + tag_name + format(num, "05") + ".h5"
)
self.parts_filename = (
self.path_out + "/parts_" + tag_name + format(num, "05") + ".h5"
)
self.pspec_filename = (
self.path_out + "/pspec_" + tag_name + format(num, "05") + ".h5"
)
if self.params.out.subfolder_ext:
subfolder = "/h5/"
else:
subfolder = ""
self.filename = f"{self.path_out}/{subfolder}postproc_{tag_name}{num:05}.h5"
self.cells_filename = f"{self.path_out}/{subfolder}cells_{tag_name}{num:05}.h5"
self.parts_filename = f"{self.path_out}/{subfolder}parts_{tag_name}{num:05}.h5"
self.pspec_filename = f"{self.path_out}/{subfolder}pspec_{tag_name}{num:05}.h5"
self.filaments_filename = (
self.path_out + "/filaments_" + tag_name + format(num, "05") + ".pickle"
f"{self.path_out}/{subfolder}filaments_{tag_name}{num:05}.h5"
)
if not os.path.exists(self.path_out):
@@ -507,7 +500,7 @@ class SnapshotProcessor(HDF5Container):
if len(data[key] > 0):
hdf5.create_array(
"/data", key, data[key], "", createparents=True
)
)
finally:
hdf5.close()
return data
@@ -1374,7 +1367,6 @@ class SnapshotProcessor(HDF5Container):
df = pd.read_csv(csv_name, header=None, names=header)
return {key: df[key].values for key in df}
def _pspec(self, **kwargs):
outfile = self.pspec_filename
pspec_new.pspec(repo=self.path, iouts=[self.num], outfile=outfile, **kwargs)