Skip to content
Snippets Groups Projects
Commit e62f4516 authored by Amandine  PERRIN's avatar Amandine PERRIN
Browse files

Write tree commands to details log

parent af81011b
No related branches found
No related tags found
No related merge requests found
...@@ -113,7 +113,7 @@ def run_fasttree(alignfile, boot, outdir, model, quiet): ...@@ -113,7 +113,7 @@ def run_fasttree(alignfile, boot, outdir, model, quiet):
logfile = os.path.join(outdir, align_name + ".fasttree.log") logfile = os.path.join(outdir, align_name + ".fasttree.log")
treefile = os.path.join(outdir, align_name + ".fasttree_tree.nwk") treefile = os.path.join(outdir, align_name + ".fasttree_tree.nwk")
cmd = f"FastTreeMP -nt {model} -noml -nocat {bootinfo} -log {logfile} {alignfile}" cmd = f"FastTreeMP -nt {model} -noml -nocat {bootinfo} -log {logfile} {alignfile}"
logger.info("Fasttree command: " + cmd) logger.details("Fasttree command: " + cmd)
if quiet: if quiet:
fnull = open(os.devnull, 'w') fnull = open(os.devnull, 'w')
else: else:
...@@ -121,5 +121,4 @@ def run_fasttree(alignfile, boot, outdir, model, quiet): ...@@ -121,5 +121,4 @@ def run_fasttree(alignfile, boot, outdir, model, quiet):
stdout = open(treefile, "w") stdout = open(treefile, "w")
error = ("Problem while running Fasttree. See log file ({}) for " error = ("Problem while running Fasttree. See log file ({}) for "
"more information.").format(logfile) "more information.").format(logfile)
logger.details(cmd)
utils.run_cmd(cmd, error, stdout=stdout, eof=True, logger=logger, stderr=fnull) utils.run_cmd(cmd, error, stdout=stdout, eof=True, logger=logger, stderr=fnull)
...@@ -126,12 +126,11 @@ def run_tree(alignfile, boot, outdir, quiet, threads, **kwargs): ...@@ -126,12 +126,11 @@ def run_tree(alignfile, boot, outdir, quiet, threads, **kwargs):
prefix = f"--prefix {treefile}" prefix = f"--prefix {treefile}"
cmd = (f"{soft} -s {alignfile} {threadinfo} -m {model} {mem_info} {bootinfo} {wb_info} " cmd = (f"{soft} -s {alignfile} {threadinfo} -m {model} {mem_info} {bootinfo} {wb_info} "
f"{seqtype} {prefix} -quiet {fast}") f"{seqtype} {prefix} -quiet {fast}")
logger.info("IQtree command: " + cmd) logger.details("IQtree command: " + cmd)
if quiet: if quiet:
fnull = open(os.devnull, 'w') fnull = open(os.devnull, 'w')
else: else:
fnull = None fnull = None
error = (f"Problem while running IQtree. See log file ({logfile}) for " error = (f"Problem while running IQtree. See log file ({logfile}) for "
"more information.") "more information.")
logger.details(cmd)
utils.run_cmd(cmd, error, eof=True, logger=logger, stderr=fnull) utils.run_cmd(cmd, error, eof=True, logger=logger, stderr=fnull)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment