about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--wqflask/wqflask/api/mapping.py18
1 files changed, 8 insertions, 10 deletions
diff --git a/wqflask/wqflask/api/mapping.py b/wqflask/wqflask/api/mapping.py
index f8b0d8bd..d1cc368e 100644
--- a/wqflask/wqflask/api/mapping.py
+++ b/wqflask/wqflask/api/mapping.py
@@ -52,17 +52,15 @@ def do_mapping_for_api(start_vars):
     elif mapping_params['mapping_method'] == "rqtl":
         header_row = ["name", "chr", "cM", "lod_score"]
         if mapping_params['num_perm'] > 0:
-            _sperm_output, _suggestive, _significant, result_markers = rqtl_mapping.run_rqtl_geno(vals, dataset, mapping_params['rqtl_method'], mapping_params['rqtl_model'],
-                                                                                                  mapping_params['perm_check'], mapping_params[
-                                                                                                      'num_perm'],
-                                                                                                  mapping_params['do_control'], mapping_params[
-                'control_marker'],
-                mapping_params['manhattan_plot'], mapping_params['pair_scan'])
+            _sperm_output, _suggestive, _significant, result_markers = rqtl_mapping.run_rqtl(this_trait.name, vals, samples, dataset, None, "Mb", mapping_params['rqtl_model'],
+                                                                                             mapping_params['rqtl_method'], mapping_params['num_perm'], None,
+                                                                                             mapping_params['do_control'], mapping_params['control_marker'],
+                                                                                             mapping_params['manhattan_plot'], None)
         else:
-            result_markers = rqtl_mapping.run_rqtl_geno(vals, dataset, mapping_params['rqtl_method'], mapping_params['rqtl_model'],
-                                                        mapping_params['perm_check'], mapping_params['num_perm'],
-                                                        mapping_params['do_control'], mapping_params['control_marker'],
-                                                        mapping_params['manhattan_plot'], mapping_params['pair_scan'])
+            result_markers = rqtl_mapping.run_rqtl(this_trait.name, vals, samples, dataset, None, "Mb", mapping_params['rqtl_model'],
+                                                   mapping_params['rqtl_method'], mapping_params['num_perm'], None,
+                                                   mapping_params['do_control'], mapping_params['control_marker'],
+                                                   mapping_params['manhattan_plot'], None)
 
     if mapping_params['limit_to']:
         result_markers = result_markers[:mapping_params['limit_to']]