Skip to content

Commit

Permalink
Merge pull request #653 from choderalab/run-fix
Browse files Browse the repository at this point in the history
Fixing setup_relative_calculation
  • Loading branch information
hannahbrucemacdonald committed Mar 11, 2020
2 parents b816070 + fe03eaa commit b1d44f4
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 deletions.
13 changes: 7 additions & 6 deletions perses/app/setup_relative_calculation.py
Original file line number Diff line number Diff line change
Expand Up @@ -574,13 +574,14 @@ def run_setup(setup_options):
return {'topology_proposals': top_prop, 'hybrid_topology_factories': htf, 'hybrid_samplers': hss}


def run():
def run(yaml_filename=None):
_logger.info("Beginning Setup...")
try:
yaml_filename = sys.argv[1]
_logger.info(f"Detected yaml file: {yaml_filename}")
except IndexError as e:
_logger.critical(f"You must specify the setup yaml file as an argument to the script.")
if yaml_filename is None:
try:
yaml_filename = sys.argv[1]
_logger.info(f"Detected yaml file: {yaml_filename}")
except IndexError as e:
_logger.critical(f"You must specify the setup yaml file as an argument to the script.")

_logger.info(f"Getting setup options from {yaml_filename}")
setup_options = getSetupOptions(yaml_filename)
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ def find_package_data(data_root, package_root):


# #########################
VERSION = '0.5.1'
ISRELEASED = False
VERSION = '0.5.2'
ISRELEASED = True
__version__ = VERSION
# #########################

Expand Down

0 comments on commit b1d44f4

Please sign in to comment.