Skip to content

Commit b0d611e

Browse files
committed
Update paraGRAPH filtering and adjust nimble report FileType
1 parent 25f7b2b commit b0d611e

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

SequenceAnalysis/src/org/labkey/sequenceanalysis/run/alignment/ParagraphStep.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -124,11 +124,7 @@ else if (!svVcf.exists())
124124
SelectVariantsWrapper svw = new SelectVariantsWrapper(ctx.getLogger());
125125
List<String> selectArgs = new ArrayList<>();
126126
selectArgs.add("-select");
127-
selectArgs.add("SVTYPE != 'BND'");
128-
selectArgs.add("-select");
129-
selectArgs.add("!(vc.hasAttribute('SVTYPE') && vc.getAttribute('SVTYPE') == 'INS' && vc.hasSymbolicAlleles() && !vc.hasAttribute('SEQ'))");
130-
selectArgs.add("-select");
131-
selectArgs.add("POS > 150");
127+
selectArgs.add("SVTYPE != 'BND' && POS > 150 && !(vc.hasAttribute('SVTYPE') && vc.getAttribute('SVTYPE') == 'INS' && vc.hasSymbolicAlleles() && !vc.hasAttribute('SEQ'))");
132128
selectArgs.add("--exclude-filtered");
133129
selectArgs.add("--exclude-filtered");
134130
selectArgs.add("--sites-only-vcf-output");

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,12 @@ public RepeatNimbleReportHandler()
5252
);
5353
}
5454

55-
private static final FileType _nimbleResultsGz = new FileType(".txt.gz", FileType.gzSupportLevel.NO_GZ);
55+
private static final FileType _nimbleResultsGz = new FileType(".txt", FileType.gzSupportLevel.SUPPORT_GZ);
5656

5757
@Override
5858
public boolean canProcess(SequenceOutputFile o)
5959
{
60-
return o.getFile() != null && o.getFile().exists() && o.getFile().getName().startsWith("reportResults") && _nimbleResultsGz.isType(o.getFile());
60+
return o.getFile() != null && o.getFile().exists() && o.getFile().getName().startsWith("reportResults.") && _nimbleResultsGz.isType(o.getFile());
6161
}
6262

6363
@Override

0 commit comments

Comments
 (0)