diff options
| author | zsloan | 2016-05-26 22:13:44 +0000 |
|---|---|---|
| committer | zsloan | 2016-05-26 22:13:44 +0000 |
| commit | 32f53c957b0aa71c01077bd243bdb693e04b368e (patch) | |
| tree | 0988c61ee94c0c1a3488c4b64aa50464a9a28a03 /wqflask | |
| parent | 29b50856ab9b9ef87b81228b782dd6bebe28b7c1 (diff) | |
| download | genenetwork2-32f53c957b0aa71c01077bd243bdb693e04b368e.tar.gz | |
Issue with certain samples (like BXD65a, ones were there are multiple for a single BXD or whatever) should be fixed for different mapping methods and data set types
Renamed directories with genotypes so tools.py didn't need to be changed (which might mess up other deployments)
Fixed error when searching genotype data sets
Diffstat (limited to 'wqflask')
| -rw-r--r-- | wqflask/base/trait.py | 2 | ||||
| -rw-r--r-- | wqflask/base/webqtlConfig.py | 2 | ||||
| -rw-r--r-- | wqflask/wqflask/marker_regression/marker_regression.py | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/wqflask/base/trait.py b/wqflask/base/trait.py index 05ee3d96..4fc95a60 100644 --- a/wqflask/base/trait.py +++ b/wqflask/base/trait.py @@ -481,7 +481,7 @@ class GeneralTrait(object): else: self.locus = self.lrs = self.additive = "" - if self.locus_chr != "" and self.locus_mb != "": + if (self.dataset.type == 'Publish' or self.dataset.type == "ProbeSet") and self.locus_chr != "" and self.locus_mb != "": #XZ: LRS_location_value is used for sorting try: LRS_location_value = int(self.locus_chr)*1000 + float(self.locus_mb) diff --git a/wqflask/base/webqtlConfig.py b/wqflask/base/webqtlConfig.py index 0358bcbf..d0016b33 100644 --- a/wqflask/base/webqtlConfig.py +++ b/wqflask/base/webqtlConfig.py @@ -69,7 +69,7 @@ GENERATED_TEXT_DIR = mk_dir(TMPDIR+'/generated_text/') # Flat file directories GENODIR = flat_files('genotype')+'/' -JSON_GENODIR = assert_dir(GENODIR+'json/') +JSON_GENODIR = flat_files('json')+'/' PORTADDR = "http://50.16.251.170" diff --git a/wqflask/wqflask/marker_regression/marker_regression.py b/wqflask/wqflask/marker_regression/marker_regression.py index 9cd02bd1..1e0a618e 100644 --- a/wqflask/wqflask/marker_regression/marker_regression.py +++ b/wqflask/wqflask/marker_regression/marker_regression.py @@ -213,6 +213,8 @@ class MarkerRegression(object): if 'lod_score' in marker.keys(): self.qtl_results.append(marker) + self.trimmed_markers = trim_markers_for_table(results) + for qtl in enumerate(self.qtl_results): self.json_data['chr1'].append(str(qtl['chr1'])) self.json_data['chr2'].append(str(qtl['chr2'])) |