From 21c5ba3ae3de00a9cb4a27752330fcc398e3ab46 Mon Sep 17 00:00:00 2001
From: madsmpedersen <m@madsp.dk>
Date: Fri, 4 Dec 2015 07:35:01 +0100
Subject: [PATCH] extracted function res_file_lst
---
wetb/hawc2/htc_file.py | 23 +++++++++++++----------
1 file changed, 13 insertions(+), 10 deletions(-)
diff --git a/wetb/hawc2/htc_file.py b/wetb/hawc2/htc_file.py
index 3c0c1f92..d1c7d4cb 100644
--- a/wetb/hawc2/htc_file.py
+++ b/wetb/hawc2/htc_file.py
@@ -121,16 +121,7 @@ class HTCFile(HTCContents, HTCDefaults):
f = self.new_htc_structure.system_eigenanalysis[0]
files.append(f)
files.append(os.path.join(os.path.dirname(f), 'mode*.dat'))
- dataformat = self.output.get('data_format', 'hawc_ascii')
- res_filename = self.output.filename[0]
- if dataformat == "gtsdf" or dataformat == "gtsdf64":
- files.append(res_filename + ".hdf5")
- elif dataformat == "flex_int":
- files.append(res_filename + ".int")
- files.append(os.path.join(os.path.dirname(res_filename), 'sensor'))
- else:
- files.append(res_filename + ".sel")
- files.append(res_filename + ".dat")
+ files.extend(self.res_file_lst())
for key in [k for k in self.contents.keys() if k.startswith("output_at_time")]:
files.append(self[key]['filename'][0])
@@ -141,6 +132,18 @@ class HTCFile(HTCContents, HTCDefaults):
return [f for f in files if f]
+ def res_file_lst(self):
+ if 'output' not in self:
+ return []
+ dataformat = self.output.get('data_format', 'hawc_ascii')
+ res_filename = self.output.filename[0]
+ if dataformat == "gtsdf" or dataformat == "gtsdf64":
+ return [res_filename + ".hdf5"]
+ elif dataformat == "flex_int":
+ return [res_filename + ".int", os.path.join(os.path.dirname(res_filename), 'sensor')]
+ else:
+ return [res_filename + ".sel", res_filename + ".dat"]
+
if "__main__" == __name__:
--
GitLab