From e9a195d61e8d5b4ac30471987d95b9eaee985a6a Mon Sep 17 00:00:00 2001
From: l_samenv <l_samenv@samenv.psi.ch>
Date: Tue, 4 Jul 2023 17:02:48 +0200
Subject: [PATCH] flamedil as of 2023-07-04

---
 cfg/addons/flamesample_cfg.py |  4 ++--
 frappy_psi/ls372.py           | 10 ++++++----
 frappy_psi/parmod.py          |  1 +
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/cfg/addons/flamesample_cfg.py b/cfg/addons/flamesample_cfg.py
index 5b2a03f..626fef4 100644
--- a/cfg/addons/flamesample_cfg.py
+++ b/cfg/addons/flamesample_cfg.py
@@ -22,7 +22,7 @@ Mod('ts_low',
     channel = 3,
     switcher = 'lsc_channel',
     minrange=13,
-    range=17,
+    range=22,
     tolerance = 0.1,
     htrrng=4,
 )
@@ -33,7 +33,7 @@ Mod('ts_high',
     channel = 1,
     switcher = 'lsc_channel',
     minrange=9,
-    range=20,
+    range=22,
     tolerance = 0.1,
     htrrng=5,
     minheater=5e-4,
diff --git a/frappy_psi/ls372.py b/frappy_psi/ls372.py
index ad2b062..7b0c313 100644
--- a/frappy_psi/ls372.py
+++ b/frappy_psi/ls372.py
@@ -426,16 +426,18 @@ class TemperatureLoop(HasConvergence, TemperatureChannel, Drivable):
 
     def write_target(self, target):
         outmode = (5, self.channel, 0, 0, 1, 3)
-        prev = parse(self.communicate('OUTMODE?{self.loop}'))
+        prev = parse(self.communicate(f'OUTMODE?{self.loop}'))
         if outmode != prev:
-            self.communicate('OUTMODE {self.loop}, %g,%g,%g,%g,%g,%g;*OPC?' % tuple(outmode))
-        self.communicate('MOUT {self.loop},{self.min_percent()};*OPC?')
+            self.communicate(f'OUTMODE {self.loop}, %g,%g,%g,%g,%g,%g;*OPC?' % tuple(outmode))
+        self.communicate(f'MOUT {self.loop},{self.min_percent()};*OPC?')
         for chan in self.switcher.channels.values():
             chan._control_active = False
         self._control_active = True
         self.read_control_active()
         self.convergence_start()
-        return float(self.communicate(f'SETP {self.loop},{target};SETP?{self.loop}'))
+        # do not resturn the readback value, as it might not yet be correct
+        self.communicate(f'SETP {self.loop},{target};SETP?{self.loop}')
+        return target
 
     #def write_ctrlpars(self, ctrlpars):
     #    p, i, d = self.change(f'PID {self.loop}', ctrlpars['p'], ctrlpars['i'], ctrlpars['d'])
diff --git a/frappy_psi/parmod.py b/frappy_psi/parmod.py
index b76d0a0..338fc11 100644
--- a/frappy_psi/parmod.py
+++ b/frappy_psi/parmod.py
@@ -196,4 +196,5 @@ class SwitchDriv(HasConvergence, Drivable):
         set_enabled(other, False)
         self.write_selected(selected)
         self.convergence_start()
+        self.log.info('target=%g (%s)', target, this.name)
         return this.write_target(target)