diff options
author | Lei Yan | 2013-09-13 14:07:27 -0500 |
---|---|---|
committer | Lei Yan | 2013-09-13 14:07:27 -0500 |
commit | af24c0d610d9a2189f86677e4f23deb372ee2bf7 (patch) | |
tree | 53480351b97727670637a37dbd4c78e52446ae88 /wqflask/utility | |
parent | 155e2997613c0750de30b734686f8977524956f9 (diff) | |
parent | c5fc931621707865357ace4b637db7481e0be552 (diff) | |
download | genenetwork2-af24c0d610d9a2189f86677e4f23deb372ee2bf7.tar.gz |
Merge https://github.com/zsloan/genenetwork
Resolved conflicts:
wqflask/base/trait.py
wqflask/wqflask/correlation/correlationFunction.py
wqflask/wqflask/correlation/correlation_function.py
wqflask/wqflask/correlation/correlation_functions.py
wqflask/wqflask/correlation/show_corr_results.py
Diffstat (limited to 'wqflask/utility')
-rw-r--r-- | wqflask/utility/helper_functions.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/wqflask/utility/helper_functions.py b/wqflask/utility/helper_functions.py index d76a32ce..44f5321e 100644 --- a/wqflask/utility/helper_functions.py +++ b/wqflask/utility/helper_functions.py @@ -8,11 +8,14 @@ from base.species import TheSpecies def get_species_dataset_trait(self, start_vars): #assert type(read_genotype) == type(bool()), "Expecting boolean value for read_genotype" self.dataset = data_set.create_dataset(start_vars['dataset']) + print("After creating dataset") self.species = TheSpecies(dataset=self.dataset) + print("After creating species") self.this_trait = GeneralTrait(dataset=self.dataset, name=start_vars['trait_id'], cellid=None) + print("After creating trait") #if read_genotype: - self.dataset.group.read_genotype_file() + #self.dataset.group.read_genotype_file() #self.genotype = self.dataset.group.genotype |