diff --git a/R/conos.R b/R/conos.R index c127318..d72dddc 100644 --- a/R/conos.R +++ b/R/conos.R @@ -69,7 +69,7 @@ scaledMatricesSeuratV3 <- function(so.objs, data.type, od.genes, var.scale, neig if (var.scale) { so.objs <- lapply(so.objs, function(so){ Seurat::ScaleData(so, features = rownames(so))}) } - slot <- switch( + layer <- switch( EXPR = data.type, 'scaled' = 'scale.data', 'counts' = 'data', @@ -78,7 +78,7 @@ scaledMatricesSeuratV3 <- function(so.objs, data.type, od.genes, var.scale, neig x.data <- lapply( X = so.objs, FUN = function(so) { - return(t(x = Seurat::GetAssayData(object = so, slot = slot))[, od.genes]) + return(t(x = Seurat::GetAssayData(object = so, layer = layer))[, od.genes]) } ) res <- mapply(FUN = function(so, x) { return(x) }, so.objs, x.data ) diff --git a/R/integrations.R b/R/integrations.R index b84b5bb..8759c58 100644 --- a/R/integrations.R +++ b/R/integrations.R @@ -64,7 +64,7 @@ seuratProcV2 <- function(count.matrix, vars.to.regress=NULL, verbose=TRUE, do.pa } #' @keywords internal -seuratProcV3 <- function(count.matrix, vars.to.regress=NULL, verbose=TRUE, n.pcs=100, cluster=TRUE, tsne=TRUE, umap=FALSE, ...) { +seuratProcV3 <- function(count.matrix, vars.to.regress=NULL, verbose=TRUE, n.pcs=100, cluster=TRUE, tsne=FALSE, umap=TRUE, ...) { if (!requireNamespace("Seurat", quietly = TRUE)) { stop("Package \"Seurat\" needed for this function to work. Please install it, as described here: .", call. = FALSE) }