Commit 02379c3b authored by Gregory Ashton's avatar Gregory Ashton
Browse files

Ensure the single postprocessing doesn't have conflicting log files

parent 48740876
......@@ -917,7 +917,7 @@ class PostProcessSingleResultsNode(Node):
super().__init__(inputs)
self.dag = dag
self.request_cpus = 1
self.job_name = "{}_postprocess_single".format(self.inputs.label)
self.job_name = "{}_postprocess_single".format(merged_node.label)
self.setup_arguments(
add_ini=False, add_unknown_args=False, add_command_line_args=False
......
......@@ -19,7 +19,7 @@ from .utils import DataDump, get_command_line_arguments, logger, parse_args
# fmt: off
import matplotlib # isort:skip
matplotlib.use("agg") # noqa
import matplotlib.pyplot as plt # isort:skip
import matplotlib.pyplot as plt # noqa isort:skip
# fmt: on
......
......@@ -27,7 +27,7 @@ import matplotlib # isort:skip noqa
matplotlib.use("agg") # noqa
import matplotlib.pyplot as plt # isort:skip noqa
import matplotlib.pyplot as plt # noqa isort:skip
# fmt: on
......
......@@ -31,8 +31,8 @@ class TestCustomDir(unittest.TestCase):
"trigger-time=0",
]
lines = starting_lines + extra_lines
for l in lines:
f.write(l + "\n")
for ll in lines:
f.write(ll + "\n")
f.close()
def test_default_dir_structure(self):
......
......@@ -64,10 +64,7 @@ class TestTimeslide(unittest.TestCase):
self.assertEqual(len(inputs.detectors), n_det, "num detectors not matching")
# check if parsed contents of file matches what we expect
correct_list = {
"H1": np.zeros(n_rows),
"L1": np.ones(n_rows),
}
correct_list = {"H1": np.zeros(n_rows), "L1": np.ones(n_rows)}
for det in inputs.timeslides.keys():
self.assertEqual(len(inputs.timeslides[det]), n_rows, "#rows not matching")
for idx, i in enumerate(inputs.timeslides[det]):
......@@ -105,7 +102,7 @@ class TestTimeslide(unittest.TestCase):
expected_dict = dict(H1=timeslides[idx][0], L1=timeslides[idx][1])
self.assertDictEqual(timeslide_dict, expected_dict)
logs = [l.args[0] for l in mock_logger.info.call_args_list]
logs = [ll.args[0] for ll in mock_logger.info.call_args_list]
t_log = "Applying timeshift of {tval}. Time range {t0} - {t1} => {nt0} - {nt1}"
for ifo_num, ifo in enumerate(inputs.interferometers):
......@@ -129,8 +126,8 @@ class TestTimeslide(unittest.TestCase):
"accounting = accounting.group" "submit=True",
]
lines = starting_lines + extra_lines
for l in lines:
f.write(l + "\n")
for ll in lines:
f.write(ll + "\n")
f.close()
def generate_gps_and_timeslide_files(
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment