From 6390739fd9e90fab471dca37bc71d6e6963c2dff Mon Sep 17 00:00:00 2001
From: "mauro.trovo" <mauro.trovo@elettra.eu>
Date: Fri, 4 Apr 2025 15:37:29 +0200
Subject: [PATCH] waist correct
---
docs/ScrivoEcoMaster.py | 6 +++---
src/EEHGMaster.py | 5 ++---
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/docs/ScrivoEcoMaster.py b/docs/ScrivoEcoMaster.py
index 291b623..074f771 100644
--- a/docs/ScrivoEcoMaster.py
+++ b/docs/ScrivoEcoMaster.py
@@ -44,8 +44,8 @@ def cambio_lambdaECO(new_wavelength = 13.2):
# 5 applico se non e' andato in time out
if attesa and master_proxy.command_inout('State') == PyTango.DevState.ON:
-# master_proxy.command_inout('ApplyAll')
- print('tutto ok ed avrebbe applcato')
+ master_proxy.command_inout('ApplyAll')
+# print('tutto ok ed avrebbe applcato')
-#cambio_lambdaECO(12.2)
\ No newline at end of file
+#cambio_lambdaECO(12.2)
diff --git a/src/EEHGMaster.py b/src/EEHGMaster.py
index 928c4a2..46c5caa 100755
--- a/src/EEHGMaster.py
+++ b/src/EEHGMaster.py
@@ -2109,7 +2109,7 @@ class EEHGMaster(Device):
self.error_stream('failed to read waist 1')
self.set_state(tango.DevState.ALARM)
self.set_status('Alarm, failed to read waist 1')
- self._waist_s1 = valore
+ self._waist_s1 = valore * 2.0 # assegnamo il doppio del valore letto dalla ccd (rif. EA)
else:
self.set_state(tango.DevState.ALARM)
@@ -2126,8 +2126,7 @@ class EEHGMaster(Device):
self.error_stream('failed to read waist 2')
self.set_state(tango.DevState.ALARM)
self.set_status('Alarm, failed to read waist 2')
-
- self._waist_s2 = valore
+ self._waist_s2 = valore * 2.0
else:
self.set_state(tango.DevState.ALARM)
--
GitLab