diff options
author | zsloan | 2020-04-16 13:48:08 -0500 |
---|---|---|
committer | zsloan | 2020-04-16 13:48:08 -0500 |
commit | 39d37ecde31f682013c7635e4f97853edc256b01 (patch) | |
tree | ade429ea5db76d2d52210b64607b34d6dcb5d4e3 /wqflask/utility/gen_geno_ob.py | |
parent | 203ccbcc954a601931d2ab5a7522c89d5e2afd8c (diff) | |
download | genenetwork2-39d37ecde31f682013c7635e4f97853edc256b01.tar.gz |
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"
Diffstat (limited to 'wqflask/utility/gen_geno_ob.py')
-rw-r--r-- | wqflask/utility/gen_geno_ob.py | 5 |
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, |