Skip to content

Commit ffdd306

Browse files
committed
Update which text file is tracked in SequenceBasedTypingAnalysis
1 parent ff0747c commit ffdd306

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

SequenceAnalysis/src/org/labkey/sequenceanalysis/run/analysis/SequenceBasedTypingAnalysis.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -271,16 +271,17 @@ public Output performAnalysisPerSampleRemote(Readset rs, File inputBam, Referenc
271271
BamIterator bi = new BamIterator(inputBam, referenceGenome.getWorkingFastaFile(), getPipelineCtx().getLogger());
272272

273273
List<AlignmentAggregator> aggregators = new ArrayList<>();
274+
File workDir = new File(getPipelineCtx().getSourceDirectory(), FileUtil.getBaseName(inputBam));
275+
File sbtOutputLog = new File(workDir, FileUtil.getBaseName(inputBam) + ".sbt.txt.gz");
276+
274277
SequenceBasedTypingAlignmentAggregator agg = new SequenceBasedTypingAlignmentAggregator(getPipelineCtx().getLogger(), referenceGenome.getWorkingFastaFile(), avgBaseQualityAggregator, toolParams);
275278
if (getProvider().getParameterByName("writeLog").extractValue(getPipelineCtx().getJob(), getProvider(), getStepIdx(), Boolean.class, false))
276279
{
277-
File workDir = new File(getPipelineCtx().getSourceDirectory(), FileUtil.getBaseName(inputBam));
278280
if (!workDir.exists())
279281
{
280282
workDir.mkdirs();
281283
}
282-
File outputLog = new File(workDir, FileUtil.getBaseName(inputBam) + ".sbt.txt.gz");
283-
agg.setOutputLog(outputLog);
284+
agg.setOutputLog(sbtOutputLog);
284285
}
285286

286287
File lineageMapFile = new File(getPipelineCtx().getSourceDirectory(), referenceGenome.getGenomeId() + "_lineageMap.txt");
@@ -311,7 +312,7 @@ public Output performAnalysisPerSampleRemote(Readset rs, File inputBam, Referenc
311312
//write output as TSV
312313
agg.writeTable(getSBTSummaryFile(outputDir, inputBam));
313314

314-
output.addSequenceOutput(getSBTSummaryFile(outputDir, inputBam), "SBT Results: " + inputBam.getName(), "SBT Results", rs.getReadsetId(), null, referenceGenome.getGenomeId(), null);
315+
output.addSequenceOutput(sbtOutputLog, "SBT Results: " + inputBam.getName(), "SBT Results", rs.getReadsetId(), null, referenceGenome.getGenomeId(), null);
315316

316317
//optionally output FASTQ of unmapped reads
317318
Double exportThreshold = getProvider().getParameterByName(EXPORT_UNMAPPED).extractValue(getPipelineCtx().getJob(), getProvider(), getStepIdx(), Double.class);

0 commit comments

Comments
 (0)