diff --git a/src/cli/BAM_Format_Converter/BAMtoBEDCLI.java b/src/cli/BAM_Format_Converter/BAMtoBEDCLI.java index 769d34b66..60937985e 100644 --- a/src/cli/BAM_Format_Converter/BAMtoBEDCLI.java +++ b/src/cli/BAM_Format_Converter/BAMtoBEDCLI.java @@ -86,6 +86,8 @@ private String validateInput() throws IOException { else if(readType.midpoint) { STRAND=3; } else if(readType.fragment) { STRAND=4; } else { STRAND=0; } + // set PE defaults + if(STRAND==3 || STRAND==4) { matePair=true; } //check inputs exist if(!bamFile.exists()){ @@ -131,7 +133,7 @@ private String validateInput() throws IOException { // validate insert sizes if( MIN_INSERT<0 && MIN_INSERT!=-9999 ){ r += "MIN_INSERT must be a positive integer value: " + MIN_INSERT + "\n"; } if( MAX_INSERT<0 && MAX_INSERT!=-9999 ){ r += "MAX_INSERT must be a positive integer value: " + MAX_INSERT + "\n"; } - if( MAX_INSERT iter = reader.query(seq.getSequenceName(), 0, seq.getSequenceLength(), false); while (iter.hasNext()) { - //Create the record object + //Create the record object SAMRecord sr = iter.next(); if(sr.getReadPairedFlag()) { if(sr.getProperPairFlag() && sr.getFirstOfPairFlag()) { @@ -70,7 +71,7 @@ public void run() throws IOException, InterruptedException { } } //System.out.println(sr.getReadString() + "\t" + seq.getSequenceName() + "\t" + sr.getUnclippedStart() + "\t" + sr.getUnclippedEnd() + "\t" + sr.getReadNegativeStrandFlag() + "\t" + filter); - if(filter.toUpperCase().equals(SEQ)) { writer.addAlignment(sr); } + if(filter.toUpperCase().equals(SEQ)) { writer.addAlignment(sr); } } } else { String filter = ""; @@ -83,7 +84,7 @@ public void run() throws IOException, InterruptedException { filter = FASTAUtilities.RevComplement(filter); } //System.out.println(sr.getReadString() + "\t" + seq.getSequenceName() + "\t" + sr.getUnclippedStart() + "\t" + sr.getUnclippedEnd() + "\t" + sr.getReadNegativeStrandFlag() + "\t" + filter); - if(filter.toUpperCase().equals(SEQ)) { writer.addAlignment(sr); } + if(filter.toUpperCase().equals(SEQ)) { writer.addAlignment(sr); } } } iter.close(); @@ -93,7 +94,7 @@ public void run() throws IOException, InterruptedException { reader.close(); bai.close(); } - + private void printBoth(String message){ if(PS!=null){ PS.println(message); } System.err.println(message);