From d0dd7eadd34627d90084d123ca5c36d0340ef90c Mon Sep 17 00:00:00 2001
From: Martin Killenberg <martin.killenberg@desy.de>
Date: Fri, 14 Oct 2022 16:23:51 +0200
Subject: [PATCH] Configure frequency and CW of VNA at script start

- Frequency is a new parameter in json file
- Set wide acceptance ranges of other test stand parameters for demo purposes
---
 Python_script/prototype.py              | 5 ++++-
 Python_script/test_stand_parameter.json | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Python_script/prototype.py b/Python_script/prototype.py
index 6777871..1cef1c8 100755
--- a/Python_script/prototype.py
+++ b/Python_script/prototype.py
@@ -31,7 +31,7 @@ class MeasurementData:
         self.s11 = s11
         self.s21 = s21
         self.s12 = s12
-        self. s22 = s22
+        self.s22 = s22
 
 
 class Measurements:
@@ -41,6 +41,7 @@ class Measurements:
         self.max_delta_mag = config_data['delta_mag']
         self.max_delta_phase = config_data['delta_phase']
         self.sleep_time = config_data["sleep_time"]
+        self.frequency = config_data["frequency"]
         target_accuracy = [self.max_delta_temp, self.max_delta_hum]
         self.chamber = climate_chamber.create_chamber(chamber_address, target_accuracy)
         self.vna = VNA.create_vna(vna_address, target_accuracy)
@@ -61,6 +62,8 @@ class Measurements:
         self.vna.create_new_trace("Trace6", "B1")
         self.vna.create_new_trace("Trace7", "A2")
         self.vna.create_new_trace("Trace8", "B2")
+        self.vna.set_cw_frequency(self.frequency)
+        self.vna.set_sweep_mode('CW')
 
     def perform_measurements(self):
         with open(self.output, mode='w', newline='') as csv_file:
diff --git a/Python_script/test_stand_parameter.json b/Python_script/test_stand_parameter.json
index 420b165..5ebf34d 100644
--- a/Python_script/test_stand_parameter.json
+++ b/Python_script/test_stand_parameter.json
@@ -1 +1 @@
-{"delta_temp": 1, "delta_hum":5 , "delta_mag":5 , "delta_phase": 5, "sleep_time": 1.0}
+{"delta_temp": 1, "delta_hum": 2, "delta_mag": 0.1 , "delta_phase": 5, "sleep_time": 1.0, "frequency": 1300000000}
-- 
GitLab