From de39dd1e7eb021dee811bc81391343bbd27b6a70 Mon Sep 17 00:00:00 2001
From: "Mads M. Pedersen" <mmpe@dtu.dk>
Date: Wed, 12 Jul 2017 08:48:03 +0200
Subject: [PATCH] Improved error messages in high_level.py
---
wetb/dlc/high_level.py | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/wetb/dlc/high_level.py b/wetb/dlc/high_level.py
index 0edfa43..a7ad916 100644
--- a/wetb/dlc/high_level.py
+++ b/wetb/dlc/high_level.py
@@ -236,16 +236,20 @@ class DLCHighLevel(object):
pass
elif not hasattr(self, "res_folder") or self.res_folder == "":
files = glob.glob(os.path.join(self.res_path, "*"+ext)) + glob.glob(os.path.join(self.res_path, "*/*"+ext))
+ if len(files)==0:
+ raise Exception('No *%s files found in:\n%s or\n%s'%(ext, self.res_path, os.path.join(self.res_path, "*/")))
else:
files = []
-
for dlc_id in fatigue_dlcs:
dlc_id = str(dlc_id)
if "%" in self.res_folder:
folder = self.res_folder % dlc_id
else:
folder = self.res_folder
- files.extend(glob.glob(os.path.join(self.res_path , folder, "*"+ext)))
+ dlc_files = (glob.glob(os.path.join(self.res_path , folder, "*"+ext)))
+ if len(dlc_files)==0:
+ raise Exception('DLC%s included in fatigue analysis, but no *%s files found in:\n%s'%(dlc_id, ext, os.path.join(self.res_path , folder)))
+ files.extend(dlc_files)
keys = list(zip(*self.dist_value_keys))[1]
fmt = self.format_tag_value
tags = [[fmt(tag.replace(key, "")) for tag, key in zip(os.path.basename(f).split("_"), keys)] for f in files]
--
GitLab