diff options
| author | zsloan | 2018-04-09 18:13:59 +0000 |
|---|---|---|
| committer | zsloan | 2018-04-09 18:13:59 +0000 |
| commit | bd6d36ddb366a3ee427a0c237ebf8f672606ff19 (patch) | |
| tree | 761e95485b546e2f988503f40c8cb7bd432a4ce9 /wqflask/wqflask | |
| parent | 1cf4b598dd986760627eef4144c0445679c97866 (diff) | |
| download | genenetwork2-bd6d36ddb366a3ee427a0c237ebf8f672606ff19.tar.gz | |
Fixed issue that caused and error for certain types of mapping due to variable not being initialized
Removed a bunch of unused statistical functions from Plot.py and webqtlUtil.py. I figure that if we ever need them again, there's probably some third party library that includes them.
Also removed unused file AJAX_table.py and other unused code from several other files
Diffstat (limited to 'wqflask/wqflask')
| -rw-r--r-- | wqflask/wqflask/marker_regression/marker_regression_gn1.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/wqflask/wqflask/marker_regression/marker_regression_gn1.py b/wqflask/wqflask/marker_regression/marker_regression_gn1.py index c196b58b..632c2f8f 100644 --- a/wqflask/wqflask/marker_regression/marker_regression_gn1.py +++ b/wqflask/wqflask/marker_regression/marker_regression_gn1.py @@ -1160,6 +1160,7 @@ class MarkerRegression(object): else: string1 = 'Mapping for Dataset: %s, mapping on Chromosome %s' % (self.dataset.group.name, self.ChrList[self.selectedChr][0]) + string3 = '' if self.mapping_method == "gemma" or self.mapping_method == "gemma_bimbam": if self.use_loco == "True": string2 = 'Using GEMMA mapping method with LOCO and ' @@ -1170,7 +1171,7 @@ class MarkerRegression(object): cofactor_names = ", ".join([covar.split(":")[0] for covar in self.covariates.split(",")]) string3 = cofactor_names else: - string2 += 'no cofactors.' + string2 += 'no cofactors' string3 = '' elif self.mapping_method == "rqtl_plink" or self.mapping_method == "rqtl_geno": string2 = 'Using R/qtl mapping method with ' @@ -1179,7 +1180,7 @@ class MarkerRegression(object): else: string2 += 'no control for other QTLs' elif self.mapping_method == "plink": - string2 = 'Using PLINK mapping method with no control for other QTLs.' + string2 = 'Using PLINK mapping method with no control for other QTLs' else: string2 = 'Using Haldane mapping function with ' if self.controlLocus and self.doControl != "false": |