Skip to content

Commit 9bd57a7

Browse files
committed
Bugfix to logic when seurat jobs run but do not produce a separate seurat object
1 parent ed7cde2 commit 9bd57a7

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

singlecell/src/org/labkey/singlecell/analysis/AbstractSingleCellHandler.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import org.labkey.api.sequenceanalysis.pipeline.ToolParameterDescriptor;
3636
import org.labkey.api.singlecell.CellHashingService;
3737
import org.labkey.api.singlecell.pipeline.AbstractSingleCellPipelineStep;
38+
import org.labkey.api.singlecell.pipeline.AbstractSingleCellStep;
3839
import org.labkey.api.singlecell.pipeline.SingleCellStep;
3940
import org.labkey.api.util.FileUtil;
4041
import org.labkey.api.util.PageFlowUtil;
@@ -377,6 +378,8 @@ public void processFilesRemote(List<SequenceOutputFile> inputFiles, JobContext c
377378
}
378379
}
379380

381+
Set<File> originalInputs = currentFiles.stream().map(AbstractSingleCellStep.SeuratObjectWrapper::getFile).collect(Collectors.toSet());
382+
380383
// Step 2: iterate seurat processing:
381384
String outputPrefix = basename;
382385
int stepIdx = 0;
@@ -544,9 +547,9 @@ else if (step.createsSeuratObjects())
544547
}
545548

546549
//This indicates the job processed an input file, but did not create a new object (like running FindMarkers)
547-
if (output.getSequenceOutputFileId() != null)
550+
if (originalInputs.contains(output.getFile()))
548551
{
549-
ctx.getLogger().info("Sequence output already exists, will not re-create output for seurat object: " + output.getSequenceOutputFileId());
552+
ctx.getLogger().info("Sequence output is the same as an input, will not re-create output for seurat object: " + output.getFile().getPath());
550553
}
551554
else
552555
{

0 commit comments

Comments
 (0)