Bladeren bron

Merge remote-tracking branch 'refs/remotes/github/main' into bangladesh-BUR1

Daniel Busch 6 maanden geleden
bovenliggende
commit
99551267e3

+ 1 - 0
extracted_data/UNFCCC/Mongolia/MNG_BUR2_2023_IPCC2006_PRIMAP.csv

@@ -0,0 +1 @@
+../../../.git/annex/objects/Xw/Gk/MD5E-s357474--92ddf7a6128cdc935782fb0d4b3e22aa.csv/MD5E-s357474--92ddf7a6128cdc935782fb0d4b3e22aa.csv

+ 1 - 0
extracted_data/UNFCCC/Mongolia/MNG_BUR2_2023_IPCC2006_PRIMAP.nc

@@ -0,0 +1 @@
+../../../.git/annex/objects/p2/1w/MD5E-s262809--265af905dd1358dc590c40468caa8b0a.nc/MD5E-s262809--265af905dd1358dc590c40468caa8b0a.nc

+ 25 - 0
extracted_data/UNFCCC/Mongolia/MNG_BUR2_2023_IPCC2006_PRIMAP.yaml

@@ -0,0 +1,25 @@
+attrs:
+  references: https://unfccc.int/documents/633382
+  rights: ''
+  contact: daniel-busch@climate-resource.de
+  title: Mongolia. Biennial update report (BUR). BUR2 Processed on 2024-07-11 Processed
+    on 2024-07-11
+  comment: Read fom pdf by Daniel Busch Processed on 2024-07-11 Processed on 2024-07-11
+  institution: UNFCCC
+  cat: category (IPCC2006_PRIMAP)
+  area: area (ISO3)
+  scen: scenario (PRIMAP)
+  entity: KYOTOGHG
+  gwp_context: AR6GWP100
+time_format: '%Y'
+dimensions:
+  '*':
+  - time
+  - source
+  - category (IPCC2006_PRIMAP)
+  - scenario (PRIMAP)
+  - area (ISO3)
+  - provenance
+  - entity
+  - unit
+data_file: MNG_BUR2_2023_IPCC2006_PRIMAP.csv

+ 1 - 0
extracted_data/UNFCCC/Mongolia/MNG_BUR2_2023_IPCC2006_PRIMAP_raw.csv

@@ -0,0 +1 @@
+../../../.git/annex/objects/6P/j1/MD5E-s149945--d429bb4261a70e28e57d8c50551ab8b2.csv/MD5E-s149945--d429bb4261a70e28e57d8c50551ab8b2.csv

+ 1 - 0
extracted_data/UNFCCC/Mongolia/MNG_BUR2_2023_IPCC2006_PRIMAP_raw.nc

@@ -0,0 +1 @@
+../../../.git/annex/objects/Vw/zK/MD5E-s132491--067ed21aa031e1a4c0fb58d26a9f667b.nc/MD5E-s132491--067ed21aa031e1a4c0fb58d26a9f667b.nc

+ 22 - 0
extracted_data/UNFCCC/Mongolia/MNG_BUR2_2023_IPCC2006_PRIMAP_raw.yaml

@@ -0,0 +1,22 @@
+attrs:
+  references: https://unfccc.int/documents/633382
+  rights: ''
+  contact: daniel-busch@climate-resource.de
+  title: Mongolia. Biennial update report (BUR). BUR2
+  comment: Read fom pdf by Daniel Busch
+  institution: UNFCCC
+  cat: category (IPCC2006_PRIMAP)
+  area: area (ISO3)
+  scen: scenario (PRIMAP)
+time_format: '%Y'
+dimensions:
+  '*':
+  - time
+  - source
+  - category (IPCC2006_PRIMAP)
+  - scenario (PRIMAP)
+  - area (ISO3)
+  - provenance
+  - entity
+  - unit
+data_file: MNG_BUR2_2023_IPCC2006_PRIMAP_raw.csv

+ 145 - 110
src/unfccc_ghg_data/unfccc_reader/Mongolia/config_mng_bur2.py

@@ -16,10 +16,10 @@ inv_conf = {
     "cat_code_regexp": r"^(?P<code>[a-zA-Z0-9\.]{1,11})[\s\.].*",
     "cat_codes_manual": {
         # remove whitespace at start of line
-        " 2.G.2 -SF6 and PFCs from Other Product Uses": "2.G.2 - SF6 and PFCs from Other Product Uses",
-        " 2.G.3 -N2O from Product Uses": "2.G.3 - N2O from Product Uses",
-        " 1.C.1 -Transport of CO2": "1.C.1 - Transport of CO2",
-        " 3.C.1 -Emissions from biomass burning ": "3.C.1",
+        "2.G.2 -SF6 and PFCs from Other Product Uses": "2.G.2 - SF6 and PFCs from Other Product Uses",
+        "2.G.3 -N2O from Product Uses": "2.G.3 - N2O from Product Uses",
+        "1.C.1 -Transport of CO2": "1.C.1 - Transport of CO2",
+        "3.C.1 -Emissions from biomass burning ": "3.C.1",
         "Memo Items (5)": "MEMO",
         "International Bunkers": "M.BK",
         "1.A.3.a.i - International Aviation (International Bunkers) (1)": "M.BK.A",
@@ -78,7 +78,7 @@ inv_conf_per_year = {
                 "1.A.3.a.i - International Aviation (International",
             ],
             -2: ["3.C.1 - Emissions from biomass burning"],
-            2: [" 3.C.1 -Emissions from biomass burning"],
+            2: ["3.C.1 -Emissions from biomass burning"],
         },
         "page_defs": {
             "176": {
@@ -98,6 +98,7 @@ inv_conf_per_year = {
                 "cols": ["287,328,365,410,449,482,540,600,636,675,721,750"],
             },
         },
+        "skip_rows": 11,
     },
     "2020": {
         "page_defs": {
@@ -138,6 +139,7 @@ inv_conf_per_year = {
                 "2.B.4 - Caprolactam. Glyoxal and Glyoxylic Acid",
             ],
         },
+        "skip_rows": 0,
     },
 }
 
@@ -181,8 +183,9 @@ inv_conf_per_entity = {
         },
         "cat_codes_manual": {"Total National Emissions (Gg CO2e)": "0"},
         "category_column": "Categories",
-        "columns_to_drop": ["Share, %", "Categories"],
-        "years": ["2007", "2010", "2015", "2020"],
+        # 2007 will break gas basket consistency check
+        "columns_to_drop": ["Share, %", "Categories", "2007"],
+        "years": ["2010", "2015", "2020"],
         "unit": "Gg CO2e",
     },
     "N2O": {
@@ -231,6 +234,7 @@ inv_conf_per_entity = {
         "columns_to_drop": ["Share, %", "Categories"],
         "years": ["1990", "1995", "2000", "2005", "2010", "2015", "2020"],
         "unit": "Gg",
+        "del_value": [("1995", "4"), ("2005", "4")],
     },
     "CO2": {
         "page_defs": {
@@ -258,7 +262,7 @@ inv_conf_per_entity = {
             ],
             5: ["2.D - Non-Energy"],
             -2: [
-                "Categories ",
+                "Categories",
                 "Emissions and Removals (Gg CO2)",
             ],
         },
@@ -266,9 +270,9 @@ inv_conf_per_entity = {
             "Total National Emissions (Gg CO2)",
             "Total National Removals (Gg CO2)",
         ],
-        "columns_to_drop": ["Share, %", " Categories "],
+        "columns_to_drop": ["Share, %", "Categories"],
         "cat_codes_manual": {"Total National Emissions and Removals (Gg CO2)": "0"},
-        "category_column": " Categories ",
+        "category_column": "Categories",
         "years": ["1990", "1995", "2000", "2005", "2010", "2015", "2020"],
         "unit": "Gg",
     },
@@ -336,13 +340,13 @@ inv_conf_per_sector = {
                 "Year",
             ],
         },
-        "year_column": " Year ",
+        "year_column": "Year",
         "cat_codes_manual": {
-            " Energy ": "1",
-            " IPPU ": "2",
-            " Agriculture ": "M.AG",
-            " Waste ": "4",
-            " LULUCF ": "M.LULUCF",
+            "Energy": "1",
+            "IPPU": "2",
+            "Agriculture": "M.AG",
+            "Waste": "4",
+            "LULUCF": "M.LULUCF",
             "Total (excl. LULUCF)": "M.0.EL",
             "Total (incl. LULUCF)": "0",
         },
@@ -367,16 +371,16 @@ inv_conf_per_sector = {
             ],
         },
         "rows_to_drop": [0, 2],
-        "year_column": "Years     ",
+        "year_column": "Years",
         "cat_codes_manual": {
-            r" 1.A.1.a.i Electricity  generation  ": "1.A.1.a.i",
-            r" 1.A.1.a.ii  Combined  heat and ipower peneration (CHP)": "1.A.1.a.ii",
-            r" 1.A.1.c.ii  Other  energy ndustries ": "1.A.1.c.ii",
-            r"Manufacturing industries and  construction   ": "1.A.2",
-            r" 1.A.3.a 1 Civil  aviation t  ": "1.A.3.a",
-            r" .A.3.b Road  ransportation  ": "1.A.3.b",
-            r" 1.A.3.c Railways    ": "1.A.3.c",
-            r" 1.A.3.e.ii  Off-road   ": "1.A.3.e.ii",
+            "1.A.1.a.i Electricity  generation": "1.A.1.a.i",
+            "1.A.1.a.ii  Combined  heat and ipower peneration (CHP)": "1.A.1.a.ii",
+            "1.A.1.c.ii  Other  energy ndustries": "1.A.1.c.ii",
+            "Manufacturing industries and  construction": "1.A.2",
+            "1.A.3.a 1 Civil  aviation t": "1.A.3.a",
+            ".A.3.b Road  ransportation": "1.A.3.b",
+            "1.A.3.c Railways": "1.A.3.c",
+            "1.A.3.e.ii  Off-road": "1.A.3.e.ii",
         },
     },
     "energy cont": {
@@ -395,16 +399,16 @@ inv_conf_per_sector = {
             ],
         },
         "rows_to_drop": [0, 2],
-        "year_column": "Years    ",
+        "year_column": "Years",
         "cat_codes_manual": {
-            "Other sectors 1.A.4.a Commercial/ Institutional  ": "1.A.4.a",
-            " 1.A.4.b Residen-tial  ": "1.A.4.b",
-            " 1.A.4.c.i Agriculture -Stationary  ": "1.A.4.c.i",
-            " 1.A.4.c.ii Agriculture -Off-road vehicles and other machinery": "1.A.4.c.ii",
-            "Non-specified 1.A.5.a Stationary  ": "1.A.5.a",
-            "Fugitive emis 1.B.1.a Coal mining & handling (surface mining) ": "1.B.1.a",
-            "sions from fu 1.B.2.a.ii Oil -Flaring  ": "1.B.2.a.ii",
-            "els 1.B.2.a.iii.2 Oil production and upgrading ": "1.B.2.a.iii",
+            "Other sectors 1.A.4.a Commercial/ Institutional": "1.A.4.a",
+            "1.A.4.b Residen-tial": "1.A.4.b",
+            "1.A.4.c.i Agriculture -Stationary": "1.A.4.c.i",
+            "1.A.4.c.ii Agriculture -Off-road vehicles and other machinery": "1.A.4.c.ii",
+            "Non-specified 1.A.5.a Stationary": "1.A.5.a",
+            "Fugitive emis 1.B.1.a Coal mining & handling (surface mining)": "1.B.1.a",
+            "sions from fu 1.B.2.a.ii Oil -Flaring": "1.B.2.a.ii",
+            "els 1.B.2.a.iii.2 Oil production and upgrading": "1.B.2.a.iii",
         },
     },
     "ippu": {
@@ -422,13 +426,13 @@ inv_conf_per_sector = {
                 "Year",
             ],
         },
-        "year_column": "Year ",
+        "year_column": "Year",
         "cat_codes_manual": {
-            "2.A-Mineral industry ": "2.A",
-            "2.C-Metal industry ": "2.C",
+            "2.A-Mineral industry": "2.A",
+            "2.C-Metal industry": "2.C",
             "2.D-Non-energy products from fuels and solvent use": "2.D",
             "2.F-Product uses as substitutes for ozone depleting substances": "2.F",
-            "2. IPPU Total ": "2",
+            "2. IPPU Total": "2",
         },
         "remove_duplicates": ["2"],
     },
@@ -447,14 +451,14 @@ inv_conf_per_sector = {
             ],
         },
         "rows_to_drop": [0, 1],
-        "year_column": "Year ",
+        "year_column": "Year",
         "cat_codes_manual": {
             "Fermentation Gg": "3.A.1",
             "Management CH4": "3.A.2",
-            " (Total CH4) ": "3.A",
+            "(Total CH4)": "3.A",
             "Fermentation Gg C": "3.A.1",
             "Management O2e": "3.A.2",
-            " (Gg CO2e) ": "3.A",
+            "(Gg CO2e)": "3.A",
         },
         "multi_entity": {
             "unit": ["Gg", "Gg", "Gg", "Gg CO2e", "Gg CO2e", "Gg CO2e"],
@@ -486,7 +490,7 @@ inv_conf_per_sector = {
                 "3.C.1 - Emiss",
             ],
         },
-        "year_column": "  Year  ",
+        "year_column": "Year",
         # TODO: These categories are technically duplicate, just with a different unit
         "categories_to_drop": [
             "3.C.1 -Emiss  CH4 (Gg CO2e)",
@@ -494,10 +498,10 @@ inv_conf_per_sector = {
             "ss burning  Total (Gg CO2e)",
         ],
         "cat_codes_manual": {
-            " 3.C.1  CH4 (Gg) ": "3.C.1",
-            " -Emissions fr  N2O (Gg) ": "3.C.1",
-            " om biomass bur  NOx (Gg) ": "3.C.1",
-            " ning  CO(Gg) ": "3.C.1",
+            "3.C.1  CH4 (Gg)": "3.C.1",
+            "-Emissions fr  N2O (Gg)": "3.C.1",
+            "om biomass bur  NOx (Gg)": "3.C.1",
+            "ning  CO(Gg)": "3.C.1",
         },
         "multi_entity": {
             "unit": ["Gg", "Gg", "Gg", "Gg"],
@@ -523,29 +527,35 @@ inv_conf_per_sector = {
                 "Urine and dung",
             ],
         },
-        "year_column": "  Year   ",
+        "year_column": "Year",
         # # TODO: technically duplicate, just with a different unit
         "categories_to_drop": [
-            " 3.C.4 -Direct N2O Emissions from managed soils (CO2e) Gg CO2e",
+            "3.C.4 -Direct N2O Emissions from managed soils (CO2e) Gg CO2e",
+            "Inorganic N fertilizer application  N2O (Gg)",
+            "Organic N applied as fertilizer (manure) N2O (Gg)",
+            "Urine and dung N deposited on pasture, range and paddock by grazing animals N2O (Gg)",
+            "N in crop residues  N2O (Gg)",
         ],
         "cat_codes_manual": {
             # TODO the next 4 categories are made up placeholders
-            " Inorganic N fertilizer application  N2O (Gg)": "3.C.4.i",
-            " Organic N applied as fertilizer (manure) N2O (Gg)": "3.C.4.ii",
-            "Urine and dung N deposited on pasture, range and paddock by grazing animals N2O (Gg)": "3.C.4.iii",
-            "  N in crop residues  N2O (Gg)": "3.C.4.iiii",
-            " 3.C.4 -Direct N2O Emissions from managed soils N2O (Gg)": "3.C.4",
-        },
-        "multi_entity": {
-            "unit": ["Gg", "Gg", "Gg", "Gg", "Gg"],
-            "entity": [
-                "N2O",
-                "N2O",
-                "N2O",
-                "N2O",
-                "N2O",
-            ],
+            # "Inorganic N fertilizer application  N2O (Gg)": "3.C.4.i",
+            # "Organic N applied as fertilizer (manure) N2O (Gg)": "3.C.4.ii",
+            # "Urine and dung N deposited on pasture, range and paddock by grazing animals N2O (Gg)": "3.C.4.iii",
+            # "N in crop residues  N2O (Gg)": "3.C.4.iiii",
+            "3.C.4 -Direct N2O Emissions from managed soils N2O (Gg)": "3.C.4",
         },
+        "entity": "N2O",
+        "unit": "Gg",
+        # "multi_entity": {
+        #     "unit": ["Gg", "Gg", "Gg", "Gg", "Gg"],
+        #     "entity": [
+        #         "N2O",
+        #         "N2O",
+        #         "N2O",
+        #         "N2O",
+        #         "N2O",
+        #     ],
+        # },
     },
     "managed_soils_indirect": {
         "page_defs": {
@@ -565,15 +575,17 @@ inv_conf_per_sector = {
                 "3.C.5 - Indirect N2O",
             ],
         },
-        "year_column": "  Year  ",
+        "year_column": "Year",
         # # TODO: technically duplicate, just with a different unit
         "categories_to_drop": [
-            "3.C.5 -Indirect N2O emissions from managed  soils Gg CO2e"
+            "3.C.5 -Indirect N2O emissions from managed  soils Gg CO2e",
+            "Volatilization  pathway Gg N2O",
+            "Leaching/runoff  pathway Gg N2O",
         ],
         "cat_codes_manual": {
             # TODO the next 2 categories are made up placeholders
-            " Volatilization  pathway Gg N2O": "3.C.5.i",
-            " Leaching/runoff  pathway Gg N2O": "3.C.5.ii",
+            # "Volatilization  pathway Gg N2O": "3.C.5.i",
+            # "Leaching/runoff  pathway Gg N2O": "3.C.5.ii",
             "3.C.5 -Indirect N2O emissions from managed  soils Gg N2O": "3.C.5",
         },
         "entity": "N2O",
@@ -592,17 +604,24 @@ inv_conf_per_sector = {
                 "Year",
             ],
         },
-        "year_column": "Year ",
+        "year_column": "Year",
         # # TODO: technically duplicate, just with a different unit
-        "categories_to_drop": ["Total emissions from SWDS Gg CO2e"],
+        "categories_to_drop": [
+            "Total emissions from SWDS Gg CO2e",
+            "Food",
+            "Garden",
+            "Paper Gg CH4",
+            "Wood",
+            "Textile",
+        ],
         "cat_codes_manual": {
             # TODO the categories are made up placeholders
-            "Food ": "4.A.1.food",
-            "Garden ": "4.A.1.garden",
-            "Paper Gg CH4": "4.A.1.paper",
-            "Wood ": "4.A.1.wood",
-            "Textile ": "4.A.1.textile",
-            "Total ": "4.A.1.",
+            # "Food": "4.A.1.food",
+            # "Garden": "4.A.1.garden",
+            # "Paper Gg CH4": "4.A.1.paper",
+            # "Wood": "4.A.1.wood",
+            # "Textile": "4.A.1.textile",
+            "Total": "4.A.1.",
         },
         "entity": "CH4 ",
         "unit": "Gg",
@@ -625,19 +644,18 @@ inv_conf_per_sector = {
                 "Wastewater",
             ],
         },
-        "year_column": "   Year  ",
+        "year_column": "Year",
         # # TODO: technically duplicate, just with a different unit
         "categories_to_drop": [
-            " Domestic wastewater  CH4 emissions ",
-            " Domestic wastewater  N2O emissions (Gg C",
-            " Industrial wastewater  CH4 emissions O2 e)",
-            "Wastewater treatment and discharge  Total emissions ",
+            "Domestic wastewater  CH4 emissions",
+            "Domestic wastewater  N2O emissions (Gg C",
+            "Industrial wastewater  CH4 emissions O2 e)",
+            "Wastewater treatment and discharge  Total emissions",
         ],
         "cat_codes_manual": {
-            # TODO the categories are made up placeholders
-            " Domestic wastewater  CH4 emissions (Gg CH4)": "4.D.1",
-            " Domestic wastewater  N2O emissions (Gg N2O)": "4.D.1",
-            " Industrial wastewater  CH4 emissions (Gg CH4)": "4.D.2",
+            "Domestic wastewater  CH4 emissions (Gg CH4)": "4.D.1",
+            "Domestic wastewater  N2O emissions (Gg N2O)": "4.D.1",
+            "Industrial wastewater  CH4 emissions (Gg CH4)": "4.D.2",
         },
         "multi_entity": {
             "unit": ["Gg", "Gg", "Gg"],
@@ -703,41 +721,30 @@ meta_data = {
 country_processing_step1 = {
     "tolerance": 0.01,
     "aggregate_cats": {
-        # TODO: Remove "M.3.C.AG". Just here to see previous aggregation setup.
-        # "M.3.C.AG": {
-        #     "sources": [
-        #         "3.C.1",
-        #         "3.C.2",
-        #         "3.C.3",
-        #         "3.C.4",
-        #         "3.C.5",
-        #         "3.C.6",
-        #         "3.C.7",
-        #         "3.C.8",
-        #     ],
-        #     "name": "Aggregate sources and non-CO2 emissions sources on land "
-        #     "(Agriculture)",
-        # },
-        "M.3.D.AG": {"sources": ["3.D.2"], "name": "Other (Agriculture)"},
-        # TODO: In this case 3.C should be equivalent to M.3.C.AG, but I'm not sure.
+        "M.3.D.AG": {"sources": ["3.D.2"]},
         "M.3.C.AG": {
             "sources": ["3.C.1", "3.C.4", "3.C.5"],
-            "name": "Aggregate sources and non-CO2 emissions sources on land ",
         },
         "M.AG.ELV": {
             "sources": ["M.3.C.AG", "M.3.D.AG"],
-            "name": "Agriculture excluding livestock",
         },
-        "M.AG": {"sources": ["3.A.1", "3.A.2", "M.AG.ELV"], "name": "Agriculture"},
-        "M.3.D.LU": {"sources": ["3.D.1"], "name": "Other (LULUCF)"},
-        "M.LULUCF": {"sources": ["3.B", "M.3.D.LU"], "name": "LULUCF"},
+        # "3.A" : {"sources" : ["3.A.1", "3.A.2"]},
+        # "3.C" : {"sources" : ["3.C.1",
+        #                       "3.C.2",
+        #                       "3.C.3",
+        #                       "3.C.4",
+        #                       "3.C.5",
+        #                       "3.C.6",
+        #                       "3.C.7",
+        #                       "3.C.8", ]},
+        # "3.D" : {"sources" : ["3.D.1", "3.D.2"]},
+        "M.AG": {"sources": ["3.A", "M.AG.ELV"]},
+        "M.3.D.LU": {"sources": ["3.D.1"]},
+        "M.LULUCF": {"sources": ["3.B", "M.3.D.LU"]},
         "M.0.EL": {
             "sources": ["1", "2", "M.AG", "4"],
-            "name": "National total emissions excluding LULUCF",
         },
-        "3": {"sources": ["M.AG", "M.LULUCF"], "name": "AFOLU"},  # consistency check
-        # TODO why is this line repeated? Check if can be removed
-        # "M.0.EL": {"sources": ["1", "2", "M.AG", "4"]},  # consistency check
+        "3": {"sources": ["M.AG", "M.LULUCF"]},  # consistency check
         "0": {"sources": ["1", "2", "3", "4"]},  # consistency check
     },
     "basket_copy": {
@@ -745,8 +752,36 @@ country_processing_step1 = {
         "entities": ["HFCS", "PFCS"],
         "source_GWP": gwp_to_use,
     },
+    "downscale": {
+        "sectors": {
+            "1.B_CH4": {
+                "basket": "1.B",
+                "basket_contents": ["1.B.1", "1.B.2"],
+                "entities": ["CH4"],
+                "dim": f"category ({coords_terminologies['category']})",
+                # "tolerance": 0.05,  # some inconsistencies (rounding?)
+            },
+            "1.B_CO2": {
+                "basket": "1.B",
+                "basket_contents": ["1.B.1", "1.B.2"],
+                "entities": ["CO2"],
+                "dim": f"category ({coords_terminologies['category']})",
+                "sel": {
+                    "time": [
+                        "2000",
+                        "2005",
+                        "2010",
+                        "2015",
+                        "2020",
+                    ]
+                },
+            },
+        }
+    },
 }
 
+country_processing_gas_baskets = {"tolerance": 0.02}
+
 gas_baskets = {
     "FGASES (SARGWP100)": ["HFCS (SARGWP100)", "PFCS (SARGWP100)", "SF6", "NF3"],
     "FGASES (AR4GWP100)": ["HFCS (AR4GWP100)", "PFCS (AR4GWP100)", "SF6", "NF3"],

+ 11 - 2
src/unfccc_ghg_data/unfccc_reader/Mongolia/read_MNG_BUR2_from_pdf.py

@@ -17,6 +17,7 @@ from unfccc_ghg_data.unfccc_reader.Mongolia.config_mng_bur2 import (
     coords_defaults,
     coords_terminologies,
     coords_value_mapping,
+    country_processing_gas_baskets,
     country_processing_step1,
     filter_remove,
     gas_baskets,
@@ -97,7 +98,7 @@ if __name__ == "__main__":
 
         df_header = pd.DataFrame([inv_conf["header"], inv_conf["unit"]])
 
-        skip_rows = 11
+        skip_rows = inv_conf_per_year[year]["skip_rows"]
         df_year = pd.concat(
             [df_header, df_year[skip_rows:]], axis=0, join="outer"
         ).reset_index(drop=True)
@@ -257,6 +258,10 @@ if __name__ == "__main__":
         for year in inv_conf_per_entity[entity]["years"]:
             df_entity.loc[:, year] = df_entity[year].str.replace(",", "")
 
+        # if "del_value" in inv_conf_per_entity[entity]:
+        #     for year_del, category_del in inv_conf_per_entity[entity]["del_value"]:
+        #         df_entity.loc[df_entity["category"] == category_del, year_del] = ""
+
         if df_trend is None:
             df_trend = df_entity
         else:
@@ -422,10 +427,14 @@ if __name__ == "__main__":
         # transpose so categegories are in first columns
         df_sector = df_sector.T
 
+        # strip white spaces from column names
+        df_sector.columns = df_sector.columns.str.strip()
+
         df_sector = df_sector.rename(
             columns={inv_conf_per_sector[sector]["year_column"]: "category"}
         )
 
+        df_sector["category"] = df_sector["category"].str.strip()
         df_sector["category"] = df_sector["category"].str.replace("\n", "")
 
         # TODO This is the same functionality as remove_duplicates ?
@@ -536,7 +545,7 @@ if __name__ == "__main__":
         cat_terminology_out=None,
         category_conversion=None,
         sectors_out=None,
-        processing_info_country=None,
+        processing_info_country=country_processing_gas_baskets,
     )
 
     data_proc_pm2 = process_data_for_country(