Skip to content

Commit 54b0c2e

Browse files
committed
Allow GenotypeGVCFs to be run on multiple inputs using a three-pass approach
1 parent 69f369f commit 54b0c2e

File tree

6 files changed

+169
-126
lines changed

6 files changed

+169
-126
lines changed

SequenceAnalysis/api-src/org/labkey/api/sequenceanalysis/run/DISCVRSeqRunner.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ protected File getJar()
3939

4040
}
4141

42-
protected List<String> getBaseArgs(String toolName)
42+
public List<String> getBaseArgs(String toolName)
4343
{
4444
List<String> args = new ArrayList<>();
4545
args.add(SequencePipelineService.get().getJava8FilePath());

SequenceAnalysis/src/org/labkey/sequenceanalysis/SequenceAnalysisController.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3690,6 +3690,7 @@ public void export(ExportSequenceFilesForm form, HttpServletResponse response, B
36903690

36913691
Set<File> files = new HashSet<>();
36923692
FileType bamFileType = new FileType("bam");
3693+
FileType cramFileType = new FileType("cram");
36933694
FileType fastaFileType = new FileType("fasta", FileType.gzSupportLevel.SUPPORT_GZ);
36943695
FileType gzFileType = new FileType("gz");
36953696
for (int id : form.getDataIds())
@@ -3710,6 +3711,14 @@ public void export(ExportSequenceFilesForm form, HttpServletResponse response, B
37103711
files.add(index);
37113712
}
37123713
}
3714+
if (cramFileType.isType(data.getFile()))
3715+
{
3716+
File index = new File(data.getFile() + ".crai");
3717+
if (index.exists())
3718+
{
3719+
files.add(index);
3720+
}
3721+
}
37133722
else if (fastaFileType.isType(data.getFile()))
37143723
{
37153724
File index = new File(data.getFile() + ".fai");

SequenceAnalysis/src/org/labkey/sequenceanalysis/SequenceAnalysisMaintenanceTask.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -459,6 +459,7 @@ private void deleteFile(File f, Logger log) throws IOException
459459
}
460460

461461
private static FileType _bamFileType = new FileType("bam");
462+
private static FileType _cramFileType = new FileType("cram");
462463
private static FileType _vcfFileType = new FileType("vcf", FileType.gzSupportLevel.SUPPORT_GZ);
463464
private static FileType _bedFileType = new FileType("bed");
464465

@@ -474,6 +475,10 @@ public static List<String> getAssociatedFiles(File f, boolean includeGz)
474475
{
475476
ret.add(f.getName() + ".bai");
476477
}
478+
else if (_cramFileType.isType(f))
479+
{
480+
ret.add(f.getName() + ".crai");
481+
}
477482
else if (_vcfFileType.isType(f))
478483
{
479484
ret.add(f.getName() + ".tbi");

0 commit comments

Comments
 (0)