Merge pull request #524 from brentp/auto_dom_unknown

fix parens for unknown parents and update docs.
arq5x · Aug 13, 2015 · ec34c00 · ec34c00
2 parents 45284e0 + 4479cae
commit ec34c00
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/docs/content/tools.rst b/docs/content/tools.rst
@@ -594,8 +594,8 @@ Genotype Requirements
 - [affected] No unaffected can be het or homalt (can be unknown)
 - de_novo mutations are not auto_dom (at least not in the first generation)
 - At least 1 affected must have 1 affected parent.
-- [strict] All affecteds must have parents with known phenotype.
-- [strict] All affected kids must have at least 1 affected parent
+- [strict] All affected with parents must have at least 1 affected parent
+- [strict] All affecteds with parents must have parents with known phenotype.
 - [strict] If no affected has a parent, a warning is issued.
 
 

diff --git a/gemini/family.py b/gemini/family.py
@@ -435,7 +435,7 @@ def auto_dom(self, min_depth=0, gt_ll=False, strict=True, only_affected=True):
                     kid_with_known_parents = True
                 # if he has a mom and dad that arent unknown, at least one of them must be affected
                 if not None in (kid.mom.affected, kid.dad.affected):
-                    if not kid.mom.affected or kid.dad.affected: return 'False'
+                    if not (kid.mom.affected or kid.dad.affected): return 'False'
 
         if strict and not kid_with_known_parents:
             return 'False'