From 26ae2b240cb2d0a0e81091ffd521ed287f28f7f6 Mon Sep 17 00:00:00 2001 From: Manuel Holtgrewe Date: Thu, 25 Aug 2022 14:42:08 +0200 Subject: [PATCH] Fix bug with G1K freqs in SV filtration (#619) Closes: #619 Related-Issue: #619 Projected-Results-Impact: require-revalidation --- HISTORY.rst | 2 ++ svs/queries.py | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/HISTORY.rst b/HISTORY.rst index 35b245865..061af66bc 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -44,6 +44,7 @@ End-User Summary - Adding distinct de novo genotype setting (#562). - Adding section presets for SV filtration (#616). - Adjusting SV filtration presets (#616). +- Fix bug with thousand genomes frequencies in SV filtration (#619). Full Change List ================ @@ -83,6 +84,7 @@ Full Change List - Adding distinct de novo genotype setting (#562). - Adding section presets for SV filtration (#616). - Adjusting SV filtration presets (#616). +- Fix bug with thousand genomes frequencies in SV filtration (#619). ------ v1.2.0 diff --git a/svs/queries.py b/svs/queries.py index 95e5bb2e8..a96629182 100644 --- a/svs/queries.py +++ b/svs/queries.py @@ -385,6 +385,7 @@ def extend_fields(self, _query_parts): def extend_conditions(self, _query_parts): result = [] for token, _, _ in self.TOKEN_MODEL_FIELD: + entity = "alleles" if token == "g1k" else "carriers" if ( self.kwargs.get("%s_enabled" % token, False) and ("%s_overlap_count" % token) in self.fields @@ -392,7 +393,7 @@ def extend_conditions(self, _query_parts): ): result.append( self.fields["%s_overlap_count" % token] - <= self.kwargs["%s_max_carriers" % token] + <= self.kwargs["%s_max_%s" % (token, entity)] ) return result