Skip to content

Commit 8ddba54

Browse files
committed
Only throw for missing insert size metrics for paired data
1 parent b789e6e commit 8ddba54

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

SequenceAnalysis/src/org/labkey/sequenceanalysis/analysis/PicardAlignmentMetricsHandler.java

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import org.labkey.api.module.ModuleLoader;
99
import org.labkey.api.pipeline.PipelineJob;
1010
import org.labkey.api.pipeline.PipelineJobException;
11-
import org.labkey.api.pipeline.PipelineJobService;
1211
import org.labkey.api.pipeline.PipelineService;
1312
import org.labkey.api.pipeline.PipelineStatusFile;
1413
import org.labkey.api.pipeline.RecordedAction;
@@ -17,14 +16,14 @@
1716
import org.labkey.api.sequenceanalysis.SequenceAnalysisService;
1817
import org.labkey.api.sequenceanalysis.SequenceOutputFile;
1918
import org.labkey.api.sequenceanalysis.model.AnalysisModel;
19+
import org.labkey.api.sequenceanalysis.model.Readset;
2020
import org.labkey.api.sequenceanalysis.pipeline.AbstractParameterizedOutputHandler;
2121
import org.labkey.api.sequenceanalysis.pipeline.SequenceAnalysisJobSupport;
2222
import org.labkey.api.sequenceanalysis.pipeline.SequenceOutputHandler;
2323
import org.labkey.api.sequenceanalysis.pipeline.ToolParameterDescriptor;
2424
import org.labkey.api.util.FileType;
2525
import org.labkey.api.util.FileUtil;
2626
import org.labkey.api.util.PageFlowUtil;
27-
import org.labkey.api.util.UnexpectedException;
2827
import org.labkey.sequenceanalysis.SequenceAnalysisManager;
2928
import org.labkey.sequenceanalysis.SequenceAnalysisModule;
3029
import org.labkey.sequenceanalysis.SequenceAnalysisSchema;
@@ -189,7 +188,15 @@ else if (collectSummary)
189188
}
190189
else if (collectInsertSize)
191190
{
192-
throw new PipelineJobException("Missing file: " + mf2.getPath());
191+
// This output is only created for paired data:
192+
if (o.getReadset() != null)
193+
{
194+
Readset rs = SequenceAnalysisService.get().getReadset(o.getReadset(), job.getUser());
195+
if (rs.getReadData().stream().filter(rd -> rd.getFileId2() != null).count() > 0)
196+
{
197+
throw new PipelineJobException("Missing file: " + mf2.getPath());
198+
}
199+
}
193200
}
194201

195202
File mf3 = new File(outputDir, FileUtil.getBaseName(o.getFile()) + ".wgs.metrics");

0 commit comments

Comments
 (0)