Merge pull request #343 from singularity-energy/greg/fix_bugs

Cleanup bugs in dev branch
singularity-energy · Feb 10, 2024 · 31e90bf · 31e90bf
2 parents e747564 + 3107174
commit 31e90bf
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -30,11 +30,14 @@ git clone https://github.com/singularity-energy/open-grid-emissions.git
 cd open-grid-emissions
 pipenv sync
 pipenv shell
+pip install build
+python -m build
+pip install .
 ```
 
 The pipeline can be run as follows:
 ```bash
-cd src
+cd src/oge
 python data_pipeline.py --year 2022
 ```
 independently of the installation method you chose.

diff --git a/src/oge/emissions.py b/src/oge/emissions.py
@@ -320,7 +320,13 @@ def calculate_electric_allocation_factor(df):
     df["electric_allocation_factor"] = df["electric_allocation_factor"].fillna(1)
 
     # remove intermediate columns
-    df = df.drop(columns=["useful_thermal_output", "generation_mmbtu"])
+    df = df.drop(
+        columns=[
+            "gross_thermal_output_for_heating_mmbtu",
+            "useful_thermal_output_mmbtu",
+            "generation_mmbtu",
+        ]
+    )
 
     return df