diff --git a/Snake.config.json b/Snake.config.json index 74ac5cf5de10aa99be95e1a2c4ba20f8b6d355fa..ae87ff7f48230f6018267e77e59950f47006ead2 100644 --- a/Snake.config.json +++ b/Snake.config.json @@ -5,7 +5,7 @@ "mosaicatcher" : "/g/korbel/meiers/tools/mosaicatcher/mosaicatcher_experimental/build/mosaicatcher", "plot_script" : "/g/korbel/meiers/tools/mosaicatcher/mosaicatcher_experimental/R/qc.R", "plot_segments" : "/g/korbel/meiers/tools/mosaicatcher/mosaicatcher/R/plot_segments.R", - "sv_plot_script": "/g/korbel/meiers/tools/mosaicatcher/mosaicatcher/R/svs.R", + "sv_plot_script": "/g/korbel/meiers/tools/mosaicatcher/mosaicatcher_experimental/R/chrom.R", "norm_script" : "/g/korbel/meiers/tools/mosaicatcher/mosaicatcher_experimental/R/norm.R", "samtools" : "samtools", "bcftools" : "bcftools", diff --git a/Snakefile b/Snakefile index b79e7e10b66c4c614f560e041d210d54041faee7..de8fde65846949b55e10684edbdf8e104f24fef1 100644 --- a/Snakefile +++ b/Snakefile @@ -179,9 +179,11 @@ rule plot_SV_calls: segments = "segmentation2/{sample}/{windows}.{bpdens}.txt" output: "sv_calls/{sample}/{windows}.{bpdens}/{method}.{chrom}.pdf" + params: + sv_plot_script = config["sv_plot_script"] shell: """ - Rscript utils/chrom.R segments={input.segments} strand={input.strand} calls={input.calls} {input.counts} {wildcards.chrom} {output} + Rscript {params.sv_plot_script} segments={input.segments} strand={input.strand} calls={input.calls} {input.counts} {wildcards.chrom} {output} """ rule plot_SV_calls_simulated: @@ -193,9 +195,11 @@ rule plot_SV_calls_simulated: truth = "simulation/variants/genome{seed}-{window}.txt" output: "sv_calls/simulation{seed}-{window}/{window}_fixed.{bpdens}/{method}.{chrom}.pdf" + params: + sv_plot_script = config["sv_plot_script"] shell: """ - Rscript utils/chrom.R segments={input.segments} strand={input.strand} truth={input.truth} calls={input.calls} {input.counts} {wildcards.chrom} {output} + Rscript {params.sv_plot_script} segments={input.segments} strand={input.strand} truth={input.truth} calls={input.calls} {input.counts} {wildcards.chrom} {output} """ @@ -248,6 +252,7 @@ rule mosaic_count_fixed: """ {params.mc_command} count \ --verbose \ + --do-not-blacklist-hmm \ -o {output.counts} \ -i {output.info} \ -x {input.excl} \