diff --git a/workflow/rules/analysis.smk b/workflow/rules/analysis.smk index 6cc71af50d5bfac2d36630df9ccbef43188cd1b0..be8ddb17447aabeae3b3c8423f0f6223b26e495b 100644 --- a/workflow/rules/analysis.smk +++ b/workflow/rules/analysis.smk @@ -48,7 +48,7 @@ rule analysis_bbmap_rename: input: os.path.join(RESULTS_DIR, "annotation/prodigal/{rtype}/{tool}/proteins.faa") output: - temp(os.path.join(RESULTS_DIR, "annalysis/cdhit/{rtype}_{tool}.faa")) + temp(os.path.join(RESULTS_DIR, "analysis/cdhit/{rtype}_{tool}.faa")) log: out="logs/analysis_bbmap_rename_{rtype}.{tool}.out.log", err="logs/analysis_bbmap_rename_{rtype}.{tool}.err.log" @@ -69,11 +69,11 @@ rule analysis_bbmap_rename: rule analysis_cdhit: input: - faa1=os.path.join(RESULTS_DIR, "annalysis/cdhit/{rtype1}_{tool1}.faa"), - faa2=os.path.join(RESULTS_DIR, "annalysis/cdhit/{rtype2}_{tool2}.faa") + faa1=os.path.join(RESULTS_DIR, "analysis/cdhit/{rtype1}_{tool1}.faa"), + faa2=os.path.join(RESULTS_DIR, "analysis/cdhit/{rtype2}_{tool2}.faa") output: - faa12=os.path.join(RESULTS_DIR, "annalysis/cdhit/{rtype1}_{tool1}__{rtype2}_{tool2}.faa"), - faa21=os.path.join(RESULTS_DIR, "annalysis/cdhit/{rtype2}_{tool2}__{rtype1}_{tool1}.faa") + faa12=os.path.join(RESULTS_DIR, "analysis/cdhit/{rtype1}_{tool1}__{rtype2}_{tool2}.faa"), + faa21=os.path.join(RESULTS_DIR, "analysis/cdhit/{rtype2}_{tool2}__{rtype1}_{tool1}.faa") log: out="logs/analysis_cdhit.{rtype1}.{tool1}.{rtype2}.{tool2}.out.log", err="logs/analysis_cdhit.{rtype1}.{tool1}.{rtype2}.{tool2}.err.log" diff --git a/workflow/steps/analysis.smk b/workflow/steps/analysis.smk index fdf8a628f351918a7493d9ab3a88bcfe0f8a30b4..4ce912ca4df7edb5a62cb19f6176f2592676976f 100644 --- a/workflow/steps/analysis.smk +++ b/workflow/steps/analysis.smk @@ -29,11 +29,11 @@ rule ANALYSIS_PROTEINS: rtype_tool=["%s/%s" % (rtype, tool) for rtype, tool in READ_ASSEMBLERS] ), expand( - os.path.join(RESULTS_DIR, "annalysis/cdhit/{combi}.faa"), + os.path.join(RESULTS_DIR, "analysis/cdhit/{combi}.faa"), combi=["%s_%s__%s_%s" % (p[0][0], p[0][1], p[1][0], p[1][1]) for p in READ_ASSEMBLER_PAIRS] ), expand( - os.path.join(RESULTS_DIR, "annalysis/cdhit/{combi}.faa"), + os.path.join(RESULTS_DIR, "analysis/cdhit/{combi}.faa"), combi=["%s_%s__%s_%s" % (p[1][0], p[1][1], p[0][0], p[0][1]) for p in READ_ASSEMBLER_PAIRS] ) output: