Update processing.py

jvivian · Dec 1, 2023 · d483b2f · d483b2f
1 parent 1a7d9ae
commit d483b2f
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/covid19_drdfm/processing.py b/covid19_drdfm/processing.py
@@ -164,6 +164,9 @@ def fix_names(df: pd.DataFrame) -> pd.DataFrame:
             "Pandemic_Response_10": "Mask1",
             "Pandemic_Response_11": "Mask2",
             "Pandemic_Response_12": "School",
+            "Pandemic_Response_13": "ARP",
+            "Pandemic_Response_14": "PPP",
+            "Pandemic_Response_15": "CARES",
             "Demand_1": "Cons1",
             "Demand_2": "Cons2",
             "Demand_3": "Cons3",
@@ -220,6 +223,11 @@ def get_factors():
         "Mask1": ("Global", "Response"),
         "Mask2": ("Global", "Response"),
         "School": ("Global", "Response"),
+        "ARP": ("Global", "Response"),
+        "PPP": ("Global", "Response"),
+        "CARES": ("Global", "Response"),
+        "School": ("Global", "Response"),
+        "School": ("Global", "Response"),
         "Cons1": ("Global", "Consumption"),
         "Cons2": ("Global", "Consumption"),
         "Cons3": ("Global", "Consumption"),
@@ -242,7 +250,7 @@ def get_factors():
         "TBill6mo": ("Global", "Uncat"),
         "TBill1yr": ("Global", "Uncat"),
         "TBill5yr": ("Global", "Uncat"),
-        "TBill10tr": ("Global", "Uncat"),
+        "TBill10yr": ("Global", "Uncat"),
         "TBill30yr": ("Global", "Uncat"),
-        "TBillFFR": ("Global", "Uncat"),
+        "FFR": ("Global", "Uncat"),
     }