Skip to content

Commit 4030163

Browse files
committed
Removed BSgenome.Hsapiens.UCSC.hg19 and BSgenome.Hsapiens.UCSC.hg38 as install dependency
Also removed hardcoded references to hg19 in PAM check
1 parent f738d53 commit 4030163

8 files changed

+21
-12
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@
44
*.so
55
*.dll
66
.Rproj.user
7+
*~

DESCRIPTION

+3-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@ LazyData: true
1111
LinkingTo: Rcpp, RcppEigen
1212
Imports: Rcpp (>= 0.12.11), RcppEigen (>= 0.3.3.3.0), magrittr, e1071, plyr, dplyr,
1313
ggplot2, stringr, readr, reshape2, tidyr, data.table,
14-
Biostrings, Rsamtools, GenomeInfoDb, BSgenome, BSgenome.Hsapiens.UCSC.hg19, GenomicRanges
14+
Biostrings, Rsamtools, GenomeInfoDb, BSgenome, GenomicRanges
1515
RoxygenNote: 6.0.1.9000
1616
Suggests: knitr,
17-
rmarkdown
17+
rmarkdown,
18+
BSgenome.Hsapiens.UCSC.hg19, BSgenome.Hsapiens.UCSC.hg38
1819
VignetteBuilder: knitr

NAMESPACE

-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ import(magrittr)
3434
import(readr)
3535
import(stringr)
3636
importFrom(BSgenome,getSeq)
37-
importFrom(BSgenome.Hsapiens.UCSC.hg19,BSgenome.Hsapiens.UCSC.hg19)
3837
importFrom(Biostrings,DNAStringSet)
3938
importFrom(Biostrings,writeXStringSet)
4039
importFrom(GenomeInfoDb,Seqinfo)

R/guide_alignments.R

+13-5
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,23 @@
1+
# fetch a the corresponding BSGenome object by the genome_id
2+
getBSgenome <- function(genome_id) {
3+
if(genome_id == "hg19") {
4+
return (BSgenome.Hsapiens.UCSC.hg19::BSgenome.Hsapiens.UCSC.hg19)
5+
} else if(genome_id == "hg38") {
6+
return (BSgenome.Hsapiens.UCSC.hg38::BSgenome.Hsapiens.UCSC.hg38)
7+
} else {
8+
stop(paste0(genome_id, " is not a known genome id"))
9+
}
10+
}
111

212
#' Get a PAM sequence
3-
#' @importFrom BSgenome.Hsapiens.UCSC.hg19 BSgenome.Hsapiens.UCSC.hg19
413
#' @importFrom BSgenome getSeq
514
#' @export
615
#'
7-
fetchPAM <- function(chr, pos, strand, guide_length=20) {
16+
fetchPAM <- function(chr, pos, strand, guide_length=20, genome_id="hg19") {
817
PAM_start <- ifelse(strand=="+", pos+guide_length, pos-3)
918
PAM_end <- ifelse(strand=="+", pos+guide_length+2, pos-1)
1019

11-
PAM <- getSeq(BSgenome.Hsapiens.UCSC.hg19,
20+
PAM <- getSeq(getBSgenome(genome_id),
1221
names=chr,
1322
start=PAM_start,
1423
end=PAM_end,
@@ -29,7 +38,6 @@ fetchPAM <- function(chr, pos, strand, guide_length=20) {
2938
#' @return data.frame or GRanges object of results
3039
#' @importFrom Rsamtools scanBam
3140
#' @importFrom GenomeInfoDb Seqinfo
32-
#' @importFrom BSgenome.Hsapiens.UCSC.hg19 BSgenome.Hsapiens.UCSC.hg19
3341
#' @importFrom BSgenome getSeq
3442
#' @export
3543
#'
@@ -70,7 +78,7 @@ guideAlignments <- function(bam.file, max.alns=100, pam="[ACGTN]GG|GG[ACGTN]",
7078
PAM.start = ifelse(strand=="+", pos+guide_length, pos-3),
7179
PAM.end = ifelse(strand=="+", pos+guide_length+2, pos-1))
7280

73-
bamdf.pam$PAM <- getSeq(BSgenome.Hsapiens.UCSC.hg19,
81+
bamdf.pam$PAM <- getSeq(getBSgenome(genome_id),
7482
names=bamdf.pam$rname,
7583
start=bamdf.pam$PAM.start,
7684
end=bamdf.pam$PAM.end,

man/fetchPAM.Rd

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/guideAlignments.Rd

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/map_guide_to_locus.Rd

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/run_ceres.Rd

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)