From 840d852d14d818f4cfe55d812c9c09a39a4d07c6 Mon Sep 17 00:00:00 2001
From: Johannes Schumann <johannes.schumann@fau.de>
Date: Wed, 27 May 2020 20:42:25 +0200
Subject: [PATCH] Updated tests
---
km3buu/tests/test_ctrl.py | 47 ++++++++++++++++++------------------
km3buu/tests/test_jobcard.py | 4 +--
2 files changed, 26 insertions(+), 25 deletions(-)
diff --git a/km3buu/tests/test_ctrl.py b/km3buu/tests/test_ctrl.py
index e84a5a5..04fb14d 100644
--- a/km3buu/tests/test_ctrl.py
+++ b/km3buu/tests/test_ctrl.py
@@ -30,6 +30,8 @@ class TestCTRLbyJobcardFile(unittest.TestCase):
self.filename = join(JOBCARD_FOLDER, "examples/example.job")
self.output_dir = TemporaryDirectory()
self.retval = run_jobcard(self.filename, self.output_dir.name)
+ log = get_logger("ctrl.py")
+ log.setLevel("INFO")
def test_output(self):
assert self.retval == 0
@@ -45,34 +47,33 @@ class TestCTRLbyJobcardObject(unittest.TestCase):
log.setLevel("INFO")
self.test_jobcard = Jobcard()
# NEUTRINO
- self.test_jobcard.set_property("neutrino_induced", "process_ID",
- PROCESS_LOOKUP["cc"])
- self.test_jobcard.set_property("neutrino_induced", "flavor_ID",
- FLAVOR_LOOKUP["electron"])
- self.test_jobcard.set_property("neutrino_induced", "nuXsectionMode",
- XSECTIONMODE_LOOKUP["dSigmaMC"])
- self.test_jobcard.set_property("neutrino_induced", "includeDIS", True)
- self.test_jobcard.set_property("neutrino_induced", "printAbsorptionXS",
- True)
- self.test_jobcard.set_property("nl_SigmaMC", "enu", 1)
+ self.test_jobcard["neutrino_induced"]["process_ID"] = PROCESS_LOOKUP[
+ "cc"]
+ self.test_jobcard["neutrino_induced"]["flavor_ID"] = FLAVOR_LOOKUP[
+ "electron"]
+ self.test_jobcard["neutrino_induced"][
+ "nuXsectionMode"] = XSECTIONMODE_LOOKUP["dSigmaMC"]
+ self.test_jobcard["neutrino_induced"]["includeDIS"] = True
+ self.test_jobcard["neutrino_induced"]["printAbsorptionXS"] = True
+ self.test_jobcard["nl_SigmaMC"]["enu"] = 1
# INPUT
- self.test_jobcard.set_property("input", "numTimeSteps", 0)
- self.test_jobcard.set_property("input", "eventtype", 5)
- self.test_jobcard.set_property("input", "numEnsembles", 1)
- self.test_jobcard.set_property("input", "delta_T", 0.2)
- self.test_jobcard.set_property("input", "localEnsemble", True)
- self.test_jobcard.set_property("input", "num_runs_SameEnergy", 1)
- self.test_jobcard.set_property("input", "LRF_equals_CALC_frame", True)
+ self.test_jobcard["input"]["numTimeSteps"] = 0
+ self.test_jobcard["input"]["eventtype"] = 5
+ self.test_jobcard["input"]["numEnsembles"] = 1
+ self.test_jobcard["input"]["delta_T"] = 0.2
+ self.test_jobcard["input"]["localEnsemble"] = True
+ self.test_jobcard["input"]["num_runs_SameEnergy"] = 1
+ self.test_jobcard["input"]["LRF_equals_CALC_frame"] = True
# TARGET
- self.test_jobcard.set_property("target", "target_Z", 1)
- self.test_jobcard.set_property("target", "target_A", 1)
+ self.test_jobcard["target"]["target_Z"] = 1
+ self.test_jobcard["target"]["target_A"] = 1
# MISC
- # self.test_jobcard.set_property("nl_neutrinoxsection", "DISmassless", True)
- self.test_jobcard.set_property("neutrinoAnalysis", "outputEvents",
- True)
- self.test_jobcard.set_property("pythia", "PARP(91)", 0.44)
+ # self.test_jobcard["nl_neutrinoxsection"]["DISmassless"] = True
+ self.test_jobcard["neutrinoAnalysis"]["outputEvents"] = True
+ self.test_jobcard["pythia"]["PARP(91)"] = 0.44
self.output_dir = TemporaryDirectory()
self.retval = run_jobcard(self.test_jobcard, self.output_dir.name)
+ # raise Exception(self.test_jobcard)
def test_output(self):
assert self.retval == 0
diff --git a/km3buu/tests/test_jobcard.py b/km3buu/tests/test_jobcard.py
index ab81b00..e5c0f33 100644
--- a/km3buu/tests/test_jobcard.py
+++ b/km3buu/tests/test_jobcard.py
@@ -19,7 +19,7 @@ class TestJobcard(unittest.TestCase):
def setUp(self):
self.test_jobcard = Jobcard()
# Insert some test elements
- self.test_jobcard.set_property("ABC", "def", 42)
+ self.test_jobcard["ABC"]["def"] = 42
def test_input_path(self):
expected_line = "path_to_input = '%s'" % INPUT_PATH
@@ -37,7 +37,7 @@ class TestJobcard(unittest.TestCase):
assert ctnt[group_start:group_end].find(expected_line) != -1
def test_remove_elements(self):
- self.test_jobcard.remove_property("ABC", "def")
+ del self.test_jobcard["ABC"]["def"]
ctnt = str(self.test_jobcard)
expected_line = "def = 42"
assert ctnt.find("&ABC") == -1
--
GitLab