aboutsummaryrefslogtreecommitdiff
path: root/wqflask/utility
diff options
context:
space:
mode:
authorGN22020-04-16 13:54:55 -0500
committerGN22020-04-16 13:54:55 -0500
commit3b084b9d0bc05994d2c92411d93bf57851ba2e4c (patch)
treeade429ea5db76d2d52210b64607b34d6dcb5d4e3 /wqflask/utility
parent35273956fd3bc0ccccd7304dc29389979688c5c0 (diff)
parent39d37ecde31f682013c7635e4f97853edc256b01 (diff)
downloadgenenetwork2-3b084b9d0bc05994d2c92411d93bf57851ba2e4c.tar.gz
Merge branch 'testing' of https://github.com/genenetwork/genenetwork2 into HEAD
Diffstat (limited to 'wqflask/utility')
-rw-r--r--wqflask/utility/gen_geno_ob.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/wqflask/utility/gen_geno_ob.py b/wqflask/utility/gen_geno_ob.py
index db40f6ea..23b0b650 100644
--- a/wqflask/utility/gen_geno_ob.py
+++ b/wqflask/utility/gen_geno_ob.py
@@ -156,7 +156,10 @@ class Locus(object):
self.cM = float(marker_row[geno_ob.cm_column])
except:
self.cM = float(marker_row[geno_ob.mb_column]) if geno_ob.mb_exists else 0
- self.Mb = float(marker_row[geno_ob.mb_column]) if geno_ob.mb_exists else None
+ try:
+ self.Mb = float(marker_row[geno_ob.mb_column]) if geno_ob.mb_exists else None
+ except:
+ self.Mb = self.cM
geno_table = {
geno_ob.mat: -1,