From d10c84e764b925be38d0fe4cda678d0f10f2bf10 Mon Sep 17 00:00:00 2001
From: Martin Killenberg <martin.killenberg@desy.de>
Date: Wed, 16 Aug 2023 14:55:11 +0200
Subject: [PATCH] fix: __main__ section of prototype script
---
Python_script/prototype.py | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/Python_script/prototype.py b/Python_script/prototype.py
index 305b887..d7424ba 100755
--- a/Python_script/prototype.py
+++ b/Python_script/prototype.py
@@ -512,11 +512,16 @@ if __name__ == '__main__':
with open('test_stand_parameter.json', 'r') as f:
config_data = json.load(f)
- mes = Measurements(args.chamber, args.vna, output_basename, args.standby, config_data)
+ with open('ext_sensor_channels.json', 'r') as f2:
+ ext_sensor_channels = json.load(f2)
+
+ mes = Measurements(args.chamber, args.vna, output_basename, args.standby, config_data, ext_sensor_channels,
+ config_data['logger_ip'])
try:
if args.file:
n_measurements = mes.perform_measurements(args.file)
- plot_output(output_basename, range(n_measurements), args.plot, output_basename)
+ plot_output(output_basename, range(n_measurements), args.plot, config_data, ext_sensor_channels,
+ output_basename)
if args.temperaturesweepfile:
temperatures, humidity = run_temperature_sweep_from_file(args.temperaturesweepfile, mes)
# run analysis here
@@ -524,7 +529,8 @@ if __name__ == '__main__':
for t in temperatures:
temp_extensions.append(str(t)+'deg_'+str(humidity)+'rh')
analysis.plot_sweep(temperatures, [humidity]*len(temperatures), output_basename, 'temperature')
- plot_output(output_basename, temp_extensions, args.plot, output_basename + ': Temperature sweep ' +
+ plot_output(output_basename, temp_extensions, args.plot, config_data, ext_sensor_channels,
+ output_basename + ': Temperature sweep ' +
str(temperatures[0]) + ' degC to ' + str(temperatures[-1]) + ' degC')
print(str(temp_extensions))
finally:
--
GitLab