Update functions to work with new etas

Author: JMGilbert

src/dscim/preprocessing/preprocessing.py

@@ -310,18 +310,11 @@ def subset_USA_reduced_damages(
     for var in subset.variables:
         subset[var].encoding.clear()
 
-    if recipe == "adding_up":
-        subset.to_zarr(
-            f"{input_path}/{sector}_USA/{recipe}_{reduction}.zarr",
-            consolidated=True,
-            mode="w",
-        )
-    elif recipe == "risk_aversion":
-        subset.to_zarr(
-            f"{input_path}/{sector}_USA/{recipe}_{reduction}_eta{eta}.zarr",
-            consolidated=True,
-            mode="w",
-        )
+    subset.to_zarr(
+        f"{input_path}/{sector}_USA/{recipe}_{reduction}_eta{eta}.zarr",
+        consolidated=True,
+        mode="w",
+    )
 
 
 def subset_USA_ssp_econ(

tests/test_input_damages.py

@@ -1087,6 +1087,7 @@ def test_prep_mortality_damages(
         outpath=os.path.join(tmp_path, "mortality_out"),
         mortality_version=version_test,
         path_econ=os.path.join(tmp_path, "econvars_for_test", "econvars_for_test.zarr"),
+        etas=[1.0, 1.34],
     )
 
     ds_out_actual = xr.open_zarr(