Skip to content

Commit cf99f65

Browse files
committed
Adds an extra check in case 'fixedAlpha_on' is unset, but 'alpha' and 'alphaPropSD' values are provided
1 parent a66fbab commit cf99f65

File tree

1 file changed

+12
-5
lines changed

1 file changed

+12
-5
lines changed

structure_threader/wrappers/maverick_wrapper.py

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,15 @@ def mav_cli_generator(arg, k_val, mav_params):
5151
root_dir, "-parameters", arg.params]
5252
if arg.notests is True:
5353
cli += ["-thermodynamic_on", "f"]
54-
failsafe = mav_alpha_failsafe(mav_params, arg.k_list)
55-
for param in failsafe:
56-
if failsafe[param] is not False:
57-
cli += ["-" + param, failsafe[param][k_val]]
54+
try:
55+
if mav_params["fixAlpha_on"].lower() in ("f", "0", "false"):
56+
failsafe = mav_alpha_failsafe(mav_params, arg.k_list)
57+
for param in failsafe:
58+
if failsafe[param] is not False:
59+
cli += ["-" + param, failsafe[param][k_val]]
60+
except KeyError:
61+
logging.critical("'fixAlpha_on' parameter is not set. Please set it in"
62+
" 'parameters.txt' file and try again.")
5863

5964
return cli, output_dir
6065

@@ -80,7 +85,9 @@ def mav_ti_in_use(parameters):
8085

8186
def mav_params_parser(parameter_filename):
8287
"""
83-
Parses MavericK's parameter file and returns the results in a dict.
88+
Parses MavericK's parameter file and returns the results in a dict with
89+
the following structure:
90+
{parsed_parameter: param_value, parsed_parameter: param_value ...}
8491
"""
8592
param_file = open(parameter_filename, "r")
8693
parameters = {}

0 commit comments

Comments
 (0)