diff options
author | Pjotr Prins | 2020-04-26 12:32:46 -0500 |
---|---|---|
committer | Pjotr Prins | 2020-04-26 12:32:46 -0500 |
commit | 14d49450c47e8ef3b34bca9e759acd371319a854 (patch) | |
tree | 3f45b7455ec114ebdd9fdd2f2c4a92c9eb3cf756 /wqflask/utility/webqtlUtil.py | |
parent | 33e2e09d00881de9b07274bc52b58587e5135cab (diff) | |
parent | 15d8e24da26cf6d42d1bdb8a9a189b9ec061d147 (diff) | |
download | genenetwork2-14d49450c47e8ef3b34bca9e759acd371319a854.tar.gz |
Merge master and testingmaster
Diffstat (limited to 'wqflask/utility/webqtlUtil.py')
-rw-r--r-- | wqflask/utility/webqtlUtil.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/wqflask/utility/webqtlUtil.py b/wqflask/utility/webqtlUtil.py index 83fa90b7..53661ae4 100644 --- a/wqflask/utility/webqtlUtil.py +++ b/wqflask/utility/webqtlUtil.py @@ -30,8 +30,6 @@ import re import math from math import * -from htmlgen import HTMLgen2 as HT - from base import webqtlConfig # NL, 07/27/2010. moved from webqtlForm.py @@ -54,11 +52,12 @@ ParInfo ={ 'AXB':['ABF1', 'BAF1', 'C57BL/6J', 'A/J'], 'BXA':['BAF1', 'ABF1', 'C57BL/6J', 'A/J'], 'LXS':['LSF1', 'SLF1', 'ISS', 'ILS'], -'HXBBXH':['HSRBNF1', 'BNHSRF1', 'BN', 'HSR'], +'HXBBXH':['SHR_BNF1', 'BN_SHRF1', 'BN-Lx/Cub', 'SHR/OlaIpcv'], 'BayXSha':['BayXShaF1', 'ShaXBayF1', 'Bay-0','Shahdara'], 'ColXBur':['ColXBurF1', 'BurXColF1', 'Col-0','Bur-0'], 'ColXCvi':['ColXCviF1', 'CviXColF1', 'Col-0','Cvi'], -'SXM':['SMF1', 'MSF1', 'Steptoe','Morex'] +'SXM':['SMF1', 'MSF1', 'Steptoe','Morex'], +'HRDP':['SHR_BNF1', 'BN_SHRF1', 'BN-Lx/Cub', 'SHR/OlaIpcv'] } ######################################### |