From 3cbb790fbbcdb52f6962091e9cd49fe402d44c89 Mon Sep 17 00:00:00 2001
From: "Mads M. Pedersen" <mmpe@dtu.dk>
Date: Thu, 24 Nov 2016 10:29:25 +0100
Subject: [PATCH] reset related bugfix in htc_file.py
---
wetb/hawc2/htc_file.py | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/wetb/hawc2/htc_file.py b/wetb/hawc2/htc_file.py
index 26a04a3c..6bc3b7ed 100644
--- a/wetb/hawc2/htc_file.py
+++ b/wetb/hawc2/htc_file.py
@@ -40,10 +40,14 @@ class HTCFile(HTCContents, HTCDefaults):
initial_comments = None
_contents = None
def __init__(self, filename=None, modelpath="../"):
- self.modelpath = modelpath
+ if filename is not None:
+ self.modelpath = os.path.realpath(os.path.join(os.path.dirname(filename), modelpath))
+ self.filename = filename
+ else:
+ self.modelpath = modelpath
- self.filename = filename
+
#assert 'simulation' in self.contents, "%s could not be loaded. 'simulation' section missing" % filename
@@ -53,10 +57,8 @@ class HTCFile(HTCContents, HTCDefaults):
self.htc_inputfiles = []
self.contents = OrderedDict()
if self.filename is None:
- self.filename = 'empty.htc'
lines = self.empty_htc.split("\n")
else:
- self.modelpath = os.path.realpath(os.path.join(os.path.dirname(self.filename), self.modelpath))
lines = self.readlines(self.filename)
lines = [l.strip() for l in lines]
--
GitLab