From 313b6e7d936f3982c9c6c83c909a8e68f7232ceb Mon Sep 17 00:00:00 2001
From: zsloan
Date: Tue, 12 May 2020 09:57:13 -0500
Subject: Added change for F2s in r/qtl and fixed minor issue in save_user in
 redis_tools

---
 wqflask/utility/redis_tools.py                    | 2 +-
 wqflask/wqflask/marker_regression/rqtl_mapping.py | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'wqflask')

diff --git a/wqflask/utility/redis_tools.py b/wqflask/utility/redis_tools.py
index 16bf911a..ca42f7b7 100644
--- a/wqflask/utility/redis_tools.py
+++ b/wqflask/utility/redis_tools.py
@@ -108,7 +108,7 @@ def get_group_info(group_id):
 def create_group(admin_member_ids, user_member_ids = [], group_name = ""):
     group_id = str(uuid.uuid4())
     new_group = {
-        "id"    : group_id
+        "id"    : group_id,
         "admins": admin_member_ids,
         "users" : user_member_ids,
         "name"  : group_name,
diff --git a/wqflask/wqflask/marker_regression/rqtl_mapping.py b/wqflask/wqflask/marker_regression/rqtl_mapping.py
index dd35d89a..ecce9a07 100644
--- a/wqflask/wqflask/marker_regression/rqtl_mapping.py
+++ b/wqflask/wqflask/marker_regression/rqtl_mapping.py
@@ -156,6 +156,9 @@ def generate_cross_from_geno(dataset, scale_units):        # TODO: Need to figur
          if(type == '4-way'){
            cat('Loading in as 4-WAY\n')
            cross = read.cross(file=out, 'csvr', genotypes=genocodes, crosstype="4way", convertXdata=FALSE)                 # Load the created cross file using R/qtl read.cross
+         }else if(type == 'f2'){
+           cat('Loading in as F2\n')
+           cross = read.cross(file=out, 'csvr', genotypes=genocodes, crosstype="f2")                                       # Load the created cross file using R/qtl read.cross
          }else{
            cat('Loading in as normal\n')
            cross = read.cross(file=out, 'csvr', genotypes=genocodes)                                                       # Load the created cross file using R/qtl read.cross
-- 
cgit v1.2.3