Allow CellRangerVDH to more easily skip BAM creation

BimberLab · Aug 25, 2024 · 760c35d · 760c35d
1 parent 4b3375e
commit 760c35d
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/singlecell/src/org/labkey/singlecell/run/CellRangerVDJWrapper.java b/singlecell/src/org/labkey/singlecell/run/CellRangerVDJWrapper.java
@@ -394,6 +394,9 @@ public AlignmentStep.AlignmentOutput performAlignment(Readset rs, List<File> inp
                 lockFile.delete();
             }
 
+            boolean discardBam = getProvider().getParameterByName(AbstractAlignmentStepProvider.DISCARD_BAM).extractValue(getPipelineCtx().getJob(), getProvider(), getStepIdx(), Boolean.class, false);
+            args.add("--create-bam=" + !discardBam);
+
             getWrapper().execute(args);
 
             File outdir = new File(outputDirectory, id);
@@ -454,7 +457,6 @@ public AlignmentStep.AlignmentOutput performAlignment(Readset rs, List<File> inp
         private File processOutputsForType(String sampleId, Readset rs, ReferenceGenome referenceGenome, File outdir, AlignmentOutputImpl output, String subdirName) throws PipelineJobException
         {
             boolean isPrimaryDir = "vdj_t".equals(subdirName);
-            String chainType = "vdj_t".equals(subdirName) ? "Alpha/Beta" : "Gamma/Delta";
 
             File multiDir = new File(outdir, "multi/" + subdirName);
             if (!multiDir.exists())
@@ -487,13 +489,14 @@ private File processOutputsForType(String sampleId, Readset rs, ReferenceGenome
                 }
             }
 
+            boolean discardBam = getProvider().getParameterByName(AbstractAlignmentStepProvider.DISCARD_BAM).extractValue(getPipelineCtx().getJob(), getProvider(), getStepIdx(), Boolean.class, false);
             File bam = new File(sampleDir, "all_contig.bam");
-            if (!bam.exists())
+            if (!discardBam && !bam.exists())
             {
                 throw new PipelineJobException("Unable to find file: " + bam.getPath());
             }
 
-            if (isPrimaryDir)
+            if (!discardBam && isPrimaryDir)
             {
                 output.setBAM(bam);
             }