ogeth 0.1.0__tar.gz → 0.2.0__tar.gz

{ogeth-0.1.0/ogeth.egg-info → ogeth-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ogeth
-Version: 0.1.0
+Version: 0.2.0
 Summary: Ethiopia Calibration for OG-Core
 Author: Marcelo LaFleur, Richard W. Evans, and Jason DeBacker
 License: CC0 1.0 Universal (CC0 1.0) Public Domain Dedication
@@ -14,12 +14,11 @@ Classifier: License :: CC0 1.0 Universal (CC0 1.0) Public Domain Dedication
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Scientific/Engineering :: Information Analysis
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Python: <3.14,>=3.11
+Requires-Python: <3.14,>=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: numpy
@@ -47,7 +46,7 @@ Requires-Dist: ipython; extra == "dev"
 Requires-Dist: ipykernel; extra == "dev"
 Requires-Dist: jupyter; extra == "dev"
 Provides-Extra: docs
-Requires-Dist: jupyter-book<2.0.0; extra == "docs"
+Requires-Dist: jupyter-book<2.0,>=1.0; extra == "docs"
 Requires-Dist: sphinx>=3.5.4; extra == "docs"
 Requires-Dist: sphinx-book-theme>=0.1.3; extra == "docs"
 Requires-Dist: sphinx-argparse; extra == "docs"
@@ -69,28 +68,100 @@ OG-ETH is an overlapping-generations (OG) model that allows for dynamic general
 
 ## Using and contributing to OG-ETH
 
-There are two primary methods for installing and running OG-ETH on your computer locally. The first and simplest method is to download the most recent `ogeth` Python package from the Python Package Index ([PyPI.org](https://pypi.org/project/ogeth/)). The second option is to fork and clone the most recent version of OG-ETH from its GitHub repository and install the `ogeth` package with its development dependencies using `uv`. Both methods are detailed below.
+Install and run OG-ETH by cloning this GitHub repository and installing the `ogeth` package with its dependencies using [`uv`](https://docs.astral.sh/uv/), as detailed below. (Installing the `ogeth` package from [PyPI](https://pypi.org/project/ogeth/) with `pip` is no longer the recommended path: on the Python versions many machines ship, `pip` either refuses the current release outright — as on the Python 3.9 built into macOS — or silently pairs it with an older `ogcore` than the model is tested against, and even on a supported Python the PyPI route does not pin the `ogcore` version the repository is tested against. The `uv` workflow installs the exact tested versions of every dependency, including a compatible Python interpreter.)
 
-### Installing and Running OG-ETH from PyPI
+### Installation
 
-* On macOS, first install Xcode Command Line Tools (in Terminal: `xcode-select --install`).
-* Open your terminal and install the [`ogeth`](https://pypi.org/project/ogeth/) package from the Python Package Index by typing `pip install ogeth`.
-* Navigate to a folder `./YourFolderName/` where you want to save scripts to run OG-ETH and output from the simulations in those scripts.
-* Copy the python script [`run_og_eth.py`](https://github.com/EAPD-DRB/OG-ETH/blob/main/examples/run_og_eth.py) from the OG-ETH GitHub repository into your folder as `./YourFolderName/run_og_eth.py`.
-* Run the model with an example reform from terminal/command prompt by typing `python run_og_eth.py`.
+There are two ways to install OG-ETH: the easy way, using the OG model family's universal installer, and a manual install that runs the same steps one command at a time. Both start from a terminal, put the model in a new OG-ETH folder inside your current directory (a freshly opened terminal starts in your home folder), and need git.
 
-### Installing and Running OG-ETH from the GitHub repository
+#### Before you start: git
+
+On a Mac where you have never used git before, run this line first and accept the dialog that appears:
+
+```
+xcode-select --install
+```
+
+On Windows, install Git first (skip this if you already have it):
+
+```
+winget install --id Git.Git -e --source winget
+```
+
+#### The easy way: the universal installer
+
+The OG model family has a [universal installer](https://github.com/PSLmodels/OG-Core/blob/master/scripts/QUICK_INSTALL.md) that installs the uv tool, downloads the model, builds its environment, and verifies it — for OG-ETH or any of its sibling country models.
+
+On macOS and Linux, paste:
+
+```
+curl -fsSL https://raw.githubusercontent.com/PSLmodels/OG-Core/master/scripts/install.sh -o og-install.sh
+bash og-install.sh --repo og-eth --yes
+```
+
+On Windows (PowerShell), paste:
+
+```
+$f = "$env:TEMP\og-install.ps1"; irm https://raw.githubusercontent.com/PSLmodels/OG-Core/master/scripts/install.ps1 -OutFile $f; powershell -ExecutionPolicy Bypass -File $f -Repo og-eth -Yes
+```
+
+When the installer finishes, run the example. On macOS and Linux, paste:
+
+```
+source $HOME/.local/bin/env
+cd OG-ETH
+uv run python examples/run_og_eth.py
+```
+
+On Windows, open a new PowerShell window (so the just-installed tools are found) and paste:
+
+```
+cd OG-ETH
+uv run python examples/run_og_eth.py
+```
+
+#### Manual install
+
+The same setup as individual commands. On macOS and Linux, paste:
+
+```
+curl -LsSf https://astral.sh/uv/install.sh | sh
+source $HOME/.local/bin/env
+git clone https://github.com/EAPD-DRB/OG-ETH.git
+cd OG-ETH
+uv run python examples/run_og_eth.py
+```
+
+The second line makes the just-installed uv available in the current terminal; from your next terminal session it is available automatically.
+
+On Windows (PowerShell), install uv:
+
+```
+powershell -ExecutionPolicy ByPass -c "irm https://astral.sh/uv/install.ps1 | iex"
+```
+
+Then open a new PowerShell window (so the just-installed tools are found) and paste:
+
+```
+git clone https://github.com/EAPD-DRB/OG-ETH.git
+cd OG-ETH
+uv run python examples/run_og_eth.py
+```
+
+#### What happens
+
+The first `uv run` creates the project environment if it does not exist yet — downloading a compatible Python interpreter if needed and installing the exact locked dependencies — and then runs the example. Early in the run you may be asked for a UN API token; just press return, and the model reads the same population data from a public mirror and continues. A full baseline-plus-reform run takes from 35 minutes to more than two hours; when it finishes, its plots and tables are saved under `./examples/OG-ETH-Example/` (see the list of outputs below).
+
+### Installing for development or contributing
 
-* On macOS, first install Xcode Command Line Tools (in Terminal: `xcode-select --install`).
-* Install [`uv`](https://docs.astral.sh/uv/) by following the [installation instructions](https://docs.astral.sh/uv/getting-started/installation/) for your platform (or simply run `pip install uv`).
 * Fork this repository and clone your fork to a directory on your computer.
-* From the terminal, navigate to the cloned directory and run `uv sync --extra dev` to create a local `.venv` and install OG-ETH with its development dependencies. `uv` will also download a compatible Python interpreter if you don't already have one.
+* From the terminal, navigate to the cloned directory and run `uv sync --extra dev` to create a local `.venv` and install OG-ETH with its development dependencies (`uv` downloads a compatible Python if you don't already have one).
 * For docs/Jupyter Book work, also run `uv sync --extra dev --extra docs`.
+* Run commands in the environment with `uv run <command>`, or activate it first with `source .venv/bin/activate` (macOS/Linux) or `.\.venv\Scripts\Activate.ps1` (Windows).
 
 ### Run an example of the model
 
-* Navigate to `./examples`.
-* Run the model with an example reform: `uv run python run_og_eth.py` (or activate the venv first with `source .venv/bin/activate` on macOS/Linux or `.\.venv\Scripts\Activate.ps1` on Windows, then `python run_og_eth.py`).
+* From the repository root, run the model with an example reform: `uv run python examples/run_og_eth.py`.
 * You can adjust the `./examples/run_og_eth.py` by modifying model parameters specified in the dictionary passed to the `p.update_specifications()` calls.
 * Model outputs will be saved in the following files:
   * `./examples/OG-ETH-Example/OG-ETH_example_plots`

{ogeth-0.1.0 → ogeth-0.2.0}/README.md

@@ -11,28 +11,100 @@ OG-ETH is an overlapping-generations (OG) model that allows for dynamic general
 
 ## Using and contributing to OG-ETH
 
-There are two primary methods for installing and running OG-ETH on your computer locally. The first and simplest method is to download the most recent `ogeth` Python package from the Python Package Index ([PyPI.org](https://pypi.org/project/ogeth/)). The second option is to fork and clone the most recent version of OG-ETH from its GitHub repository and install the `ogeth` package with its development dependencies using `uv`. Both methods are detailed below.
+Install and run OG-ETH by cloning this GitHub repository and installing the `ogeth` package with its dependencies using [`uv`](https://docs.astral.sh/uv/), as detailed below. (Installing the `ogeth` package from [PyPI](https://pypi.org/project/ogeth/) with `pip` is no longer the recommended path: on the Python versions many machines ship, `pip` either refuses the current release outright — as on the Python 3.9 built into macOS — or silently pairs it with an older `ogcore` than the model is tested against, and even on a supported Python the PyPI route does not pin the `ogcore` version the repository is tested against. The `uv` workflow installs the exact tested versions of every dependency, including a compatible Python interpreter.)
 
-### Installing and Running OG-ETH from PyPI
+### Installation
 
-* On macOS, first install Xcode Command Line Tools (in Terminal: `xcode-select --install`).
-* Open your terminal and install the [`ogeth`](https://pypi.org/project/ogeth/) package from the Python Package Index by typing `pip install ogeth`.
-* Navigate to a folder `./YourFolderName/` where you want to save scripts to run OG-ETH and output from the simulations in those scripts.
-* Copy the python script [`run_og_eth.py`](https://github.com/EAPD-DRB/OG-ETH/blob/main/examples/run_og_eth.py) from the OG-ETH GitHub repository into your folder as `./YourFolderName/run_og_eth.py`.
-* Run the model with an example reform from terminal/command prompt by typing `python run_og_eth.py`.
+There are two ways to install OG-ETH: the easy way, using the OG model family's universal installer, and a manual install that runs the same steps one command at a time. Both start from a terminal, put the model in a new OG-ETH folder inside your current directory (a freshly opened terminal starts in your home folder), and need git.
 
-### Installing and Running OG-ETH from the GitHub repository
+#### Before you start: git
+
+On a Mac where you have never used git before, run this line first and accept the dialog that appears:
+
+```
+xcode-select --install
+```
+
+On Windows, install Git first (skip this if you already have it):
+
+```
+winget install --id Git.Git -e --source winget
+```
+
+#### The easy way: the universal installer
+
+The OG model family has a [universal installer](https://github.com/PSLmodels/OG-Core/blob/master/scripts/QUICK_INSTALL.md) that installs the uv tool, downloads the model, builds its environment, and verifies it — for OG-ETH or any of its sibling country models.
+
+On macOS and Linux, paste:
+
+```
+curl -fsSL https://raw.githubusercontent.com/PSLmodels/OG-Core/master/scripts/install.sh -o og-install.sh
+bash og-install.sh --repo og-eth --yes
+```
+
+On Windows (PowerShell), paste:
+
+```
+$f = "$env:TEMP\og-install.ps1"; irm https://raw.githubusercontent.com/PSLmodels/OG-Core/master/scripts/install.ps1 -OutFile $f; powershell -ExecutionPolicy Bypass -File $f -Repo og-eth -Yes
+```
+
+When the installer finishes, run the example. On macOS and Linux, paste:
+
+```
+source $HOME/.local/bin/env
+cd OG-ETH
+uv run python examples/run_og_eth.py
+```
+
+On Windows, open a new PowerShell window (so the just-installed tools are found) and paste:
+
+```
+cd OG-ETH
+uv run python examples/run_og_eth.py
+```
+
+#### Manual install
+
+The same setup as individual commands. On macOS and Linux, paste:
+
+```
+curl -LsSf https://astral.sh/uv/install.sh | sh
+source $HOME/.local/bin/env
+git clone https://github.com/EAPD-DRB/OG-ETH.git
+cd OG-ETH
+uv run python examples/run_og_eth.py
+```
+
+The second line makes the just-installed uv available in the current terminal; from your next terminal session it is available automatically.
+
+On Windows (PowerShell), install uv:
+
+```
+powershell -ExecutionPolicy ByPass -c "irm https://astral.sh/uv/install.ps1 | iex"
+```
+
+Then open a new PowerShell window (so the just-installed tools are found) and paste:
+
+```
+git clone https://github.com/EAPD-DRB/OG-ETH.git
+cd OG-ETH
+uv run python examples/run_og_eth.py
+```
+
+#### What happens
+
+The first `uv run` creates the project environment if it does not exist yet — downloading a compatible Python interpreter if needed and installing the exact locked dependencies — and then runs the example. Early in the run you may be asked for a UN API token; just press return, and the model reads the same population data from a public mirror and continues. A full baseline-plus-reform run takes from 35 minutes to more than two hours; when it finishes, its plots and tables are saved under `./examples/OG-ETH-Example/` (see the list of outputs below).
+
+### Installing for development or contributing
 
-* On macOS, first install Xcode Command Line Tools (in Terminal: `xcode-select --install`).
-* Install [`uv`](https://docs.astral.sh/uv/) by following the [installation instructions](https://docs.astral.sh/uv/getting-started/installation/) for your platform (or simply run `pip install uv`).
 * Fork this repository and clone your fork to a directory on your computer.
-* From the terminal, navigate to the cloned directory and run `uv sync --extra dev` to create a local `.venv` and install OG-ETH with its development dependencies. `uv` will also download a compatible Python interpreter if you don't already have one.
+* From the terminal, navigate to the cloned directory and run `uv sync --extra dev` to create a local `.venv` and install OG-ETH with its development dependencies (`uv` downloads a compatible Python if you don't already have one).
 * For docs/Jupyter Book work, also run `uv sync --extra dev --extra docs`.
+* Run commands in the environment with `uv run <command>`, or activate it first with `source .venv/bin/activate` (macOS/Linux) or `.\.venv\Scripts\Activate.ps1` (Windows).
 
 ### Run an example of the model
 
-* Navigate to `./examples`.
-* Run the model with an example reform: `uv run python run_og_eth.py` (or activate the venv first with `source .venv/bin/activate` on macOS/Linux or `.\.venv\Scripts\Activate.ps1` on Windows, then `python run_og_eth.py`).
+* From the repository root, run the model with an example reform: `uv run python examples/run_og_eth.py`.
 * You can adjust the `./examples/run_og_eth.py` by modifying model parameters specified in the dictionary passed to the `p.update_specifications()` calls.
 * Model outputs will be saved in the following files:
   * `./examples/OG-ETH-Example/OG-ETH_example_plots`

{ogeth-0.1.0 → ogeth-0.2.0}/ogeth/__init__.py

@@ -8,4 +8,4 @@ from ogeth.input_output import *  # noqa: F403
 from ogeth.macro_params import *  # noqa: F403
 from ogeth.utils import *  # noqa: F403
 
-__version__ = "0.1.0"
+__version__ = "0.2.0"

{ogeth-0.1.0 → ogeth-0.2.0}/ogeth/calibrate.py

@@ -86,9 +86,10 @@ class Calibration:
                 p.T,
                 0,
                 99,
-                country_id="710",
+                country_id="231",
                 initial_data_year=p.start_year - 1,
                 final_data_year=p.start_year + 1,
+                income_percentiles=p.lambdas.flatten(),
                 GraphDiag=False,
                 download_path=demographic_data_path,
             )
@@ -100,9 +101,10 @@ class Calibration:
                 p.T,
                 0,
                 99,
-                country_id="710",
+                country_id="231",
                 initial_data_year=p.start_year - 1,
                 final_data_year=p.start_year + 1,
+                income_percentiles=p.lambdas.flatten(),
                 GraphDiag=False,
             )
 

{ogeth-0.1.0 → ogeth-0.2.0}/ogeth/income.py

@@ -116,14 +116,7 @@ def get_e_interp(
     )
     a = x.root
     e_new = usa_params.e[0, :, :] * np.exp(a * usa_params.e[0, :, :])
-    emat_new_scaled = (
-        e_new
-        / (
-            e_new
-            * usa_params.omega_SS.reshape(usa_params.S, 1)
-            * usa_params.lambdas.reshape(1, usa_params.J)
-        ).sum()
-    )
+    emat_new_scaled = e_new / (e_new * usa_params.omega_SS).sum()
     # Now interpolate for the cases where S and/or J not the same in the
     # country parameterization as in the default USA parameterization
     if (
@@ -182,10 +175,7 @@ def get_e_interp(
             (new_s_mesh, new_j_mesh),
             method="linear",
         )
-        emat_new_scaled = (
-            emat_new
-            / (emat_new * age_wgts.reshape(S, 1) * lambdas.reshape(1, J)).sum()
-        )
+        emat_new_scaled = emat_new / (emat_new * age_wgts).sum()
 
         if plot_path is not None:
             kwargs = {"path": plot_path, "filesuffix": "_intrp_scaled"}

{ogeth-0.1.0 → ogeth-0.2.0}/ogeth/macro_params.py

@@ -15,6 +15,11 @@ from pathlib import Path
 # Public capital elasticity; see firms.md.
 GAMMA_G_LIC = 0.1
 
+# Start year for the g_y_annual average-growth calculation; matches the
+# documented window in macro.md (average annual GDP-per-capita growth
+# 2006-2024 = 6.0%).
+G_Y_START_YEAR = 2006
+
 
 def _fetch_wb_data(indicators, country_iso, start_year, end_year, source):
     """
@@ -236,12 +241,6 @@ def get_macro_params(
     """
     # initialize a dictionary of parameters
     macro_parameters = {}
-    # baseline date formatted for World Bank data
-    baseline_YYYYQ = (
-        str(data_end_date.year)
-        + "Q"
-        + str(pd.Timestamp(data_end_date).quarter)
-    )
 
     """
     Retrieve data from the World Bank World Development Indicators.
@@ -256,12 +255,11 @@ def get_macro_params(
             "General government final consumption expenditure (current US$)"
         ): "NE.CON.GOVT.CD",
     }
-    # Quarterly data
-    wb_q_variable_dict = {
-        "Gross PSD USD - domestic creditors": "DP.DOD.DECD.CR.PS.CD",
-        "Gross PSD USD - external creditors": "DP.DOD.DECX.CR.PS.CD",
-        "Gross PSD Gen Gov - percentage of GDP": "DP.DOD.DECT.CR.GG.Z1",
-    }
+    # Quarterly public-sector-debt (QPSD) indicators are intentionally
+    # not fetched for OG-ETH: the World Bank QPSD database has no Ethiopia
+    # data. The debt parameters (initial_debt_ratio,
+    # initial_foreign_debt_ratio, zeta_D) are hand-calibrated from the
+    # Ethiopia MoF Public Sector Debt Bulletin No. 51 (see macro.md).
     if update_from_api:
         try:
             wb_data_a = _fetch_wb_data(
@@ -271,116 +269,32 @@ def get_macro_params(
                 data_end_date.year,
                 source=2,
             )
-            wb_data_q = _fetch_wb_data(
-                wb_q_variable_dict,
-                country_iso,
-                data_start_date.year,
-                data_end_date.year,
-                source=20,
-            )
-
-            # Get the latest valid data if baseline_YYYYQ is missing/NaN
-            def get_valid_data(series, baseline_YYYYQ):
-                value = series.get(baseline_YYYYQ, None)
-
-                if pd.isna(value):
-                    latest_non_nan = series.dropna().last_valid_index()
-
-                    if latest_non_nan is not None:
-                        print(
-                            f"Warning: No data for {baseline_YYYYQ}. "
-                            f"Using last available quarter: "
-                            f"{latest_non_nan}"
-                        )
-                        value = series.get(latest_non_nan, None)
-                    else:
-                        print(
-                            "Warning: No historical data available. "
-                            "Skipping update."
-                        )
-                        value = None
-
-                return value
-
-            # Compute macro parameters from WB data
-            macro_parameters["initial_debt_ratio"] = get_valid_data(
-                pd.Series(wb_data_q["Gross PSD Gen Gov - percentage of GDP"])
-                / 100,
-                baseline_YYYYQ,
-            )
-            print(
-                "initial_debt_ratio updated from World Bank API: "
-                f"{macro_parameters['initial_debt_ratio']}"
-            )
-
-            # Compute initial_foreign_debt_ratio safely
-            if (
-                "Gross PSD USD - external creditors" in wb_data_q.columns
-                and "Gross PSD USD - domestic creditors" in wb_data_q.columns
-            ):
-                total_debt = (
-                    wb_data_q["Gross PSD USD - domestic creditors"]
-                    + wb_data_q["Gross PSD USD - external creditors"]
-                )
-
-                # Avoid division by zero
-                wb_data_q["foreign_debt_ratio"] = wb_data_q[
-                    "Gross PSD USD - external creditors"
-                ] / total_debt.replace(0, np.nan)
-
-                macro_parameters["initial_foreign_debt_ratio"] = (
-                    get_valid_data(
-                        wb_data_q["foreign_debt_ratio"], baseline_YYYYQ
-                    )
-                )
-            else:
-                print(
-                    "Warning: Missing debt variables in World Bank "
-                    "data. Skipping update for "
-                    "initial_foreign_debt_ratio."
-                )
-
-            print(
-                "initial_foreign_debt_ratio updated from World Bank "
-                f"API: {macro_parameters['initial_foreign_debt_ratio']}"
-            )
-
-            # Compute zeta_D safely
-            macro_parameters["zeta_D"] = [
-                macro_parameters["initial_foreign_debt_ratio"]
-            ]  # Since it's the same formula, we use the same calculated value
-
-            print(
-                "zeta_D updated from World Bank API: "
-                f"{macro_parameters['zeta_D']}"
-            )
-
-            # Compute annual GDP growth safely
+            # Compute annual GDP-per-capita growth (g_y_annual) from the
+            # World Bank WDI series, averaging pct_change from
+            # G_Y_START_YEAR onward to match the documented window (see
+            # macro.md). Debt parameters are not derived here (see note
+            # above).
             if "GDP per capita (constant 2015 US$)" in wb_data_a.columns:
-                g_y_series = wb_data_a[
-                    "GDP per capita (constant 2015 US$)"
-                ].pct_change(-1)
+                gdp_pc = wb_data_a["GDP per capita (constant 2015 US$)"]
+                gdp_pc = gdp_pc[gdp_pc.index.astype(int) >= G_Y_START_YEAR]
+                g_y_series = gdp_pc.pct_change(-1)
 
                 # If all values are NaN, return None
                 macro_parameters["g_y_annual"] = (
                     g_y_series.mean() if not g_y_series.isna().all() else None
                 )
+                print(
+                    "g_y_annual updated from World Bank API: "
+                    f"{macro_parameters['g_y_annual']}"
+                )
             else:
                 print(
                     "Warning: Missing GDP per capita data in World "
                     "Bank data. Skipping update for g_y_annual."
                 )
-
-            print(
-                "g_y_annual updated from World Bank API: "
-                f"{macro_parameters['g_y_annual']}"
-            )
         except Exception:
             print("Failed to retrieve data from World Bank")
-            print("Will not update the following parameters:")
-            print(
-                "[initial_debt_ratio, initial_foreign_debt_ratio, zeta_D, g_y]"
-            )
+            print("Will not update g_y_annual")
     else:
         print("Not updating from World Bank API")
 
@@ -443,31 +357,16 @@ def get_macro_params(
         print("Not updating from ILOSTAT API")
 
     """
-    Calibrate parameters from IMF data
+    Estimate r_gov_shift and r_gov_scale (Li, Magud, Werner 2021 method).
     """
 
+    # alpha_T and alpha_G are NOT pulled from the IMF API for OG-ETH: the
+    # IMF SDMX endpoint returns only 2002-vintage data for Ethiopia, and
+    # the documented sources differ (alpha_G -> World Bank NE.CON.GOVT.ZS;
+    # alpha_T -> IMF GFS + IMF Country Report 25/188, hand-combined). Both
+    # stay at the committed values in macro.md. _get_imf_macro_params is
+    # retained (tested independently) for reuse if wired to the right data.
     if update_from_api:
-        try:
-            imf_year = (
-                data_end_date.year if imf_data_year is None else imf_data_year
-            )
-            macro_parameters.update(
-                _get_imf_macro_params(
-                    country_iso,
-                    imf_year,
-                    data_path=imf_data_path,
-                )
-            )
-            print(
-                f"alpha_T updated from IMF data: {macro_parameters['alpha_T']}"
-            )
-            print(
-                f"alpha_G updated from IMF data: {macro_parameters['alpha_G']}"
-            )
-        except Exception:
-            print("Failed to retrieve data from IMF")
-            print("Will not update alpha_T, alpha_G")
-
         """"
         Estimate the discount on sovereign yields relative to private debt
         Follow the methodology in Li, Magud, Werner, Witte (2021)
@@ -497,17 +396,17 @@ def get_macro_params(
             macro_parameters["r_gov_shift"] = [-res.params[0] / 100]
             macro_parameters["r_gov_scale"] = [res.params[1]]
             print(
-                "r_gov_shift updated from IMF data: "
+                "r_gov_shift computed (LMW 2021 method): "
                 f"{macro_parameters['r_gov_shift']}"
             )
             print(
-                "r_gov_scale updated from IMF data: "
+                "r_gov_scale computed (LMW 2021 method): "
                 f"{macro_parameters['r_gov_scale']}"
             )
         except Exception:
             print("Failed to compute r_gov_shift, r_gov_scale")
             print("Will not update r_gov_shift, r_gov_scale")
     else:
-        print("Not updating alpha_T, alpha_G, r_gov_shift, r_gov_scale")
+        print("Not computing r_gov_shift, r_gov_scale")
 
     return macro_parameters