Skip to content

Commit 932e872

Browse files
committed
ensure we fail when conversion of hic pairs fails, don't track mis-sorted reads to save memory
1 parent 4b1f5a4 commit 932e872

File tree

2 files changed

+2
-12
lines changed

2 files changed

+2
-12
lines changed

src/Snakefiles/8-hicPipeline.sm

+2-2
Original file line numberDiff line numberDiff line change
@@ -386,8 +386,8 @@ rule transformBWA:
386386
cd 8-hicPipeline
387387

388388
cat > ./transform_bwa.sh <<EOF
389-
#!/bin/sh
390-
set -e
389+
#!/usr/bin/env bash
390+
set -e -o pipefail
391391
{params.SAMTOOLS} view -q 1 ../{input.bwa_mapping} | {PYTHON} {VERKKO}/scripts/parse_sam_pairs.py > ../{output.byread_mapping}
392392
EOF
393393

src/scripts/parse_sam_pairs.py

-10
Original file line numberDiff line numberDiff line change
@@ -33,25 +33,15 @@ def print_results(names):
3333

3434
name = ""
3535
names = [ ]
36-
seen = {}
37-
out_of_order = 0
3836

3937
for line in input_stream:
4038
line=line.split()
4139
if name == "":
4240
name = line[0]
4341
if name != line[0]:
44-
seen[name] = 1
4542
print_results(names)
4643
name = line[0]
4744
names = [ ]
48-
if name in seen:
49-
print("Warning: read %s already seen but encountered it again, please confirm your bam file is sorted by read."%(name), file=sys.stderr)
50-
out_of_order += 1
5145
names.append("%s\t%s"%(line[0], line[2]))
5246

53-
if out_of_order > 1000:
54-
print("Error: encountered too many unsorted reads (%d), exiting. Please confirm the input bam is sorted by read."%(out_of_order), file=sys.stderr)
55-
sys.exit(1)
56-
5747
print_results(names)

0 commit comments

Comments
 (0)