#232 Improve data yield in fast switching conditions (2)

make grace period configurable
tum-esm · Dec 11, 2024 · e07364c · e07364c
1 parent b42229f
commit e07364c
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 2 deletions.
diff --git a/config/config.default.json b/config/config.default.json
@@ -51,7 +51,8 @@
       "minute": 0,
       "second": 0
     },
-    "min_sun_elevation": 0
+    "min_sun_elevation": 0,
+    "shutdown_grace_period": 300
   },
   "tum_enclosure": null,
   "helios": null,

diff --git a/packages/core/threads/cas_thread.py b/packages/core/threads/cas_thread.py
@@ -84,7 +84,10 @@ def main(headless: bool = False) -> None:
                             time_since_last_good_decision = (
                                 time.time() - last_good_automatic_decision
                             )
-                            if time_since_last_good_decision < 300:
+                            if (
+                                time_since_last_good_decision
+                                < config.measurement_triggers.shutdown_grace_period
+                            ):
                                 should_measure = True
                                 logger.info(
                                     f"Last good automatic decision was {time_since_last_good_decision} seconds ago – not shutting down yet."

diff --git a/packages/core/types/config.py b/packages/core/types/config.py
@@ -135,6 +135,12 @@ class MeasurementTriggersConfig(StricterBaseModel):
     start_time: TimeDict
     stop_time: TimeDict
     min_sun_elevation: float = pydantic.Field(..., ge=0, le=90)
+    shutdown_grace_period: float = pydantic.Field(
+        ...,
+        ge=0,
+        le=3600,
+        description="How long to wait to stop measurements after the trigger conditions are not met anymore (in seconds)",
+    )
 
 
 class PartialMeasurementTriggersConfig(StricterBaseModel):
@@ -146,6 +152,12 @@ class PartialMeasurementTriggersConfig(StricterBaseModel):
     start_time: Optional[PartialTimeDict] = None
     stop_time: Optional[PartialTimeDict] = None
     min_sun_elevation: Optional[float] = pydantic.Field(None, ge=0, le=90)
+    shutdown_grace_period: Optional[float] = pydantic.Field(
+        None,
+        ge=0,
+        le=3600,
+        description="How long to wait to stop measurements after the trigger conditions are not met anymore (in seconds)",
+    )
 
 
 class HeliosConfig(StricterBaseModel):

diff --git a/tests/fixtures.py b/tests/fixtures.py
@@ -53,6 +53,7 @@
         start_time={"hour": 7, "minute": 0, "second": 0},
         stop_time={"hour": 21, "minute": 0, "second": 0},
         min_sun_elevation=0,
+        shutdown_grace_period=300,
     ),
     tum_enclosure=None,
     helios=None,