diff options
| author | zsloan | 2018-11-20 12:08:47 -0600 |
|---|---|---|
| committer | zsloan | 2018-11-20 12:08:47 -0600 |
| commit | dc3bc97b2ae2e751f68ad63359734d569895c711 (patch) | |
| tree | 7c5babb0be647bffab814e73b165ba27a9568473 /wqflask/maintenance | |
| parent | c9af6d0f32843b8e2c9f3c9d472ae02846582f1a (diff) | |
| download | genenetwork2-dc3bc97b2ae2e751f68ad63359734d569895c711.tar.gz | |
Added option to select chromosome from trait page when mapping
Put transform/blocking tools into their own tab (still need to change formatting of tab's contents)
Improved appearance of search result page table (still need to change a few other tables)
Fixed issue that caused parent/f1 strains to not be blocked correctly when using "block by index" tool
Basic Stats figures now load when the user clicks the tab, to improve initial page load time
Diffstat (limited to 'wqflask/maintenance')
| -rw-r--r-- | wqflask/maintenance/generate_kinship_from_bimbam.py | 4 | ||||
| -rw-r--r-- | wqflask/maintenance/geno_to_json.py | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/wqflask/maintenance/generate_kinship_from_bimbam.py b/wqflask/maintenance/generate_kinship_from_bimbam.py index ad0eb036..b53f5dda 100644 --- a/wqflask/maintenance/generate_kinship_from_bimbam.py +++ b/wqflask/maintenance/generate_kinship_from_bimbam.py @@ -54,8 +54,8 @@ class GenerateKinshipMatrices(object): if __name__=="__main__": - Geno_Directory = """/home/zas1024/genotype_files/genotype/""" - Bimbam_Directory = """/home/zas1024/genotype_files/genotype/bimbam/""" + Geno_Directory = """/export/local/home/zas1024/genotype_files/genotype/""" + Bimbam_Directory = """/export/local/home/zas1024/genotype_files/genotype/bimbam/""" GenerateKinshipMatrices.process_all(Geno_Directory, Bimbam_Directory) #./gemma -g /home/zas1024/genotype_files/genotype/bimbam/BXD_geno.txt -p /home/zas1024/genotype_files/genotype/bimbam/BXD_pheno.txt -gk 1 -o BXD
\ No newline at end of file diff --git a/wqflask/maintenance/geno_to_json.py b/wqflask/maintenance/geno_to_json.py index 789a1691..9579812a 100644 --- a/wqflask/maintenance/geno_to_json.py +++ b/wqflask/maintenance/geno_to_json.py @@ -24,6 +24,8 @@ import simplejson as json from pprint import pformat as pf +#from utility.tools import flat_files + class EmptyConfigurations(Exception): pass @@ -183,8 +185,8 @@ class ConvertGenoFile(object): if __name__=="__main__": - Old_Geno_Directory = """/home/zas1024/genotype_files/genotype/""" - New_Geno_Directory = """/home/zas1024/genotype_files/genotype/json/""" + Old_Geno_Directory = """/export/local/home/zas1024/gn2-zach/genotype_files/genotype""" + New_Geno_Directory = """/export/local/home/zas1024/gn2-zach/genotype_files/genotype/json""" #Input_File = """/home/zas1024/gene/genotype_files/genotypes/BXD.geno""" #Output_File = """/home/zas1024/gene/wqflask/wqflask/pylmm/data/bxd.snps""" #convertob = ConvertGenoFile("/home/zas1024/gene/genotype_files/genotypes/SRxSHRSPF2.geno", "/home/zas1024/gene/genotype_files/new_genotypes/SRxSHRSPF2.json") |