aboutsummaryrefslogtreecommitdiff
path: root/wqflask/base
diff options
context:
space:
mode:
authorPjotr Prins2016-10-31 20:22:27 +0000
committerPjotr Prins2016-10-31 20:22:27 +0000
commitc667e0ac0fd24f9a44b542bdde36bb70c63a231c (patch)
tree2e45a34a9fbdde899abf97651acd08a2541502a9 /wqflask/base
parentb15d37ca15256f5ee129ccc7b6dbf169e5f23352 (diff)
parenta2d45b9c5593e4ecf37850db69d3bcd8c673419d (diff)
downloadgenenetwork2-c667e0ac0fd24f9a44b542bdde36bb70c63a231c.tar.gz
Merge branch 'master' of github.com:lyan6/genenetwork2 into lyan
Diffstat (limited to 'wqflask/base')
-rw-r--r--wqflask/base/data_set.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/wqflask/base/data_set.py b/wqflask/base/data_set.py
index fddfce58..918932fa 100644
--- a/wqflask/base/data_set.py
+++ b/wqflask/base/data_set.py
@@ -278,6 +278,7 @@ class DatasetGroup(object):
self.incparentsf1 = False
self.allsamples = None
self._datasets = None
+ self.genofile = None
def get_specified_markers(self, markers = []):
self.markers = HumanMarkers(self.name, markers)
@@ -408,7 +409,10 @@ class DatasetGroup(object):
genotype_1 = reaper.Dataset()
# reaper barfs on unicode filenames, so here we ensure it's a string
- full_filename = str(locate(self.name+'.geno','genotype'))
+ if self.genofile:
+ full_filename = str(locate(self.genofile, 'genotype'))
+ else:
+ full_filename = str(locate(self.name + '.geno', 'genotype'))
genotype_1.read(full_filename)
if genotype_1.type == "group" and self.parlist: