Skip to content

Commit da8b6f3

Browse files
committed
Format fix
1 parent 146ab58 commit da8b6f3

3 files changed

Lines changed: 13 additions & 8 deletions

File tree

rc/control/daqinterface.py

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -725,7 +725,9 @@ def timing_trace_filename(self):
725725
)
726726

727727
def timing_trace(self, event, stage, elapsed_s=None, extra_fields=None):
728-
if not self.timing_trace_is_enabled() or getattr(self, "_timing_trace_failed", False):
728+
if not self.timing_trace_is_enabled() or getattr(
729+
self, "_timing_trace_failed", False
730+
):
729731
return
730732

731733
now = datetime.datetime.now().strftime("%Y-%m-%dT%H:%M:%S.%f")
@@ -3724,7 +3726,10 @@ def do_config(self, subconfigs_for_run=[]):
37243726
self.timing_trace_end(
37253727
"do_config_resolve_fhicl",
37263728
resolve_fhicl_start,
3727-
{"result": "update_fhicl_exception", "label": self.procinfos[i_proc].label},
3729+
{
3730+
"result": "update_fhicl_exception",
3731+
"label": self.procinfos[i_proc].label,
3732+
},
37283733
)
37293734
self.timing_trace_end(
37303735
"do_config_total", do_config_start, {"result": "failure"}
@@ -3946,9 +3951,7 @@ def do_config(self, subconfigs_for_run=[]):
39463951
)
39473952

39483953
self.print_log("i", "\n%s: CONFIG transition complete" % (date_and_time()))
3949-
self.timing_trace_end(
3950-
"do_config_total", do_config_start, {"result": "success"}
3951-
)
3954+
self.timing_trace_end("do_config_total", do_config_start, {"result": "success"})
39523955
return "done"
39533956

39543957
def do_start_running(self, run_number=None):

rc/control/manage_processes_direct.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,6 @@ def launch_procs_on_host(
158158
out, _ = proc.communicate()
159159
status = proc.returncode
160160

161-
162161
self.print_log("d", "out: %s " % out, executing_commands_debug_level)
163162
self.print_log("d", "status: %s " % status, executing_commands_debug_level)
164163

@@ -338,7 +337,11 @@ def launch_procs_base(self):
338337
)
339338
launch_commands_to_run_on_host[procinfo.host].append(
340339
"cat %s >> %s && rm %s"
341-
% (tmp_launch_attempt_file, self.launch_attempt_files[procinfo.host], tmp_launch_attempt_file)
340+
% (
341+
tmp_launch_attempt_file,
342+
self.launch_attempt_files[procinfo.host],
343+
tmp_launch_attempt_file,
344+
)
342345
)
343346
launch_commands_to_run_on_host[procinfo.host].append(
344347
"export ARTDAQ_LOG_ROOT=%s" % (self.log_directory)

rc/control/utilities.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,6 @@ def construct_checked_command(cmds):
439439

440440
checked_cmds.append(cmd)
441441

442-
443442
if not re.search(r"\s*&\s*$", cmd):
444443
check_cmd = (
445444
'if [[ "$?" != "0" ]]; then echo %s: Nonzero return value from the following command: "%s" >> /tmp/daqinterface_checked_command_failures_%s.log; exit 1; fi '

0 commit comments

Comments
 (0)