From 893bd5fa4bef55add3203ac994c386f97b85cbd4 Mon Sep 17 00:00:00 2001
From: Markus Zolliker <markus.zolliker@psi.ch>
Date: Fri, 4 Jul 2025 10:51:54 +0200
Subject: [PATCH] automatic LN2 fill with ILM - fix problems on restart

on the first reading, the level value might be invalid,
then it tries to fill and switch to inactive because there
is not valid level value.

fix: stay watching as long as the level is invalid
---
 tcl/drivers/ccu4ext.tcl |  6 +++++-
 tcl/ls372sc.addon       | 14 +++-----------
 tcl/secop.config        |  2 +-
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/tcl/drivers/ccu4ext.tcl b/tcl/drivers/ccu4ext.tcl
index 5e3e837..57c6033 100644
--- a/tcl/drivers/ccu4ext.tcl
+++ b/tcl/drivers/ccu4ext.tcl
@@ -96,6 +96,7 @@ proc ccu4ext::calcsmooth {level minspeed maxspeed} {
   set lasttime [silent 0 sct lasttime]
   if {$lasttime == 0} {
     set lasttime $now
+    hupdate [sct]/smooth $level
   }
   set delta [expr $now - $lasttime]
   sct lasttime $now
@@ -220,7 +221,10 @@ proc ccu4ext::fillExt {type} {
       return idle
     }
     0 { # watching
-      validated_level
+      if {[validated_level] eq ""} {
+        clientput "invalid $type level - suspend watching"
+        return idle
+      }
       set minspeed [expr - 100.0 / [hvali [sct]/minholdhours] / 3600.]
       set maxspeed [expr - 100.0 / [hvali [sct]/maxholdhours] / 3600.]
       set s [calcsmooth $level $minspeed $maxspeed]
diff --git a/tcl/ls372sc.addon b/tcl/ls372sc.addon
index c969a48..c99f8bc 100644
--- a/tcl/ls372sc.addon
+++ b/tcl/ls372sc.addon
@@ -3,19 +3,11 @@ addonDesc = additional LakeShore 372
 #-sensor abs: converted value will be absolute value (-sensor raw does respect sign)
 
 makenv ls_dilsc -driver 372_lsc -port dilsc-ls2.psi.ch:7777 {
-  # LiErF4 puck CHA
-  lsc_sensor reg A -sensor U08127 -excitation 20uV -filter 1 -dwell 3       
-  # LiErF4 puck CH7
-  lsc_sensor plato 7 -sensor U08905 -excitation 20uV -filter 1 -dwell 3
-  # LiErF4 puck CH8
-  lsc_sensor chip 8 -sensor T_chip_2025-04-08 -excitation 20uV -filter 1 -dwell 3 
-
-  #lsc_sensor plato 7 -sensor QT2-PS1_RuO -excitation 20uV -filter 1 -dwell 3 #MWpuck
+  lsc_sensor reg 7 -sensor U07012 -excitation 20uV -filter 1 -dwell 3     
+  lsc_sensor plato A -sensor U08905 -excitation 20uV -filter 1 -dwell 3
+  #lsc_sensor chip 8 -sensor T_chip_2025-04-08 -excitation 20uV -filter 1 -dwell 3 
   #lsc_sensor chip 2 -sensor 2023-BC1_2 -excitation 20uV -filter 1 -dwell 3
   #lsc_sensor chip 8 -sensor 2024-BC1-V2 -excitation 20uV -filter 1 -dwell 3 
-  #lsc_loop heater_plato -loop 0 -channel 1 -maxheater 10mA -resist 320 -loopname plato
-  #lsc_sensor plato 8 -sensor U08910 -excitation 20uV -filter 1 -dwell 3
-  #lsc_sensor reg A -sensor U08833 -excitation 20uV -filter 1 -dwell 3  #MW puck
   lsc_loop heater_plato -loop 0 -channel A -maxheater 10mA -resist 28 -loopname plato
 }
 
diff --git a/tcl/secop.config b/tcl/secop.config
index fa428c6..87e3aea 100644
--- a/tcl/secop.config
+++ b/tcl/secop.config
@@ -1,6 +1,6 @@
 deviceDesc = SECoP test (version v1.0)
 
-device stick_menu "secop"
+device stick_menu "none secop"
 
 set ::secop_version 4