about summary refs log tree commit diff
diff options
context:
space:
mode:
authorDannyArends2015-03-19 23:44:39 +0100
committerDannyArends2015-03-19 23:44:39 +0100
commit85419ee56d2f0ebc7cb806211fe04f713e78b6c4 (patch)
tree03cda4f02228d6ea328407bd308567db30531809
parent9ba9957010eab3a9723a8dbf0a23d18dd9b32e2f (diff)
downloadgenenetwork2-85419ee56d2f0ebc7cb806211fe04f713e78b6c4.tar.gz
testing some more
-rwxr-xr-xwqflask/wqflask/marker_regression/marker_regression.py4
-rwxr-xr-xwqflask/wqflask/views.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/wqflask/wqflask/marker_regression/marker_regression.py b/wqflask/wqflask/marker_regression/marker_regression.py
index 32d147d0..8fb1d841 100755
--- a/wqflask/wqflask/marker_regression/marker_regression.py
+++ b/wqflask/wqflask/marker_regression/marker_regression.py
@@ -83,8 +83,8 @@ class MarkerRegression(object):
                 self.num_perm = start_vars['num_perm']
             self.control = start_vars['control_marker']
             print("StartVars:", start_vars)
-            self.method = start_vars['mapmethod']
-            self.model = start_vars['mapmodel']
+            self.method = start_vars['mapmethod_rqtl_geno']
+            self.model = start_vars['mapmodel_rqtl_geno']
 
 
             if start_vars['pair_scan'] == "true":
diff --git a/wqflask/wqflask/views.py b/wqflask/wqflask/views.py
index b0223c08..bac553d7 100755
--- a/wqflask/wqflask/views.py
+++ b/wqflask/wqflask/views.py
@@ -287,8 +287,8 @@ def marker_regression_page():
         'control_marker',
         'control_marker_db',
         'pair_scan',
-        'mapmethod',
-        'mapmodel'
+        'mapmethod_rqtl_geno',
+        'mapmodel_rqtl_geno'
     )
     print("Random Print too see if it is running:", initial_start_vars)
     start_vars = {}