Skip to content

Commit 3c10ff5

Browse files
authored
Merge pull request #167 from umccr/pcgr_nontier
Handle edge case when no tiered PCGR variants
2 parents 0a5abfb + a3278fa commit 3c10ff5

File tree

2 files changed

+18
-13
lines changed

2 files changed

+18
-13
lines changed

inst/rmd/rnasum.Rmd

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -268,11 +268,18 @@ rm(g1, r1)
268268
# PCGR annotation of mutated genes in given patient based on PCGR report, including only those with variants classified according to user-defined tier
269269
# Also include splice region variants if specified
270270
if (runPcgrChunk) {
271-
ref_genes.list[["summary"]]$Mutated <- RNAsum::genes_pcgr_summary(
272-
pcgr_tbl = sample_data.list[["wgs"]][["pcgr_tiers_tsv"]],
273-
tiers = 1:params$pcgr_tier,
274-
splice_vars = params$pcgr_splice_vars
275-
)
271+
# check if there are any tiered variants in pcgr
272+
tmp <- sample_data.list[["wgs"]][["pcgr_tiers_tsv"]] |>
273+
dplyr::filter(.data$TIER %in% 1:params$pcgr_tier)
274+
if (nrow(tmp) > 0) {
275+
ref_genes.list[["summary"]]$Mutated <- RNAsum::genes_pcgr_summary(
276+
pcgr_tbl = sample_data.list[["wgs"]][["pcgr_tiers_tsv"]],
277+
tiers = 1:params$pcgr_tier,
278+
splice_vars = params$pcgr_splice_vars
279+
)
280+
} else {
281+
runPcgrChunk <- FALSE
282+
}
276283
}
277284
278285
# ARRIBA annotation of gene fusion events detected in given patient

inst/scripts/icav1_download_and_run.R

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ athena_lims <- function(libid) {
2121
# download gds files to a local structure reflecting the gds path starting from
2222
# the outdir as the fs root.
2323
rnasum_download <- function(gdsdir, outdir, token, page_size = 200, regexes) {
24-
dracarys::gds_files_list(gdsdir = gdsdir, token = token, page_size = page_size) |>
24+
dracarys::gds_list_files_dir(gdsdir = gdsdir, token = token, page_size = page_size) |>
2525
dplyr::mutate(type = purrr::map_chr(.data$bname, \(x) dracarys::match_regex(x, regexes))) |>
2626
dplyr::select("file_id", "type", "size", "path", "bname") |>
2727
dplyr::filter(!is.na(.data$type)) |>
@@ -37,12 +37,12 @@ rnasum_download <- function(gdsdir, outdir, token, page_size = 200, regexes) {
3737
}
3838

3939
# SBJ IDs of interest
40-
sbj <- "SBJ04426"
41-
lib <- "L2301428"
42-
date1 <- "2024-08-20"
40+
sbj <- "SBJ05637"
41+
lib <- "L2401376"
42+
date1 <- "2024-09-16"
4343
lims_raw <- athena_lims(lib)
4444
pmeta_raw <- athena_rnasum(sbj) |>
45-
rportal::meta_rnasum()
45+
rportal::meta_rnasum(status = "Failed")
4646
lims <- lims_raw |>
4747
dplyr::select(library_id, sample_id, subject_id)
4848

@@ -56,9 +56,7 @@ pmeta <- pmeta_raw |>
5656
end_status,
5757
wfr_id, start, end, gds_outfile_rnasum_html,
5858
) |>
59-
dplyr::arrange(desc(SubjectID), start) |>
60-
dplyr::filter(rnasum_dataset == "BRCA") |>
61-
dplyr::slice_head(n = 1)
59+
dplyr::arrange(desc(SubjectID), start)
6260

6361
# patterns of files to fish out
6462
rnasum_file_regex <- tibble::tribble(

0 commit comments

Comments
 (0)