From 39d37ecde31f682013c7635e4f97853edc256b01 Mon Sep 17 00:00:00 2001
From: zsloan
Date: Thu, 16 Apr 2020 13:48:08 -0500
Subject: Many changes, including:

- Added permutation strata option for R/qtl
- Made a variety of aesthetic changes to collections-related pages
- Made a variety of aesthetic changes to the multi-trait tool options on the search result and correlation pages
- Made some functional changes to collections that prevent duplicate traits and ensure new traits are at the top
- The "Default Collection" is now always at the bottom of the collection list and renamed to "Your Default Collection"
---
 wqflask/utility/gen_geno_ob.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'wqflask/utility')

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,
-- 
cgit v1.2.3