aboutsummaryrefslogtreecommitdiff
path: root/wqflask/base
diff options
context:
space:
mode:
authorzsloan2016-03-18 15:57:18 +0000
committerzsloan2016-03-18 15:57:18 +0000
commitd4cf1581d13dcf2ba68d33f7fde48392e1c5a063 (patch)
treed0a5eb45968cac4fb741888dfc6f42307ece9223 /wqflask/base
parentc64e7f8e6742ff37e6d9446c825492264d531858 (diff)
parente1b62e892ef132296429b1f6197686e4866ab648 (diff)
downloadgenenetwork2-d4cf1581d13dcf2ba68d33f7fde48392e1c5a063.tar.gz
Merge branch 'development' of github.com:genenetwork/genenetwork2
Diffstat (limited to 'wqflask/base')
-rwxr-xr-xwqflask/base/data_set.py9
-rwxr-xr-xwqflask/base/trait.py2
2 files changed, 6 insertions, 5 deletions
diff --git a/wqflask/base/data_set.py b/wqflask/base/data_set.py
index 6cabadb1..e37a838f 100755
--- a/wqflask/base/data_set.py
+++ b/wqflask/base/data_set.py
@@ -54,7 +54,7 @@ from pprint import pformat as pf
# Each subclass will add to this
DS_NAME_MAP = {}
-def create_dataset(dataset_name, dataset_type = None):
+def create_dataset(dataset_name, dataset_type = None, get_samplelist = True):
if not dataset_type:
dataset_type = Dataset_Getter(dataset_name)
#dataset_type = get_dataset_type_from_json(dataset_name)
@@ -71,7 +71,7 @@ def create_dataset(dataset_name, dataset_type = None):
dataset_ob = DS_NAME_MAP[dataset_type]
dataset_class = globals()[dataset_ob]
- return dataset_class(dataset_name)
+ return dataset_class(dataset_name, get_samplelist)
#def get_dataset_type_from_json(dataset_name):
@@ -501,7 +501,7 @@ class DataSet(object):
"""
- def __init__(self, name):
+ def __init__(self, name, get_samplelist = True):
assert name, "Need a name"
self.name = name
@@ -517,7 +517,8 @@ class DataSet(object):
self.retrieve_other_names()
self.group = DatasetGroup(self) # sets self.group and self.group_id and gets genotype
- self.group.get_samplelist()
+ if get_samplelist == True:
+ self.group.get_samplelist()
self.species = species.TheSpecies(self)
diff --git a/wqflask/base/trait.py b/wqflask/base/trait.py
index ff149ba3..acff38d9 100755
--- a/wqflask/base/trait.py
+++ b/wqflask/base/trait.py
@@ -67,7 +67,7 @@ class GeneralTrait(object):
# Todo: These two lines are necessary most of the time, but perhaps not all of the time
# So we could add a simple if statement to short-circuit this if necessary
self.retrieve_info(get_qtl_info=get_qtl_info)
- if kw.get('get_sample_info') != False:
+ if get_sample_info != False:
self.retrieve_sample_data()