diff --git a/tools/encode/random_intervals_code.py b/tools/encode/random_intervals_code.py index d7d1c753735..6d0d6e48ef4 100644 --- a/tools/encode/random_intervals_code.py +++ b/tools/encode/random_intervals_code.py @@ -32,7 +32,7 @@ def get_available_data( build ): if build in available_regions: return available_regions[build] else: - return ('No data available for this build','None',True) + return [('No data available for this build','None',True)] #def exec_before_job(inp_data, out_data, param_dict, tool): diff --git a/tools/encode/random_intervals_no_bits.py b/tools/encode/random_intervals_no_bits.py index 875831cc796..6307ccf7be7 100644 --- a/tools/encode/random_intervals_no_bits.py +++ b/tools/encode/random_intervals_no_bits.py @@ -17,7 +17,7 @@ def add_random_region(region, b_chr, b_start, b_end, exist_regions, mask, overla found_overlap = False for region in exist_regions: - if (rand_region['start'] >= region['start'] and rand_region['start'] <= region['end']) or (rand_region['end'] >= region['start'] and rand_region['end'] <= region['end']): + if not (rand_region['end'] <= region['start'] or region['end'] <= rand_region['start']): if overlaps=="none" or rand_region['strand'] == region['strand']: found_overlap = True @@ -26,7 +26,7 @@ def add_random_region(region, b_chr, b_start, b_end, exist_regions, mask, overla for region in mask: if region['chr'] != rand_region['chr']: continue - if (rand_region['start'] >= region['start'] and rand_region['start'] <= region['end']) or (rand_region['end'] >= region['start'] and rand_region['end'] <= region['end']): + if not (rand_region['end'] <= region['start'] or region['end'] <= rand_region['start']): found_overlap = True if not found_overlap: @@ -74,7 +74,7 @@ def main(): print >>sys.stdout, 'random_intervals.py initialization error -> %s' % exc if region_uid not in available_regions: - print >>stderr, "Invalid region selected" + print >>sys.stderr, "Invalid region selected" sys.exit(0) region_fname = available_regions[region_uid]