From bcf0fef36ff6b020667abbc1f03307efffb71653 Mon Sep 17 00:00:00 2001 From: Hannah Bruce Macdonald <43652597+hannahbrucemacdonald@users.noreply.github.com> Date: Fri, 28 Aug 2020 10:34:10 +0100 Subject: [PATCH] Update setup_relative_calculation.py flipping conditional statement for `remove_constraiint` --- perses/app/setup_relative_calculation.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/perses/app/setup_relative_calculation.py b/perses/app/setup_relative_calculation.py index 8aa1b81f4..8e56b1254 100644 --- a/perses/app/setup_relative_calculation.py +++ b/perses/app/setup_relative_calculation.py @@ -88,13 +88,13 @@ def getSetupOptions(filename): if 'small_molecule_parameters_cache' not in setup_options: setup_options['small_molecule_parameters_cache'] = None + if 'remove_constraints' not in setup_options: + setup_options['remove_constraints'] = False + _logger.info('No constraints will be removed') # remove_constraints can be 'all' or 'not water' - if setup_options['remove_constraints'] not in ['all', 'not water']: + elif setup_options['remove_constraints'] not in ['all', 'not water', False]: _logger.warning("remove_constraints value of {setup_options['remove_constraints']} not understood. 'all', 'none' or 'not water' are valid options. NOT REMOVING ANY CONSTRAINTS") setup_options['remove_constraints'] = False - elif 'remove_constraints' not in setup_options: - setup_options['remove_constraints'] = False - _logger.info('No constraints will be removed') if 'spectators' not in setup_options: _logger.info(f'No spectators')