diff --git a/annotation.smk b/annotation.smk index 016375d3348080e70aa77b1c5782d770349c0cdb..d781d613c8b832ac26f579708948c42320d22b3f 100644 --- a/annotation.smk +++ b/annotation.smk @@ -41,7 +41,7 @@ rule prodigal: def faa_input(wildcards): if wildcards.sample == "catalogue": - return ["work/cdhit/catalogue.faa"] + return {"faa": "work/cdhit/catalogue.faa"} else : if config["PROTEINS-PREDICTOR"] == "FragGeneScan": return {"faa": "work/FGS/{wildcards.sample}/{wildcards.sample}_FGS.faa".format(wildcards=wildcards)} diff --git a/catalogue.smk b/catalogue.smk index 55eae87e01cf8863d87e822a4f10552a1707f0cc..a0db98cdc6b88a17e463b54acb273208c535baa0 100644 --- a/catalogue.smk +++ b/catalogue.smk @@ -83,10 +83,10 @@ rule cd_hit_2D: rule faa_catalogue: input: - ffn = "work/cdhit/catalogue.ffn" - faa = expand("work/prodigal/{sample}/{sample}.faa", sample=config["SAMPLES"]) + ffn = "work/cdhit/catalogue.ffn", + faa = expand("work/prodigal/{sample}/{sample}_prodigal.faa", sample=config["SAMPLES"]) output: - list = temp("work/cdhit/catalogue.list") + list = temp("work/cdhit/catalogue.list"), faa = "work/cdhit/catalogue.faa" threads: 2