From 2ac06cc75ebd7c016e2d231ca6dbd9b16fd178ea Mon Sep 17 00:00:00 2001
From: Martin Killenberg <martin.killenberg@desy.de>
Date: Thu, 19 Jan 2023 17:04:40 +0100
Subject: [PATCH] fix humidity simulation start point
---
Python_script/VNA_dummy.py | 8 ++++----
Python_script/climate_chamber_dummy.py | 4 ++--
Python_script/shared_simulated_state.py | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Python_script/VNA_dummy.py b/Python_script/VNA_dummy.py
index 506397b..488477d 100644
--- a/Python_script/VNA_dummy.py
+++ b/Python_script/VNA_dummy.py
@@ -33,8 +33,8 @@ class VnaDummy:
self.reference_magnitude = 0.7 # at reference temp and reference hum
self.reference_phase = 70 # at reference temp and reference hum
self.reference_temp = 25
- self.magnitude_slope = 0.02
- self.phase_slope = 0.1
+ self.magnitude_slope_temp = 0.02
+ self.phase_slope_temp = 0.1
self.communication_delay = 0.2
def run_simulation(self):
@@ -44,7 +44,7 @@ class VnaDummy:
def simulate_magnitude(self):
- target_magnitude_difference_temp = -1. * self.magnitude_slope * \
+ target_magnitude_difference_temp = -1. * self.magnitude_slope_temp * \
(self.simulated_state.simulated_temperature - self.reference_temp)
delta_magnitude = target_magnitude_difference_temp - self.simulated_magnitude_difference_temp
@@ -56,7 +56,7 @@ class VnaDummy:
def simulate_phase(self):
- target_phase_difference_temp = self.phase_slope * \
+ target_phase_difference_temp = self.phase_slope_temp * \
(self.simulated_state.simulated_temperature - self.reference_temp)
delta_phase = target_phase_difference_temp - self.simulated_phase_difference_temp
diff --git a/Python_script/climate_chamber_dummy.py b/Python_script/climate_chamber_dummy.py
index b6741d5..3b62f35 100644
--- a/Python_script/climate_chamber_dummy.py
+++ b/Python_script/climate_chamber_dummy.py
@@ -24,8 +24,8 @@ class ClimateChamberDummy:
self.simulated_state = shared_simulated_state.get_simulated_state()
self.last_simulation_time = self.simulated_state.simulated_time
self.simulated_mode = 'OFF'
- self.target_temperature = 25
- self.target_humidity = 35
+ self.target_temperature = self.simulated_state.simulated_temperature
+ self.target_humidity = self.simulated_state.simulated_humidity
self.temperature_slope = 0.1 # 0.1 degrees/second
self.humidity_slope = 0.5 # degrees/second
self.communication_delay = 0.3
diff --git a/Python_script/shared_simulated_state.py b/Python_script/shared_simulated_state.py
index 0eda345..bae9bc5 100644
--- a/Python_script/shared_simulated_state.py
+++ b/Python_script/shared_simulated_state.py
@@ -13,4 +13,4 @@ class SimulatedState:
self.simulated_time = 0
self.simulated_temperature = 25
- self.simulated_humidity = 30
+ self.simulated_humidity = 35
--
GitLab