aboutsummaryrefslogtreecommitdiff
path: root/wqflask/base
diff options
context:
space:
mode:
authorLei Yan2016-10-29 05:25:37 +0000
committerLei Yan2016-10-29 05:25:37 +0000
commita2d45b9c5593e4ecf37850db69d3bcd8c673419d (patch)
tree4c8c970ae633a2f44d9f145c49353823a2c2405d /wqflask/base
parent28da8f4304f406b4eff5ad68757735a0cb524e94 (diff)
downloadgenenetwork2-a2d45b9c5593e4ecf37850db69d3bcd8c673419d.tar.gz
For those case that we have multiple genotypes we would like to add a selector.
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: