diff options
| author | zsloan | 2016-03-18 15:57:18 +0000 |
|---|---|---|
| committer | zsloan | 2016-03-18 15:57:18 +0000 |
| commit | d4cf1581d13dcf2ba68d33f7fde48392e1c5a063 (patch) | |
| tree | d0a5eb45968cac4fb741888dfc6f42307ece9223 /wqflask/base/data_set.py | |
| parent | c64e7f8e6742ff37e6d9446c825492264d531858 (diff) | |
| parent | e1b62e892ef132296429b1f6197686e4866ab648 (diff) | |
| download | genenetwork2-d4cf1581d13dcf2ba68d33f7fde48392e1c5a063.tar.gz | |
Merge branch 'development' of github.com:genenetwork/genenetwork2
Diffstat (limited to 'wqflask/base/data_set.py')
| -rwxr-xr-x | wqflask/base/data_set.py | 9 |
1 files changed, 5 insertions, 4 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) |