@@ -225,22 +225,19 @@ rule time_signal_plot:
225225 "../scripts/report/time_signal_plot.R"
226226
227227
228- rule evo_plots :
228+ rule dnds_plots :
229229 conda : "../envs/renv.yaml"
230230 params :
231231 design = config ["PLOTS" ]
232232 input :
233- n_s_sites = OUTDIR / f"{ OUTPUT_NAME } .ancestor.N_S.sites.csv" ,
234- vcf = OUTDIR / f"{ OUTPUT_NAME } .variants.tsv" ,
235- metadata = config ["METADATA" ]
233+ table = REPORT_DIR_TABLES / "dnds.csv" ,
236234 output :
237- plot = report (REPORT_DIR_PLOTS / "figure_11.png" ),
238- plot_omega = report (REPORT_DIR_PLOTS / "figure_12.png" ),
239- table = report (REPORT_DIR_TABLES / "figure_11.csv" )
235+ plot_dn_ds = report (REPORT_DIR_PLOTS / "dn_and_ds.png" ),
236+ plot_omega = report (REPORT_DIR_PLOTS / "dnds.png" ),
240237 log :
241238 LOGDIR / "evo_plots" / "log.txt"
242239 script :
243- "../scripts/report/evo_plots .R"
240+ "../scripts/report/dnds_plots .R"
244241
245242
246243rule snp_plots :
@@ -292,8 +289,8 @@ rule report:
292289 tree = report (REPORT_DIR_PLOTS / "allele_freq_tree.png" ),
293290 temest = report (REPORT_DIR_PLOTS / "time_signal.png" ),
294291 heat_table = report (REPORT_DIR_TABLES / "heatmap.csv" ),
295- evo = report (REPORT_DIR_PLOTS / "figure_11 .png" ),
296- omega_plot = report (REPORT_DIR_PLOTS / "figure_12 .png" ),
292+ evo = report (REPORT_DIR_PLOTS / "dn_and_ds .png" ),
293+ omega_plot = report (REPORT_DIR_PLOTS / "dnds .png" ),
297294 freyja_ts = OUTDIR / "demixing" / "freyja_data" / "last_barcode_update.txt" ,
298295 value = REPORT_DIR_TABLES / "diversity.json" ,
299296 stats_lm = REPORT_DIR_TABLES / "time_signal.json" ,
0 commit comments