From 442c8a8c7490d9e252923dff0434fd19b487d3d8 Mon Sep 17 00:00:00 2001
From: lisazeyen <35347358+lisazeyen@users.noreply.github.com>
Date: Thu, 11 Apr 2024 09:26:30 +0200
Subject: [PATCH] adjust valid_grouping_years

change sign, split up conditions for better readibility
---
 scripts/add_existing_baseyear.py | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/scripts/add_existing_baseyear.py b/scripts/add_existing_baseyear.py
index ddd409c1..285776cc 100644
--- a/scripts/add_existing_baseyear.py
+++ b/scripts/add_existing_baseyear.py
@@ -461,14 +461,22 @@ def add_heating_capacities_installed_before_baseyear(
             efficiency = costs.at[costs_name, "efficiency"]
 
         valid_grouping_years = pd.Series(
-            [int(gy) for gy in grouping_years if
-            int(baseyear) - default_lifetime <= int(gy) < int(baseyear)])
+            [
+                int(grouping_year)
+                for grouping_year in grouping_years
+                if int(grouping_year) + default_lifetime > int(baseyear)
+                and int(grouping_year) < int(baseyear)
+            ]
+        )
         # Installation is assumed to be linear for the past
-        _intervals = pd.concat(
-            [valid_grouping_years[1:], pd.Series(baseyear)],
-            ignore_index=True) - valid_grouping_years
+        _intervals = (
+            pd.concat(
+                [valid_grouping_years[1:], pd.Series(baseyear)], ignore_index=True
+            )
+            - valid_grouping_years
+        )
         ratios = _intervals / _intervals.sum()
-        
+
         for ratio, grouping_year in zip(ratios, valid_grouping_years):
 
             n.madd(