Skip to content

Commit 806a1fb

Browse files
committed
Drop --include-technical
1 parent 892c793 commit 806a1fb

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

SequenceAnalysis/src/org/labkey/sequenceanalysis/pipeline/SequenceAlignmentTask.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2022,7 +2022,7 @@ else if (sraIDs.contains(rd.getSra_accession()))
20222022
outDir.mkdirs();
20232023
}
20242024

2025-
Pair<File, File> downloaded = sra.downloadSra(rd.getSra_accession(), unzippedOutDir, rd.isPairedEnd());
2025+
Pair<File, File> downloaded = sra.downloadSra(rd.getSra_accession(), unzippedOutDir, rd.isPairedEnd(), false);
20262026
File moved1 = new File(outDir, downloaded.first.getName());
20272027
if (moved1.exists())
20282028
{

SequenceAnalysis/src/org/labkey/sequenceanalysis/run/RestoreSraDataHandler.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ public void processFilesRemote(List<Readset> readsets, JobContext ctx) throws Un
384384
File expectedFile2 = rd.getFileId2() == null ? null : ctx.getSequenceSupport().getCachedData(rd.getFileId2());
385385

386386
FastqDumpWrapper wrapper = new FastqDumpWrapper(ctx.getLogger());
387-
Pair<File, File> files = wrapper.downloadSra(accession, ctx.getOutputDir(), rd.isPairedEnd());
387+
Pair<File, File> files = wrapper.downloadSra(accession, ctx.getOutputDir(), rd.isPairedEnd(), false);
388388

389389
long lines1 = SequenceUtil.getLineCount(files.first) / 4;
390390
ctx.getJob().getLogger().debug("Reads in " + files.first.getName() + ": " + lines1);
@@ -459,13 +459,16 @@ public FastqDumpWrapper(@Nullable Logger logger)
459459
super(logger);
460460
}
461461

462-
public Pair<File, File> downloadSra(String dataset, File outDir, boolean expectPaired) throws PipelineJobException
462+
public Pair<File, File> downloadSra(String dataset, File outDir, boolean expectPaired, boolean includeTechnical) throws PipelineJobException
463463
{
464464
List<String> args = new ArrayList<>();
465465
args.add(getExe().getPath());
466466

467467
// NOTE: we probably want the --split-3 behavior, which is the default for fasterq-dump
468-
args.add("--include-technical");
468+
if (includeTechnical)
469+
{
470+
args.add("--include-technical");
471+
}
469472

470473
Integer threads = SequencePipelineService.get().getMaxThreads(getLogger());
471474
if (threads != null)

0 commit comments

Comments
 (0)