diff --git a/singlecell/resources/chunks/AppendMetadata.R b/singlecell/resources/chunks/AppendMetadata.R index a79f3f2c6..addefee43 100644 --- a/singlecell/resources/chunks/AppendMetadata.R +++ b/singlecell/resources/chunks/AppendMetadata.R @@ -1,6 +1,6 @@ -netRc <- paste0(Sys.getEnv('USER_HOME'), '/.netrc') +netRc <- paste0(Sys.getenv('USER_HOME'), '/.netrc') if (!file.exists(netRc)) { - print(list.files(Sys.getEnv('USER_HOME'))) + print(list.files(Sys.getenv('USER_HOME'))) stop(paste0('Unable to find file: ', netRc)) } diff --git a/singlecell/resources/chunks/AppendNimble.R b/singlecell/resources/chunks/AppendNimble.R index df76eaf49..7a913d757 100644 --- a/singlecell/resources/chunks/AppendNimble.R +++ b/singlecell/resources/chunks/AppendNimble.R @@ -1,6 +1,6 @@ -netRc <- paste0(Sys.getEnv('USER_HOME'), '/.netrc') +netRc <- paste0(Sys.getenv('USER_HOME'), '/.netrc') if (!file.exists(netRc)) { - print(list.files(Sys.getEnv('USER_HOME'))) + print(list.files(Sys.getenv('USER_HOME'))) stop(paste0('Unable to find file: ', netRc)) } diff --git a/singlecell/resources/chunks/AppendTcr.R b/singlecell/resources/chunks/AppendTcr.R index e8ae8572e..bc6898617 100644 --- a/singlecell/resources/chunks/AppendTcr.R +++ b/singlecell/resources/chunks/AppendTcr.R @@ -1,6 +1,6 @@ -netRc <- paste0(Sys.getEnv('USER_HOME'), '/.netrc') +netRc <- paste0(Sys.getenv('USER_HOME'), '/.netrc') if (!file.exists(netRc)) { - print(list.files(Sys.getEnv('USER_HOME'))) + print(list.files(Sys.getenv('USER_HOME'))) stop(paste0('Unable to find file: ', netRc)) } diff --git a/singlecell/resources/chunks/AvgExpression.R b/singlecell/resources/chunks/AvgExpression.R index aacfe01ed..5218624f6 100644 --- a/singlecell/resources/chunks/AvgExpression.R +++ b/singlecell/resources/chunks/AvgExpression.R @@ -1,6 +1,6 @@ -netRc <- paste0(Sys.getEnv('USER_HOME'), '/.netrc') +netRc <- paste0(Sys.getenv('USER_HOME'), '/.netrc') if (!file.exists(netRc)) { - print(list.files(Sys.getEnv('USER_HOME'))) + print(list.files(Sys.getenv('USER_HOME'))) stop(paste0('Unable to find file: ', netRc)) } diff --git a/singlecell/resources/chunks/ClassifyTNKByExpression.R b/singlecell/resources/chunks/ClassifyTNKByExpression.R index 9f19b7fae..e7a00f83c 100644 --- a/singlecell/resources/chunks/ClassifyTNKByExpression.R +++ b/singlecell/resources/chunks/ClassifyTNKByExpression.R @@ -1,6 +1,6 @@ -netRc <- paste0(Sys.getEnv('USER_HOME'), '/.netrc') +netRc <- paste0(Sys.getenv('USER_HOME'), '/.netrc') if (!file.exists(netRc)) { - print(list.files(Sys.getEnv('USER_HOME'))) + print(list.files(Sys.getenv('USER_HOME'))) stop(paste0('Unable to find file: ', netRc)) } diff --git a/singlecell/resources/chunks/RunConga.R b/singlecell/resources/chunks/RunConga.R index 5f07adccb..12414779f 100644 --- a/singlecell/resources/chunks/RunConga.R +++ b/singlecell/resources/chunks/RunConga.R @@ -1,6 +1,6 @@ -netRc <- paste0(Sys.getEnv('USER_HOME'), '/.netrc') +netRc <- paste0(Sys.getenv('USER_HOME'), '/.netrc') if (!file.exists(netRc)) { - print(list.files(Sys.getEnv('USER_HOME'))) + print(list.files(Sys.getenv('USER_HOME'))) stop(paste0('Unable to find file: ', netRc)) } diff --git a/singlecell/resources/chunks/StudyMetadata.R b/singlecell/resources/chunks/StudyMetadata.R index d3d10453e..fd8d4e931 100644 --- a/singlecell/resources/chunks/StudyMetadata.R +++ b/singlecell/resources/chunks/StudyMetadata.R @@ -1,6 +1,6 @@ -netRc <- paste0(Sys.getEnv('USER_HOME'), '/.netrc') +netRc <- paste0(Sys.getenv('USER_HOME'), '/.netrc') if (!file.exists(netRc)) { - print(list.files(Sys.getEnv('USER_HOME'))) + print(list.files(Sys.getenv('USER_HOME'))) stop(paste0('Unable to find file: ', netRc)) } diff --git a/singlecell/resources/chunks/SummarizeTCellActivation.R b/singlecell/resources/chunks/SummarizeTCellActivation.R index 167ea4b6a..b03c351ee 100644 --- a/singlecell/resources/chunks/SummarizeTCellActivation.R +++ b/singlecell/resources/chunks/SummarizeTCellActivation.R @@ -1,6 +1,6 @@ -netRc <- paste0(Sys.getEnv('USER_HOME'), '/.netrc') +netRc <- paste0(Sys.getenv('USER_HOME'), '/.netrc') if (!file.exists(netRc)) { - print(list.files(Sys.getEnv('USER_HOME'))) + print(list.files(Sys.getenv('USER_HOME'))) stop(paste0('Unable to find file: ', netRc)) } diff --git a/singlecell/resources/chunks/TrainCelltypist.R b/singlecell/resources/chunks/TrainCelltypist.R index 6afba85cb..8f6866d10 100644 --- a/singlecell/resources/chunks/TrainCelltypist.R +++ b/singlecell/resources/chunks/TrainCelltypist.R @@ -6,4 +6,4 @@ datasetId <- names(seuratObjects)[[1]] printName(datasetId) seuratObj <- readSeuratRDS(seuratObjects[[datasetId]]) -RIRA::TrainCellTypist(seuratObj, labelField = labelField, minCellsPerClass = minCellsPerClass, excludedClasses = excludedClasses, modelFile = modelFile, featureInclusionList = featureInclusionList, featureExclusionList = featureExclusionList, tempFileLocation = Sys.getEnv('WORK_DIR')) \ No newline at end of file +RIRA::TrainCellTypist(seuratObj, labelField = labelField, minCellsPerClass = minCellsPerClass, excludedClasses = excludedClasses, modelFile = modelFile, featureInclusionList = featureInclusionList, featureExclusionList = featureExclusionList, tempFileLocation = Sys.getenv('WORK_DIR')) \ No newline at end of file diff --git a/singlecell/resources/chunks/UpdateSeuratPrototype.R b/singlecell/resources/chunks/UpdateSeuratPrototype.R index bbcfc7071..a30396d81 100644 --- a/singlecell/resources/chunks/UpdateSeuratPrototype.R +++ b/singlecell/resources/chunks/UpdateSeuratPrototype.R @@ -1,6 +1,6 @@ -netRc <- paste0(Sys.getEnv('USER_HOME'), '/.netrc') +netRc <- paste0(Sys.getenv('USER_HOME'), '/.netrc') if (!file.exists(netRc)) { - print(list.files(Sys.getEnv('USER_HOME'))) + print(list.files(Sys.getenv('USER_HOME'))) stop(paste0('Unable to find file: ', netRc)) } diff --git a/singlecell/src/org/labkey/singlecell/CellHashingServiceImpl.java b/singlecell/src/org/labkey/singlecell/CellHashingServiceImpl.java index c5aa873d6..81629915c 100644 --- a/singlecell/src/org/labkey/singlecell/CellHashingServiceImpl.java +++ b/singlecell/src/org/labkey/singlecell/CellHashingServiceImpl.java @@ -1234,7 +1234,7 @@ public File generateCellHashingCalls(File citeSeqCountOutDir, File outputDir, St String allowableBarcodeParam = allowableBarcodes != null ? "c('" + StringUtils.join(allowableBarcodes, "','") + "')" : "NULL"; List methodNames = parameters.methods.stream().filter(m -> { - if (totalCellBarcodes > m.getMinCells()) + if (totalCellBarcodes < m.getMinCells()) { ctx.getLogger().debug("Dropping method due to insufficient cells: " + m.name()); return false; @@ -1244,7 +1244,7 @@ public File generateCellHashingCalls(File citeSeqCountOutDir, File outputDir, St }).map(CALLING_METHOD::getLabel).distinct().toList(); List consensusMethodNames = parameters.consensusMethods == null ? Collections.emptyList() : parameters.consensusMethods.stream().filter(m -> { - if (totalCellBarcodes > m.getMinCells()) + if (totalCellBarcodes < m.getMinCells()) { ctx.getLogger().debug("Dropping consensus method due to insufficient cells: " + m.name()); return false; diff --git a/singlecell/src/org/labkey/singlecell/run/NimbleHelper.java b/singlecell/src/org/labkey/singlecell/run/NimbleHelper.java index 34bf076e6..fd6fef01d 100644 --- a/singlecell/src/org/labkey/singlecell/run/NimbleHelper.java +++ b/singlecell/src/org/labkey/singlecell/run/NimbleHelper.java @@ -297,6 +297,8 @@ public void doNimbleAlign(File bam, PipelineStepOutput output, Readset rs, Strin { if (SequencePipelineService.get().hasMinLineCount(results, 2)) { + long lineCount = SequencePipelineService.get().getLineCount(results); + _ctx.getLogger().debug("Found {} lines in file {}", lineCount, results.getPath()); throw new PipelineJobException("Unable to find file: " + reportHtml.getPath()); } } @@ -496,7 +498,7 @@ public static File runNimbleReport(File alignResultsGz, int genomeId, PipelineSt reportArgs.add("-i"); reportArgs.add(alignResultsGz.getPath()); - File reportResultsGz = new File(ctx.getWorkingDirectory(), "reportResults." + genomeId + ".txt"); + File reportResultsGz = new File(ctx.getWorkingDirectory(), "reportResults." + genomeId + ".txt.gz"); if (reportResultsGz.exists()) { reportResultsGz.delete();