diff --git a/snakecnv/svsnakemake_utils.py b/snakecnv/svsnakemake_utils.py index d44a7f6e8fa22e87c8f8040e90cf1f9689be6ffb..f4b96de9624dd1ca6ee92d68e6ca3113ce516ee8 100644 --- a/snakecnv/svsnakemake_utils.py +++ b/snakecnv/svsnakemake_utils.py @@ -71,7 +71,7 @@ class SnakemakeUtils: def get_pindel_chr_batches(self, wildcards): inputs = [] for batch in self.chr_batches[wildcards.chrom]: - inputs.append("{batch}/pindel/{chrom}/{chrbatch}/pindel_{chrom}_{svtype}.gz".format( + inputs.append("{batch}/pindel/{chrom}_{svtype}/{chrbatch}/pindel_{chrom}_{svtype}.gz".format( batch=wildcards.batch, chrom=wildcards.chrom, chrbatch="-".join(map(str, batch)), svtype=wildcards.svtype )) diff --git a/snakecnv/tools/pindel.snk b/snakecnv/tools/pindel.snk index b15594e9170f509b6ed92ea81cbf04583598ad61..4e1e6d7c4d728663caac5cc92ad93948a74cd291 100644 --- a/snakecnv/tools/pindel.snk +++ b/snakecnv/tools/pindel.snk @@ -30,9 +30,9 @@ rule pindel: genome = REFERENCE, fai = REFERENCE + ".fai" output: - "{batch}/pindel/{chrom}/{chrbatch}/pindel_{chrom}_D.gz", - "{batch}/pindel/{chrom}/{chrbatch}/pindel_{chrom}_INV.gz", - "{batch}/pindel/{chrom}/{chrbatch}/pindel_{chrom}_TD.gz", + "{batch}/pindel/{chrom}_{svtype}/{chrbatch}/pindel_{chrom}_D.gz", + "{batch}/pindel/{chrom}_{svtype}/{chrbatch}/pindel_{chrom}_INV.gz", + "{batch}/pindel/{chrom}_{svtype}/{chrbatch}/pindel_{chrom}_TD.gz", threads: get_threads("pindel", 4) log: @@ -50,7 +50,7 @@ rule pindel: """ for svtype in D TD INV RP SI LI BP CloseEndMapped INT_final; do - gzip -f {wildcards.batch}/pindel/{wildcards.chrom}/{wildcards.chrbatch}/pindel_{wildcards.chrom}_${{svtype}} + gzip -f {wildcards.batch}/pindel/{wildcards.chrom}_{wildcards.svtype}/{wildcards.chrbatch}/pindel_{wildcards.chrom}_${{svtype}} done """ @@ -66,4 +66,4 @@ rule mergepindelbatches: 1 shell: "mergepindelbatches.py {output} {input} 1>{log.stdout} 2>{log.stderr}; " - "rm -rf {wildcards.batch}/pindel/{wildcards.chrom}" \ No newline at end of file + "rm -rf {wildcards.batch}/pindel/{wildcards.chrom}_{wildcards.svtype}" \ No newline at end of file