diff --git a/Snakefile b/Snakefile index 3e1882a..2ef3e1a 100644 --- a/Snakefile +++ b/Snakefile @@ -539,7 +539,7 @@ rule interpro_scan: "source {params.java} ; sh {params.pfam} -i {input.translation} -o {output} -f GFF3 -appl {params.db} -dra" # Secondary structure analysis -rule porter_analysis: +rule brewery_analysis: input: "Results/Genes_temp/{gene}/transcripts/{transcript}_protein.fa" output: @@ -589,7 +589,7 @@ def functional_files(): if (config["aa"]): files.append("Results/Genes_temp/{gene}/transcripts/{transcript}_protein.fa") if (config["iupred2a"]): files.append(rules.iupred2a_analysis.output.idr) if (config["pfam"]): files.append(rules.interpro_scan.output) - if (config["porter"]): files.append(rules.porter_analysis.output) + if (config["brewery"]): files.append(rules.brewery_analysis.output) if (config["pfScan"]): files.append(rules.functional_site_analysis.output) return files rule individual_transcript_analysis: @@ -618,7 +618,8 @@ def aggregate_transcript_analysis_func(wildcards): rule aggregate_transcript_analysis: input: func = aggregate_transcript_analysis_func, - stats = "Results/Genes_temp/{gene}/{gene}_transcripts_stats.txt" + stats = "Results/Genes_temp/{gene}/{gene}_transcripts_stats.txt", + gene_temp = directory("Results/Genes_temp") output: analysis = "Results/Genes/{gene}/{gene}_transcripts_filtered_analysis.txt", stats = "Results/Genes/{gene}/{gene}_transcripts_stats.txt" @@ -631,7 +632,7 @@ rule aggregate_transcript_analysis: priority: 5 threads: 1 shell: - "cat {input.func} > {output.analysis}; cat {input.stats} > {output.stats}" + "cat {input.func} > {output.analysis}; cat {input.stats} > {output.stats}; rm -rf {input.gene_temp};" rule protein_coding_potential_analysis: input: @@ -660,7 +661,7 @@ def aggregate_protein_coding_potential_analysis(wildcards): rule output_combine_files: input: aggregate = aggregate_protein_coding_potential_analysis, - gene_temp = directory("Results/Genes_temp"), + gene_temp = directory("Results/Genes_temp") output: plot = "Results/Output/" + config["output_plots"] resources: diff --git a/config.yaml b/config.yaml index ddf12c0..9a0bac6 100644 --- a/config.yaml +++ b/config.yaml @@ -114,7 +114,7 @@ iupred2a_path: "/path/to/iupred2a/iupred2a.py" iupred2a: TRUE brewery_path: "/path/to/Brewery/Brewery.py" -porter: TRUE +brewery: TRUE interproScan_path: "/path/to/my_interproscan/interproscan-5.38-76.0/interproscan.sh" pfam: TRUE @@ -124,9 +124,6 @@ pfScan_path: "/path/to/ps_scan/pfscan" prositeDat_path: "/path/to/prosite.dat" pfScan: TRUE -#plaac_path: "/path/to/plaac.jar" -#prion: FALSE - minIsoTPM: 1 maxIsoNum: 8 minIsoPct: 10 diff --git a/config_example_pdk2.yaml b/config_example_pdk2.yaml index 49a0d9f..935c93e 100644 --- a/config_example_pdk2.yaml +++ b/config_example_pdk2.yaml @@ -130,7 +130,7 @@ iupred2a_path: "/path/to/iupred2a/iupred2a.py" iupred2a: TRUE brewery_path: "/path/to/Brewery/Brewery.py" -porter: TRUE +brewery: TRUE interproScan_path: "/path/to/my_interproscan/interproscan-5.38-76.0/interproscan.sh" pfam: TRUE diff --git a/scripts/visualization.py b/scripts/visualization.py index 4f9d119..b36aa66 100644 --- a/scripts/visualization.py +++ b/scripts/visualization.py @@ -243,7 +243,7 @@ def plotSequenceAnalysis(transcripts_plot, colors, longest_length_protein, fig, bottom += 0.5 # Secondary structure prediction - if (snakemake.config["porter"]): + if (snakemake.config["brewery"]): ss3_df = pd.DataFrame(tcons_curr.ss3[1:], columns = tcons_curr.ss3[0]) ss = list(ss3_df["SS"]) for i in range(len(tcons_curr.aa)):