Improve robustness of check on choice coefs

The check now extends to both b1 and b2 coefficients and ensures the coefficient value is a float as expected, with anything other than a float resulting in the default set of coefficients being chosen.

Author: jtlangevin

scout/ecm_prep.py

@@ -5567,10 +5567,10 @@ def fill_mkts(self, msegs, msegs_cpl, convert_data, tsv_data_init, opts,
                                              "choice data structure for segment '" + str(mskeys))
                         # Ensure dictionary has end point data to draw from; if not, set segment
                         # coefficients to a default and notify user in verbose mode
-                        if (tiered_flag and (
-                            any([x[1] in [0, "NA"] for x in choice_dict["typical"]["b1"].items()]))
-                            or (not tiered_flag and
-                                any([x[1] in [0, "NA"] for x in choice_dict["b1"].items()]))):
+                        if (tiered_flag and (any([any([not isinstance(x[1], float) for
+                            x in choice_dict["typical"][coef].items()]) for coef in ["b1", "b2"]]))
+                            or (not tiered_flag and any([any([not isinstance(x[1], float) for
+                                x in choice_dict[coef].items()]) for coef in ["b1", "b2"]]))):
                             choice_params = self.use_deflt_res_choice(mskeys, consume_warn, opts)
                         # Case where checks above have cleared and the coefficients are tiered
                         # (best vs. typical)