From 80b0c09c3724d41e13ed54c89da3ec7084d6b95b Mon Sep 17 00:00:00 2001 From: l_samenv Date: Mon, 17 Oct 2022 16:56:44 +0200 Subject: [PATCH 1/5] calcurves/U081*.340: fix setpoint limits may be wrong order? R increasing T decreasing --- tcl/calcurves/U08127.340 | 2 +- tcl/calcurves/U08130.340 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tcl/calcurves/U08127.340 b/tcl/calcurves/U08127.340 index 48cf12e..1ab7852 100644 --- a/tcl/calcurves/U08127.340 +++ b/tcl/calcurves/U08127.340 @@ -2,7 +2,7 @@ Comment: 30.07.2021, FP and CMN, 16mK--2.3K extrapolated elsewhere Sensor Model: RX-1000-BF0.007 Serial Number: U08127 Data Format: 4 (Log Ohms/Kelvin) -SetPoint Limit: 0.0282 (Kelvin) +SetPoint Limit: 20 (Kelvin) Temperature coefficient: 1 (Negative) Number of Breakpoints: 198 diff --git a/tcl/calcurves/U08130.340 b/tcl/calcurves/U08130.340 index 1baf133..7ad0b64 100644 --- a/tcl/calcurves/U08130.340 +++ b/tcl/calcurves/U08130.340 @@ -1,7 +1,7 @@ Sensor Model: RX-1000-BF0.007 Serial Number: U08130 Data Format: 4 (Log Ohms/Kelvin) -SetPoint Limit: 0.0167 (Kelvin) +SetPoint Limit: 10 (Kelvin) Temperature coefficient: 1 (Negative) Number of Breakpoints: 198 From 6d99df5bf1fa5e27153b6b64a929628ce5a7b522 Mon Sep 17 00:00:00 2001 From: l_samenv Date: Mon, 17 Oct 2022 17:09:43 +0200 Subject: [PATCH 2/5] CCU4: fix enum in he ext channel parameter --- tcl/drivers/ccu4.tcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tcl/drivers/ccu4.tcl b/tcl/drivers/ccu4.tcl index a255017..1726313 100644 --- a/tcl/drivers/ccu4.tcl +++ b/tcl/drivers/ccu4.tcl @@ -228,7 +228,7 @@ proc stdConfig::ccu4 {{title CCU4} args} { node hea out prop label "add. He channels" - prop enum 0,1,6 + prop enum 0,1,6=6 node hch out -int prop label "LHe channel" From 60112ccdc5f3e22841aeecb174b203783f5e5ecf Mon Sep 17 00:00:00 2001 From: l_samenv Date: Mon, 17 Oct 2022 17:10:39 +0200 Subject: [PATCH 3/5] improve luft driver --- tcl/drivers/luft.tcl | 4 ++-- tcl/luft.tclsh | 25 ++++++++++++++++++++----- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/tcl/drivers/luft.tcl b/tcl/drivers/luft.tcl index d876760..a597cba 100644 --- a/tcl/drivers/luft.tcl +++ b/tcl/drivers/luft.tcl @@ -45,8 +45,8 @@ proc luft::writeCf {} { } else { luft::set_error "epics error: $val $errtxt" } - if {[scan [lindex [sct target] 0] %d period]} { - sct timeout [expr [clock seconds] + $period + 10] + catch { + sct timeout [expr [clock seconds] + $timeout + 10] } return idle } diff --git a/tcl/luft.tclsh b/tcl/luft.tclsh index 1aa17c6..c579f05 100755 --- a/tcl/luft.tclsh +++ b/tcl/luft.tclsh @@ -16,6 +16,7 @@ proc readpipe {} { puts stdout "> $line" } if {[eof $sea(pipe)]} { + puts stdout EOF exit } lassign $line adr date time value @@ -65,7 +66,12 @@ set env(EPICS_CA_AUTO_ADDR_LIST) NO set env(PATH) $env(PATH):/afs/psi.ch/project/sinq/rhel7/stow/base-3.15.5/bin/linux-x86_64-debug/ set sea(debug) [lindex "$argv 0" 0] -set sea(heartbeat) 300 +if {$sea(debug) eq "1"} { + set sea(heartbeat) 20 +} else { + set sea(heartbeat) 300 + set sea(debug) 0 +} # connect to sea server prep0 set sea(sock) [socket samenv.psi.ch 8640] @@ -78,15 +84,14 @@ if {$sea(debug)} { set cmd "/afs/psi.ch/project/sinq/rhel7/stow/base-3.15.5/bin/linux-x86_64-debug/camonitor [array names values]" set ret [catch {set proc [exec ps ax -o pid,args | grep $cmd]} msg] +set killed [list] if {$ret == 0} { foreach line [split $proc "\n"] { set l [split [string trim $line]] set c [lrange $l 1 end] if {"$c" eq "$cmd"} { # process was still running - if {$sea(debug)} { - puts stdout "kill $proc ($c)" - } + lappend killed [lindex $l 0] exec kill -9 [lindex $l 0] } } @@ -95,5 +100,15 @@ if {$ret == 0} { set sea(pipe) [open "|$cmd" r] fileevent $sea(pipe) readable readpipe -puts stdout [pid $sea(pipe)] +set mypid [pid $sea(pipe)] +set f [open $env(HOME)/monitfiles/luft_camonitor.pid w] +puts $f $mypid +close $f + +puts stdout $mypid +if {[llength $killed] > 0 && $sea(debug)} { + puts stdout "killed $killed" +} + +seacom "clientlog luft started" vwait forever From a7c452584192f53119c578a601cead9f7c0973bd Mon Sep 17 00:00:00 2001 From: l_samenv Date: Mon, 17 Oct 2022 17:11:21 +0200 Subject: [PATCH 4/5] enable motor valves --- tcl/dil3.stick | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tcl/dil3.stick b/tcl/dil3.stick index d3bca3b..511052a 100644 --- a/tcl/dil3.stick +++ b/tcl/dil3.stick @@ -73,6 +73,6 @@ dil extVersion 1 catch {default ts control} catch {default ts heaterselect} -#makeMotorValve vb ${dilts}:3004 -#makeMotorValve vm ${dilts}:3006 +makeMotorValve vb ${dilts}:3004 +makeMotorValve vm ${dilts}:3006 From d223aa2d44597e1d5ec919401070db8da0714555 Mon Sep 17 00:00:00 2001 From: l_samenv Date: Mon, 17 Oct 2022 17:12:15 +0200 Subject: [PATCH 5/5] remove executable flag for calcurve --- tcl/calcurves/X145791.340 | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 tcl/calcurves/X145791.340 diff --git a/tcl/calcurves/X145791.340 b/tcl/calcurves/X145791.340 old mode 100755 new mode 100644