Skip to content

Commit b667a9a

Browse files
committed
Update nimble arguments
1 parent ee4fe70 commit b667a9a

File tree

2 files changed

+0
-19
lines changed

2 files changed

+0
-19
lines changed

singlecell/src/org/labkey/singlecell/run/NimbleAlignmentStep.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,6 @@ public static List<ToolParameterDescriptor> getToolParameters()
5757
put("initialValues", "unstranded");
5858
put("delimiter", ";");
5959
}}, null),
60-
ToolParameterDescriptor.create(ALIGN_OUTPUT, "Create Alignment/Debug Output", "If checked, an alignment-level summary TSV will be created", "checkbox", new JSONObject(){{
61-
put("checked", true);
62-
}}, true),
6360
ToolParameterDescriptor.create(MAX_HITS_TO_REPORT, "Max Hits To Report", "If a given hit has more than this number of references, it is discarded", "ldk-integerfield", new JSONObject(){{
6461
put("minValue", 0);
6562
}}, 4)

singlecell/src/org/labkey/singlecell/run/NimbleHelper.java

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
import java.util.Map;
4444
import java.util.stream.Collectors;
4545

46-
import static org.labkey.singlecell.run.NimbleAlignmentStep.ALIGN_OUTPUT;
4746
import static org.labkey.singlecell.run.NimbleAlignmentStep.MAX_HITS_TO_REPORT;
4847
import static org.labkey.singlecell.run.NimbleAlignmentStep.REF_GENOMES;
4948
import static org.labkey.singlecell.run.NimbleAlignmentStep.STRANDEDNESS;
@@ -425,14 +424,6 @@ private Map<NimbleGenome, File> doAlignment(List<NimbleGenome> genomes, List<Fil
425424
alignArgs.add(String.valueOf(maxThreads));
426425
}
427426

428-
boolean alignOutput = getProvider().getParameterByName(ALIGN_OUTPUT).extractValue(getPipelineCtx().getJob(), getProvider(), getStepIdx(), Boolean.class, false);
429-
File alignmentOutputFile = new File(getPipelineCtx().getWorkingDirectory(), "nimbleAlignment." + (genomes.size() == 1 ? genomes.get(0).genomeId + "." : "") + "bam");
430-
if (alignOutput)
431-
{
432-
alignArgs.add("--alignment_path");
433-
alignArgs.add("/work/" + alignmentOutputFile.getName());
434-
}
435-
436427
String strandedness = getProvider().getParameterByName(STRANDEDNESS).extractValue(getPipelineCtx().getJob(), getProvider(), getStepIdx(), String.class, null);
437428
if (strandedness != null)
438429
{
@@ -451,13 +442,6 @@ private Map<NimbleGenome, File> doAlignment(List<NimbleGenome> genomes, List<Fil
451442
alignArgs.add("--input");
452443
alignArgs.add("/work/" + localBam.getName());
453444

454-
Integer maxRam = SequencePipelineService.get().getMaxRam();
455-
if (maxRam != null)
456-
{
457-
alignArgs.add("-m");
458-
alignArgs.add(maxRam + "000"); // in MB
459-
}
460-
461445
boolean dockerRan = runUsingDocker(alignArgs, output, "align.all");
462446
for (NimbleGenome genome : genomes)
463447
{

0 commit comments

Comments
 (0)