From 9b0264bf13e994298de95a4e08198336b6c97a38 Mon Sep 17 00:00:00 2001
From: Zachary Sloan
Date: Thu, 7 Feb 2013 17:58:34 -0600
Subject: Added code to marker_regression.py that creates the numpy arrays to
 pass to Nick's code and changed the prep_data.py code to operate on a list of
 phenotype values instead of a textfile with the values delimited

---
 wqflask/base/webqtlConfig.py      | 3 ++-
 wqflask/base/webqtlConfigLocal.py | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'wqflask/base')

diff --git a/wqflask/base/webqtlConfig.py b/wqflask/base/webqtlConfig.py
index d5f09b64..d05fa6e0 100755
--- a/wqflask/base/webqtlConfig.py
+++ b/wqflask/base/webqtlConfig.py
@@ -55,8 +55,9 @@ HTMLPATH = GNROOT + 'web/'
 IMGDIR = HTMLPATH +'image/'
 IMAGESPATH = HTMLPATH + 'images/'
 UPLOADPATH = IMAGESPATH + 'upload/'
-TMPDIR = '/tmp/'
+TMPDIR = HTMLPATH + 'tmp/'
 GENODIR = HTMLPATH + 'genotypes/'
+NEWGENODIR = HTMLPATH + 'new_genotypes/'
 GENO_ARCHIVE_DIR = GENODIR + 'archive/'
 TEXTDIR = HTMLPATH + 'ProbeSetFreeze_DataMatrix/'
 CMDLINEDIR = HTMLPATH + 'webqtl/cmdLine/'
diff --git a/wqflask/base/webqtlConfigLocal.py b/wqflask/base/webqtlConfigLocal.py
index 84686234..8e3e0bbe 100755
--- a/wqflask/base/webqtlConfigLocal.py
+++ b/wqflask/base/webqtlConfigLocal.py
@@ -12,7 +12,7 @@ DB_UPDNAME = 'db_webqtl_zas1024'
 DB_UPDUSER = 'webqtl'
 DB_UPDPASSWD = 'webqtl'
 
-GNROOT = '/home/zas1024/gn/'
+GNROOT = '/home/zas1024/gene/'
 ROOT_URL = 'http://alexandria.uthsc.edu:91/'
 PythonPath = '/usr/bin/python'
 PIDDLE_FONT_PATH = '/usr/lib/python2.4/site-packages/piddle/truetypefonts/'
-- 
cgit 1.4.1