From 6cc8bc4a6e115ce10b51641e502489e699469fa5 Mon Sep 17 00:00:00 2001
From: Johannes Schumann <jschumann@km3net.de>
Date: Tue, 13 Oct 2020 11:45:17 +0200
Subject: [PATCH] Update input jobcard check in ctrl
---
km3buu/ctrl.py | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/km3buu/ctrl.py b/km3buu/ctrl.py
index 14dec21..f4bf85e 100644
--- a/km3buu/ctrl.py
+++ b/km3buu/ctrl.py
@@ -68,6 +68,8 @@ def run_jobcard(jobcard, outdir, fluxfile=None):
if isinstance(jobcard, str) and isfile(jobcard):
jobcard = read_jobcard(jobcard)
+ elif not isinstance(jobcard, Jobcard):
+ log.error("No valid jobcard reference given: %s" % jobcard)
if "neutrino_induced" in jobcard and "nuexp" in jobcard[
"neutrino_induced"] and jobcard["neutrino_induced"]["nuexp"] == 99:
@@ -77,11 +79,8 @@ def run_jobcard(jobcard, outdir, fluxfile=None):
os.system("cp %s %s" % (fluxfile, tmp_fluxfile))
log.info("Set FileNameFlux to: %s" % tmp_fluxfile)
jobcard["neutrino_induced"]["FileNameflux"] = tmp_fluxfile
- if isinstance(jobcard, Jobcard):
- with open(jobcard_fpath, "w") as f:
- f.write(str(jobcard))
- else:
- log.error("No valid jobcard reference given: %s" % jobcard)
+ with open(jobcard_fpath, "w") as f:
+ f.write(str(jobcard))
log.info("Create temporary file for associated runscript")
script_fpath = join(input_dir.name, "run.sh")
with open(script_fpath, "w") as f:
--
GitLab