diff --git a/coolpup.py b/coolpup.py index eb7f75e..f342f4a 100644 --- a/coolpup.py +++ b/coolpup.py @@ -64,7 +64,7 @@ def get_combinations(mids, res, local=False, anchor=None): p = (mids['Pad']//res).values.astype(int) if local: for i, pi in zip(m, p): - yield (i, i), (pi, pi) + yield i, i, pi, pi elif anchor: anchor_bin = int((anchor[1]+anchor[2])/2//res) anchor_pad = (anchor[2] - anchor[1])/2 @@ -391,8 +391,6 @@ def prepare_single(item): c = cooler.Cooler(args.coolfile) coolname = args.coolfile.split('::')[0].split('/')[-1].split('.')[0] - if 'mapq30' in args.coolfile: - coolname += '_mapq30' bedname = args.baselist.split('/')[-1].split('.bed')[0].split('_mm9')[0].split('_mm10')[0] pad = args.pad*1000//c.binsize diff --git a/setup.py b/setup.py index e8ac630..f8c2e72 100644 --- a/setup.py +++ b/setup.py @@ -2,6 +2,6 @@ setup( name='coolpuppy', - version='0.5.3', + version='0.5.4', scripts=['coolpup.py'] )