mergeron 2024.738930.0__py3-none-any.whl → 2024.738936.2__py3-none-any.whl

mergeron/examples/investigations_stats_sim_tables.py

@@ -11,7 +11,7 @@ from collections.abc import Mapping, Sequence
 from datetime import datetime, timedelta
 from io import TextIOWrapper
 from pathlib import Path
-from typing import Any, Literal
+from typing import Any
 
 import numpy as np
 import re2 as re  # type: ignore
@@ -19,6 +19,7 @@ import tables as ptb  # type: ignore
 from attrs import evolve
 
 import mergeron.core.ftc_merger_investigations_data as fid
+import mergeron.core.guidelines_standards as gsf
 import mergeron.gen.data_generation as dgl
 import mergeron.gen.guidelines_tests as gtl
 import mergeron.gen.investigations_stats as isl
@@ -29,25 +30,25 @@ from mergeron.core.proportions_tests import propn_ci
 if not sys.warnoptions:
     warnings.simplefilter("ignore")  # , category="RuntimeWarning")
 
-dottex_format_str = "BenchmarkingGUPPISafeharbor_DRAFT_FTC{}RateCITables_{}_{}_SYM.tex"
+dottex_format_str = "FTC{}RateCITables_{}_{}_SYM.tex"
 stats_table_content = isl.StatsContainer()
 stats_table_design = isl.latex_jinja_env.get_template(
     "clrrate_cis_summary_table_template.tex.jinja2"
 )
 
 
-def inv_stats_sim_setup(
+def invres_stats_sim_setup(
     _invdata: fid.INVData,
     _data_period: str,
     _merger_class: isl.INDGRPConstants | isl.EVIDENConstants,
-    _inv_parm_vec: Sequence[float],
+    _invres_parm_vec: gsf.GuidelinesSTD,
     _sample_spec: dgl.MarketSampleSpec,
-    _inv_stats_kwargs: Mapping[str, Any] | None = None,
+    _invres_stats_kwargs: Mapping[str, Any] | None = None,
     /,
-) -> None:
+) -> str:
     _table_ind_group = (
         _merger_class
-        if _merger_class == isl.INDGRPConstants.IIC
+        if isinstance(_merger_class, isl.INDGRPConstants)
         else isl.INDGRPConstants.ALL
     )
     _table_evid_cond = (
@@ -56,18 +57,25 @@ def inv_stats_sim_setup(
         else isl.EVIDENConstants.UR
     )
 
-    _inv_stats_kwargs = _inv_stats_kwargs or {"sim_inv_sel": isl.PolicySelector.ENFT}
-    _sim_inv_sel = _inv_stats_kwargs["sim_inv_sel"]
-    _inv_sel, _guppi_wgtng_policy, _divr_wgtng_policy = _sim_inv_sel
+    _invres_stats_kwargs = _invres_stats_kwargs or {
+        "sim_test_regime": isl.PolicySelector.ENFT
+    }
+    _sim_test_regime = _invres_stats_kwargs["sim_test_regime"]
+    _test_regime, _guppi_wgtng_policy, _divr_wgtng_policy = _sim_test_regime
 
     # Get observed rates
     (
-        _inv_cnts_obs_byfirmcount_array,
-        _inv_cnts_obs_bydelta_array,
-        _inv_cnts_obs_byconczone_array,
+        _invres_cnts_obs_byfirmcount_array,
+        _invres_cnts_obs_bydelta_array,
+        _invres_cnts_obs_byconczone_array,
     ) = (
-        isl.inv_stats_cnts_by_group(
-            _invdata, _data_period, _table_ind_group, _table_evid_cond, _grp, _inv_sel
+        isl.invres_stats_cnts_by_group(
+            _invdata,
+            _data_period,
+            _table_ind_group,
+            _table_evid_cond,
+            _grp,
+            _test_regime,
         )
         for _grp in (
             isl.StatsGrpSelector.FC,
@@ -82,17 +90,19 @@ def inv_stats_sim_setup(
             dgl.RECConstants.INOUT,
             dgl.SHRConstants.DIR_FLAT,
             None,
-            _inv_cnts_obs_byfirmcount_array[:-1, 1],
+            _invres_cnts_obs_byfirmcount_array[:-1, 1],
         ),
     )
 
     # Generate simulated rates
     _start_time = datetime.now()
     (
-        _inv_cnts_sim_byfirmcount_array,
-        _inv_cnts_sim_bydelta_array,
-        _inv_cnts_sim_byconczone_array,
-    ) = gtl.sim_inv_cnts_ll(_inv_parm_vec, _sample_spec_here, _inv_stats_kwargs)
+        _invres_cnts_sim_byfirmcount_array,
+        _invres_cnts_sim_bydelta_array,
+        _invres_cnts_sim_byconczone_array,
+    ) = gtl.sim_invres_cnts_ll(
+        _invres_parm_vec, _sample_spec_here, _invres_stats_kwargs
+    )
     _total_duration = datetime.now() - _start_time
 
     print(
@@ -102,16 +112,16 @@ def inv_stats_sim_setup(
     # Prepare and write/print output tables
     _stats_group_dict = {
         isl.StatsGrpSelector.FC: {
-            "desc": f"{_inv_sel.capitalize()} rates by firm count",
+            "desc": f"{_test_regime.capitalize()} rates by firm count",
             "title_str": "By Number of Significant Competitors",
             "hval": "Firm Count",
             "hcol_width": 54,
             "notewidth": 0.63,
-            "obs_array": _inv_cnts_obs_byfirmcount_array,
-            "sim_array": _inv_cnts_sim_byfirmcount_array,
+            "obs_array": _invres_cnts_obs_byfirmcount_array,
+            "sim_array": _invres_cnts_sim_byfirmcount_array,
         },
         isl.StatsGrpSelector.DL: {
-            "desc": Rf"{_inv_sel.capitalize()} rates by range of $\Delta HHI$",
+            "desc": Rf"{_test_regime.capitalize()} rates by range of $\Delta HHI$",
             "title_str": R"By Change in Concentration (\Deltah{})",
             "hval": R"$\Delta HHI$",
             "hval_plus": R"{ $[\Delta_L, \Delta_H)$ }",
@@ -126,11 +136,11 @@ def inv_stats_sim_setup(
                 isl.LTX_ARRAY_LINEEND,
                 isl.LTX_ARRAY_LINEEND,
             )),
-            "obs_array": _inv_cnts_obs_bydelta_array,
-            "sim_array": _inv_cnts_sim_bydelta_array,
+            "obs_array": _invres_cnts_obs_bydelta_array,
+            "sim_array": _invres_cnts_sim_bydelta_array,
         },
         isl.StatsGrpSelector.ZN: {
-            "desc": f"{_inv_sel.capitalize()} rates by Approximate Presumption Zone",
+            "desc": f"{_test_regime.capitalize()} rates by Approximate Presumption Zone",
             "title_str": "{} {}".format(
                 R"By Approximate \textit{2010 Guidelines}",
                 "Concentration-Based Standards",
@@ -138,39 +148,41 @@ def inv_stats_sim_setup(
             "hval": "Approximate Standard",
             "hcol_width": 190,
             "notewidth": 0.96,
-            "obs_array": _inv_cnts_obs_byconczone_array,
-            "sim_array": _inv_cnts_sim_byconczone_array,
+            "obs_array": _invres_cnts_obs_byconczone_array,
+            "sim_array": _invres_cnts_sim_byconczone_array,
         },
     }
 
-    with (
-        DATA_DIR
-        / dottex_format_str.format(
-            _inv_sel.capitalize(),
-            _merger_class.replace(" ", ""),
-            _data_period.split("-")[1],
-        )
-    ).open("w", encoding="UTF-8") as _stats_table_dottex:
+    _stats_table_name = dottex_format_str.format(
+        _test_regime.capitalize(),
+        _merger_class.replace(" ", ""),
+        _data_period.split("-")[1],
+    )
+    with (DATA_DIR / _stats_table_name).open(
+        "w", encoding="UTF-8"
+    ) as _stats_table_file:
         for _stats_group_key in _stats_group_dict:
-            inv_stats_sim_render(
+            invres_stats_sim_render(
                 _data_period,
                 _merger_class,
                 _stats_group_key,
                 _stats_group_dict[_stats_group_key],
-                _inv_parm_vec,
-                _inv_stats_kwargs["sim_inv_sel"],
-                _stats_table_dottex,
+                _invres_parm_vec,
+                _invres_stats_kwargs["sim_test_regime"],
+                _stats_table_file,
             )
 
+    return _stats_table_name
+
 
-def inv_stats_sim_render(
+def invres_stats_sim_render(
     _data_period: str,
     _merger_class: isl.INDGRPConstants | isl.EVIDENConstants,
     _stats_group: isl.StatsGrpSelector,
     _stats_group_dict_sub: Mapping[str, Any],
-    _inv_parm_vec: Sequence[float],
-    _sim_inv_sel: gtl.UPPTestSpec,
-    _stats_table_dottex: TextIOWrapper,
+    _invres_parm_vec: gsf.GuidelinesSTD,
+    _sim_test_regime: gtl.UPPTestRegime,
+    _stats_table_file: TextIOWrapper,
     /,
 ) -> None:
     _stats_table_content = isl.StatsContainer()
@@ -180,21 +192,21 @@ def inv_stats_sim_render(
         for _g, _h in (("obs_array", -2), ("sim_array", -5))
     )
 
-    _inv_sel, _, _ = _sim_inv_sel
+    _invres_select, _, _ = _sim_test_regime
     (
-        _stats_table_content.clrenf_sel,
+        _stats_table_content.test_regime,
         _stats_table_content.obs_merger_class,
         _stats_table_content.obs_period,
-    ) = (_inv_sel.capitalize(), _merger_class, _data_period.split("-"))
+    ) = (_invres_select.capitalize(), _merger_class, _data_period.split("-"))
 
-    _r_bar, _d_bar, _g_bar, _cmcr_bar, _ipr_bar = _inv_parm_vec
+    _r_bar = _invres_parm_vec.rec
     (
         _stats_table_content.rbar,
-        _stats_table_content.dbar,
         _stats_table_content.guppi_bound,
-        _stats_table_content.ipr_bound,
+        _stats_table_content.dbar,
         _stats_table_content.cmcr_bound,
-    ) = (rf"{_s * 100:.1f}\%" for _s in _inv_parm_vec)
+        _stats_table_content.ipr_bound,
+    ) = (rf"{_s * 100:.1f}\%" for _s in _invres_parm_vec[1:])
 
     # Prepare and write/print output tables
     _stats_cis_wilson_notestr = " ".join((
@@ -202,7 +214,7 @@ def inv_stats_sim_render(
         R"estimated by the Wilson method, given the",
         "reported numbers of investigated mergers and cleared mergers",
         _stats_group_dict_sub["desc"].replace(
-            f"{_stats_table_content.clrenf_sel} rates ", ""
+            f"{_stats_table_content.test_regime} rates ", ""
         ),
         isl.LTX_ARRAY_LINEEND,
     ))
@@ -212,7 +224,7 @@ def inv_stats_sim_render(
         propn_ci(0.50 * _eg_count, _eg_count, method="Exact")
     )
     _stats_sim_notestr = " ".join((
-        Rf"\(\cdot\) Simulated {_stats_table_content.clrenf_sel} rates are estimated by",
+        Rf"\(\cdot\) Simulated {_stats_table_content.test_regime} rates are estimated by",
         "Monte Carlo integration over generated data representing",
         Rf"{_sim_sample_sz:,d} hypothetical mergers. Thus,",
         R"for a subset of simulations with a relative frequency",
@@ -231,8 +243,8 @@ def inv_stats_sim_render(
     del _relfreq_eg, _eg_count, _stats_sim_ci_eg
 
     print(
-        f"Observed {_inv_sel} proportion [95% CI]",
-        _stats_group_dict_sub["desc"].replace(f"{_inv_sel} rates ", ""),
+        f"Observed {_invres_select} proportion [95% CI]",
+        _stats_group_dict_sub["desc"].replace(f"{_invres_select} rates ", ""),
     )
     print(f"\t with sample size (observed): {_obs_sample_sz:,d};")
 
@@ -241,7 +253,7 @@ def inv_stats_sim_render(
     _stats_table_content.stats_cis_notewidth = _stats_group_dict_sub["notewidth"]
     _stats_cis_numobs_notestr = " ".join((
         R"\(\cdot\) Estimates for Proportion {} are based on".format(
-            "Enforced" if _inv_sel == isl.PolicySelector.ENFT else "Cleared"
+            "Enforced" if _invres_select == isl.PolicySelector.ENFT else "Cleared"
         ),
         f"{_obs_sample_sz:,d} total observations (investigated mergers).",
     ))
@@ -260,10 +272,10 @@ def inv_stats_sim_render(
         _stats_table_content.stats_cis_notestr += "".join((isl.LTX_ARRAY_LINEEND, _nsp))
     del _nsp
 
-    _inv_stats_report_func = (
-        isl.latex_tbl_inv_stats_byzone
+    _invres_stats_report_func = (
+        isl.latex_tbl_invres_stats_byzone
         if _stats_group == isl.StatsGrpSelector.ZN
-        else isl.latex_tbl_inv_stats_1dim
+        else isl.latex_tbl_invres_stats_1dim
     )
     _sort_order = (
         isl.SortSelector.UCH
@@ -271,15 +283,16 @@ def inv_stats_sim_render(
         else isl.SortSelector.REV
     )
 
-    _inv_stats_hdr_list, _inv_stats_dat_list = _inv_stats_report_func(
+    _invres_stats_hdr_list, _invres_stats_dat_list = _invres_stats_report_func(
         _stats_group_dict_sub["obs_array"],
         return_type_sel=isl.StatsReturnSelector.RIN,
         sort_order=_sort_order,
     )
+
     if _stats_group == isl.StatsGrpSelector.FC:
-        del _inv_stats_hdr_list[-2], _inv_stats_dat_list[-2]
+        del _invres_stats_hdr_list[-2], _invres_stats_dat_list[-2]
 
-    _stats_table_content.stats_numrows = len(_inv_stats_hdr_list)
+    _stats_table_content.stats_numrows = len(_invres_stats_hdr_list)
     _stats_table_content.hdrcol_cis_width = f'{_stats_group_dict_sub["hcol_width"]}pt'
 
     _hs1 = _stats_group_dict_sub["hval"]
@@ -299,23 +312,26 @@ def inv_stats_sim_render(
     del _hs1, _hs2
 
     _stats_table_content.stats_hdrstr = "".join([
-        f"{g} {isl.LTX_ARRAY_LINEEND}" for g in _inv_stats_hdr_list
+        f"{g} {isl.LTX_ARRAY_LINEEND}" for g in _invres_stats_hdr_list
     ])
     _stats_table_content.stats_cis = "".join([
-        f"{' & '.join(g)} {isl.LTX_ARRAY_LINEEND}" for g in _inv_stats_dat_list
+        f"{' & '.join(g)} {isl.LTX_ARRAY_LINEEND}" for g in _invres_stats_dat_list
     ])
     # Print to console
-    isl.stats_print_rows(_inv_stats_hdr_list, _inv_stats_dat_list)
-    del _inv_stats_hdr_list, _inv_stats_dat_list
+    isl.stats_print_rows(_invres_stats_hdr_list, _invres_stats_dat_list)
+    del _invres_stats_hdr_list, _invres_stats_dat_list
 
-    print(f"Simulated {_inv_sel} rates {_stats_group}:")
+    print(f"Simulated {_invres_select} rates {_stats_group}:")
     print(f"\t with generated data size = {_sim_sample_sz:,d}:")
 
-    _stats_sim_hdr_list, _stats_sim_dat_list = _inv_stats_report_func(
+    _stats_sim_hdr_list, _stats_sim_dat_list = _invres_stats_report_func(
         _stats_group_dict_sub["sim_array"],
         return_type_sel=isl.StatsReturnSelector.RPT,
         sort_order=_sort_order,
     )
+
+    # Exclude results of IPR tests
+    _stats_sim_dat_list = [_f[:-1] for _f in _stats_sim_dat_list]
     _stats_table_content.stats_sim = "".join([
         f"{' & '.join(g)} {isl.LTX_ARRAY_LINEEND}" for g in _stats_sim_dat_list
     ])
@@ -328,10 +344,8 @@ def inv_stats_sim_render(
         "clrrate_cis_summary_table_template.tex.jinja2"
     )
     # Write to dottex
-    _stats_table_dottex.write(
-        _stats_table_design.render(tmpl_data=_stats_table_content)
-    )
-    print("\n", file=_stats_table_dottex)
+    _stats_table_file.write(_stats_table_design.render(tmpl_data=_stats_table_content))
+    print("\n", file=_stats_table_file)
 
 
 if __name__ == "__main__":
@@ -352,9 +366,9 @@ if __name__ == "__main__":
     pcm_dist_type, pcm_dist_parms = dgl.PCMConstants.EMPR, np.empty(2)
 
     save_data_to_file_flag = False
-    save_data_to_file: Literal[False] | tuple[Literal[True], ptb.File, str] = False
+    save_data_to_file: gtl.SaveData = False
     if save_data_to_file_flag:
-        h5path = DATA_DIR.joinpath(f"{Path(__file__).stem}.h5")
+        h5path = DATA_DIR / Path(__file__).with_suffix(".h5").name
         blosc_filters = ptb.Filters(complevel=3, complib="blosc:lz4", fletcher32=True)
         h5datafile = ptb.open_file(
             str(h5path),
@@ -364,33 +378,34 @@ if __name__ == "__main__":
         )
         save_data_to_file = (True, h5datafile, "/")
 
-    sim_inv_sel = (
+    sim_test_regime = (
         (isl.PolicySelector.CLRN, gtl.GUPPIWghtngSelector.MAX, None),
         (isl.PolicySelector.ENFT, gtl.GUPPIWghtngSelector.OSD, None),
     )[1]
-    inv_stats_kwargs = {"sim_inv_sel": sim_inv_sel}
+    invres_stats_kwargs = {"sim_test_regime": sim_test_regime}
 
+    table_dottex_namelist = ()
     for merger_class in merger_classes:
         for study_period in data_periods:
             if study_period == data_periods[1]:
                 continue
 
             print(
-                f"{sim_inv_sel[0].capitalize()} rates and c.i.s",
+                f"{sim_test_regime[0].capitalize()} rates and c.i.s",
                 f"for the class of mergers, '{merger_class}',",
                 f"for study period, {study_period}:",
             )
             stats_table_content.obs_period = study_period.split("-")
 
-            clrenf_parm_vec = (
-                GuidelinesStandards(2010).presumption[2:]
+            invres_parm_vec = (
+                GuidelinesStandards(2010).presumption
                 if study_period.split("-")[1] == data_periods[1].split("-")[1]
-                else GuidelinesStandards(1992).presumption[2:]
+                else GuidelinesStandards(1992).presumption
             )
 
             mkt_sample_spec = dgl.MarketSampleSpec(
                 sample_sz_base,
-                clrenf_parm_vec[0],
+                invres_parm_vec.rec,
                 pr_sym_spec,
                 pcm_spec=dgl.PCMSpec(
                     pcm_dist_type, dgl.FM2Constants.MNL, pcm_dist_parms
@@ -402,16 +417,22 @@ if __name__ == "__main__":
             if save_data_to_file:
                 h5hier_pat = re.compile(r"\W")
                 h5hier = f"/{h5hier_pat.sub('_', f'{merger_class} {study_period}')}"
-                save_data_to_file = save_data_to_file[:-1] + (h5hier,)
+                save_data_to_file = (True, save_data_to_file[1], h5hier)
 
-            inv_stats_sim_setup(
+            table_dottex_name = invres_stats_sim_setup(
                 invdata_array_dict,
                 study_period,
                 merger_class,
-                clrenf_parm_vec,
+                invres_parm_vec,
                 mkt_sample_spec,
-                inv_stats_kwargs,
+                invres_stats_kwargs,
             )
+            table_dottex_namelist += (table_dottex_name,)
+
+    isl.render_table_pdf(
+        table_dottex_namelist,
+        dottex_format_str.format(f"{sim_test_regime[0]}".capitalize(), "All", "All"),
+    )
 
     if save_data_to_file:
-        h5datafile.close()
+        save_data_to_file[1].close()

mergeron/examples/plotSafeHarbs_symbolically.py

@@ -1,7 +1,7 @@
 """
 
-    Solve for, and plot, weighted-average GUPPI boundaries using sympy,
-    as a check against the numerical solutions in mergeron.core.guidelines_standards
+Solve for, and plot, weighted-average GUPPI boundaries using sympy,
+as a check against the numerical solutions in mergeron.core.guidelines_standards
 
 """
 

mergeron/examples/safeharbor_boundaries_for_mergers_with_asymmetric_shares.py

@@ -1,6 +1,6 @@
 """
 
-Draw boundaries for various standards from 1992 and 2010 Guidelines.
+Draw boundaries for various standards from U.S. Horizontal Merger Guidelines.
 """
 
 from itertools import product as iterprod
@@ -9,6 +9,7 @@ from typing import Literal
 
 import matplotlib.axis
 from matplotlib import cm as colormgr
+from matplotlib import colormaps
 from matplotlib import colors as mcolors
 from matplotlib.ticker import StrMethodFormatter
 from numpy import (
@@ -24,9 +25,9 @@ from numpy import (
 )
 
 import mergeron.core.guidelines_standards as gsf
+from mergeron import DATA_DIR
 
-mod_path = Path(__file__)
-data_path = Path.home() / mod_path.parents[1].stem
+PROG_PATH = Path(__file__)
 
 
 def plot_delta_boundaries(
@@ -39,9 +40,9 @@ def plot_delta_boundaries(
         raise ValueError(f"Recapture specification must be one of, {_recspecs!r}")
 
     print("ΔHHI safeharbor boundary")
-    _plt, _my_fig1, _ax1, _set_axis_def = gsf.boundary_plot()
+    _plt, _my_fig1, _ax1, _ = gsf.boundary_plot()
 
-    _dh_bar, _f_count_post, _r_bar, _guppi_bench, _divr_bench = get_hmg_standards_plus(
+    _dh_bar, _r_bar, _guppi_bench, _divr_bench, _, _ = get_hmg_standards_by_key(
         _guppi_bench_key
     )
 
@@ -97,7 +98,7 @@ def plot_delta_boundaries(
                 _guppi_bdry_env_xs[::-1],
                 linewidth=0.5,
                 linestyle="--",
-                color=colormgr.cividis(_m_star),
+                color=colormaps["cividis"](_m_star),
                 zorder=3,
             )
             del _symshr, _dstar, _m_star, _guppi_bdry_env_xs
@@ -124,12 +125,16 @@ def plot_delta_boundaries(
                 alpha=0.7,
                 rasterized=True,
             )
+        del (
+            _dh_safeharb,
+            _dh_prob,
+            _dh_dat_x,
+            _dh_dat_y,
+        )  # , _dh_dat_x_pla, _dh_dat_y_pla
 
-    _my_fig1.savefig(
-        data_path.joinpath(f"{mod_path.stem}_DH100_deltaHHI_only.pdf"), dpi=600
-    )
-    del _plt, _my_fig1, _ax1, _set_axis_def, _dh_safeharb, _dh_prob
-    del _dh_dat_x, _dh_dat_y  # , _dh_dat_x_pla, _dh_dat_y_pla
+    _my_fig1.savefig((DATA_DIR / f"{PROG_PATH.stem}_DH100_deltaHHI_only.pdf"), dpi=600)
+
+    del _plt, _my_fig1, _ax1
 
 
 def plot_guppi_boundaries(  # noqa PLR0915
@@ -140,7 +145,7 @@ def plot_guppi_boundaries(  # noqa PLR0915
     if recapture_spec not in (_recspecs := ("inside-out", "proportional")):
         raise ValueError(f"Recapture specification must be one of, {_recspecs!r}")
 
-    _dh_bar, _f_count_post, _r_bar, _guppi_bench, _divr_bench = get_hmg_standards_plus(
+    _dh_bar, _r_bar, _guppi_bench, _divr_bench, _, _ = get_hmg_standards_by_key(
         _guppi_bench_key
     )
 
@@ -163,7 +168,7 @@ def plot_guppi_boundaries(  # noqa PLR0915
         wspace=0.0,
     )
     _ax1 = _my_fig1.add_subplot(_fig1_grid[0, 0])
-    _ax1 = _set_axis_def(_plt, _ax1)
+    _ax1 = _set_axis_def(_ax1)
     _ax1.set_aspect(1.0)
     _ax1.set_facecolor("#F6F6F6")
 
@@ -211,7 +216,7 @@ def plot_guppi_boundaries(  # noqa PLR0915
                 _s2_vals,
                 linestyle="--",
                 linewidth=0.75,
-                color=colormgr.cividis(_m_star),
+                color=colormaps["cividis"](_m_star),
                 zorder=3,
             )
         else:
@@ -232,7 +237,7 @@ def plot_guppi_boundaries(  # noqa PLR0915
                 _s2_vals,
                 linestyle="--",
                 linewidth=0.5,
-                color=colormgr.cividis(_m_star),
+                color=colormaps["cividis"](_m_star),
                 zorder=3,
             )
             # Print inner boundary, color-coded m_1
@@ -241,7 +246,7 @@ def plot_guppi_boundaries(  # noqa PLR0915
                 _s1_vals[::-1],
                 linestyle="--",
                 linewidth=0.5,
-                color=colormgr.cividis(_m_star),
+                color=colormaps["cividis"](_m_star),
                 zorder=3,
             )
 
@@ -286,7 +291,6 @@ def plot_guppi_boundaries(  # noqa PLR0915
             fontsize=4,
             zorder=5.1,
         )
-    del _m_star
 
     # Examples of hypothetical combinations
     if not _pcm_same_flag:
@@ -328,7 +332,7 @@ def plot_guppi_boundaries(  # noqa PLR0915
             _y_drt,
             linestyle="-",
             linewidth=0.75,
-            color=colormgr.cividis(_m_star_bench),
+            color=colormaps["cividis"](_m_star_bench),
             zorder=4,
         )
 
@@ -377,7 +381,7 @@ def plot_guppi_boundaries(  # noqa PLR0915
         xerr=_ebar_array,
         yerr=_ebar_array,
         fmt=".",
-        mfc=colormgr.cividis(_guppi_bench / _r_bar),
+        mfc=colormaps["cividis"](_guppi_bench / _r_bar),
         mec="None",
         alpha=0.9,
         zorder=5,
@@ -386,7 +390,7 @@ def plot_guppi_boundaries(  # noqa PLR0915
     # https://stackoverflow.com/questions/22995797/
     for _ix in range(2):
         _ebar_plot[-1][_ix].set(
-            color=colormgr.cividis(_guppi_bench / _r_bar),
+            color=colormaps["cividis"](_guppi_bench / _r_bar),
             linestyle="--",
             linewidth=0.5,
             alpha=0.9,
@@ -421,12 +425,12 @@ def plot_guppi_boundaries(  # noqa PLR0915
     _cm_plot.outline.set_visible(False)
 
     _fig1_savename = "_".join((
-        f"{mod_path.stem}",
+        f"{PROG_PATH.stem}",
         f"pcmSame{_pcm_same_flag}",
         f"{_guppi_bench_key}",
         f"rbar{_recapture_spec.upper()}",
     ))
-    _my_fig1.savefig(data_path.joinpath(f"{_fig1_savename}.pdf"), dpi=600)
+    _my_fig1.savefig((DATA_DIR / f"{_fig1_savename}.pdf"), dpi=600)
     del _my_fig1, _ax1, _ebar_plot, _fig1_savename
     del _dh_dat_x, _dh_dat_y
 
@@ -437,23 +441,26 @@ def grad_est(_ax: matplotlib.axis.Axis, _pt_xs: tuple, _pt_ys: tuple) -> float:
             "Expecting only 2 points for calculation of line-gradient; got {_pt_len}."
         )
     _pt1, _pt2 = (
-        _ax.transData.transform_point((_pt_xs[_i], _pt_ys[_i])) for _i in range(2)
+        _ax.transData.transform_point((_pt_xs[_i], _pt_ys[_i]))  # type: ignore
+        for _i in range(2)
     )
     return (_pt2[1] - _pt1[1]) / (_pt2[0] - _pt1[0])
 
 
-def get_hmg_standards_plus(_guppi_bench_key: str, /) -> tuple:
+def get_hmg_standards_by_key(_guppi_bench_key: str, /) -> tuple:
     match _guppi_bench_key:
         case "DOJATR":
             return (
-                *(_tmp := gsf.GuidelinesStandards(2010).safeharbor[:3]),
-                _tmp[-1],
+                *(_tmp := gsf.GuidelinesStandards(2010).safeharbor[:2]),
                 0.05,
+                _tmp[-1],
+                None,
+                None,
             )
         case "DH100":
-            return gsf.GuidelinesStandards(2010).safeharbor[:-2]
+            return gsf.GuidelinesStandards(2010).safeharbor
         case "DH50":
-            return gsf.GuidelinesStandards(1992).safeharbor[:-2]
+            return gsf.GuidelinesStandards(1992).safeharbor
         case _:
             raise ValueError(
                 f"GUPPI benchmark key must be one of, {guppi_benchmark_keys!r}"