Skip to content

Commit 2920208

Browse files
committed
fix: chrom_data_for_ranges to properly replicate dataOrigin
1 parent 93a5438 commit 2920208

1 file changed

Lines changed: 10 additions & 7 deletions

File tree

R/MsExperiment-functions.R

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -613,19 +613,22 @@
613613
#' an empty `data.frame` is returned.
614614
#'
615615
#' @noRd
616-
.chrom_data_for_ranges <- function(rt, mz, dataOrigin, msLevel = 1L,
616+
.chrom_data_for_ranges <- function(rt = matrix(nrow = 0, ncol = 2),
617+
mz = matrix(nrow = 0, ncol = 2),
618+
dataOrigin = character(), msLevel = 1L,
617619
isolationWindowTargetMz = NULL) {
618-
if (!nrow(rt))
619-
return(data.frame())
620+
m <- nrow(rt)
620621
n <- length(dataOrigin)
621-
if (length(msLevel) != n)
622-
rep(msLevel[1L], n)
622+
if (!m)
623+
return(data.frame())
624+
if (length(msLevel) != m)
625+
rep(msLevel[1L], m)
623626
res <- data.frame(rtMin = rep(rt[, 1L], each = n),
624627
rtMax = rep(rt[, 2L], each = n),
625628
mzMin = rep(mz[, 1L], each = n),
626629
mzMax = rep(mz[, 2L], each = n),
627-
dataOrigin = dataOrigin,
628-
msLevel = msLevel)
630+
dataOrigin = rep(dataOrigin, m),
631+
msLevel = rep(msLevel, each = n))
629632
if (length(isolationWindowTargetMz))
630633
res$isolationWindowTargetMz <- rep(isolationWindowTargetMz, each = n)
631634
res

0 commit comments

Comments
 (0)