From 34d9e3b48b37202ceac9ca04239e7eb6cd8284f2 Mon Sep 17 00:00:00 2001 From: sans Date: Thu, 1 Dec 2022 16:31:33 +0100 Subject: [PATCH 1/5] fix strange behaviour when parmeter name starts with inf 'inf' is interpreted a floating point infinity on a drivable object x info -> run x inf therefore use 'hval $path' instead of 'result $sicscommand' to retrieve a nodes value in hdbItem --- tcl/startup/hdb.tcl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tcl/startup/hdb.tcl b/tcl/startup/hdb.tcl index 7882953..953c397 100644 --- a/tcl/startup/hdb.tcl +++ b/tcl/startup/hdb.tcl @@ -102,7 +102,8 @@ proc hdbItem {path title} { return } else { set cmd2 "" - if {[catch {set val [result $cmd]} msg]} { + # using {set val [result $cmd]} will have strange effects: 'xatto info' is like 'run xatto inf'! + if {[catch {set val [hval $path]} msg]} { if {$msg eq "ERROR: not read yet"} { set val "" } else { From 876aa69ef1d8ff889e975a6931a48434bdbb4081 Mon Sep 17 00:00:00 2001 From: tasp Date: Mon, 5 Dec 2022 13:34:40 +0100 Subject: [PATCH 2/5] ma02: decrease nv flow to 1.2 --- tcl/ma02.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tcl/ma02.config b/tcl/ma02.config index a0389d1..97097d7 100644 --- a/tcl/ma02.config +++ b/tcl/ma02.config @@ -19,7 +19,7 @@ tt set/integ 10 makeCCU4 ma02 nv n2 -hupdate /nv/set 1.8 +hupdate /nv/set 1.2 makeIps -limit 1.8 -startRamp 0.5 -port ma02-ts:3002 From f32daa2e7379ed60c42b85e81c2256e168073ff8 Mon Sep 17 00:00:00 2001 From: camea Date: Mon, 19 Dec 2022 15:10:44 +0100 Subject: [PATCH 3/5] do no longer check for status not BUSY after target change --- tcl/drivers/secop_4.tcl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tcl/drivers/secop_4.tcl b/tcl/drivers/secop_4.tcl index 0eaf539..ac2a5b9 100644 --- a/tcl/drivers/secop_4.tcl +++ b/tcl/drivers/secop_4.tcl @@ -618,12 +618,12 @@ proc secop::update_ {} { hsetprop $objpath status posfault } } else { - if {[silent idle hgetpropval $objpath status] eq "run" && $writestatus ne "done" - && ($value < 300 || $value >= 390)} { - clientput "$objpath/target changed, but status not BUSY: $value $text_value ($writestatus)" - set value 300 - set text_value "target changed ($text_value)" - } + # if {[silent idle hgetpropval $objpath status] eq "run" && $writestatus ne "done" + # && ($value < 300 || $value >= 390)} { + # clientput "$objpath/target changed, but status not BUSY: $value $text_value ($writestatus)" + # set value 300 + # set text_value "target changed ($text_value)" + # } if {$value < 300 || $value >= 390} { # not busy or finalizing hsetprop $objpath status idle } From 1ec245c82319f8b524142232838ae18fc198b811 Mon Sep 17 00:00:00 2001 From: sans Date: Thu, 23 Mar 2023 13:46:07 +0100 Subject: [PATCH 4/5] add CCR4 --- tcl/ccr4.config | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 tcl/ccr4.config diff --git a/tcl/ccr4.config b/tcl/ccr4.config new file mode 100644 index 0000000..fc325b8 --- /dev/null +++ b/tcl/ccr4.config @@ -0,0 +1,15 @@ +deviceDesc = sumitomo closed cycle cryostat from IFE norway + +defineTemperature tt +GraphAdd tt K T_main +makenv tt -driver [lsdriver] { + lsc_sensor tm A -sensor dt-670 -sensorname main + lsc_loop set -loop 1 -channel A -maxheater 100W -resist 25Ohm +} +tt set/limit 310 +tt set/prop 25 +tt set/integ 10 +catch { + enableTable 0 +} + From f3476f656ce082ed5d6127799ce2535a22d2df04 Mon Sep 17 00:00:00 2001 From: sans Date: Thu, 23 Mar 2023 13:47:10 +0100 Subject: [PATCH 5/5] do not put an errror in value when status is in error --- tcl/drivers/secop_4.tcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tcl/drivers/secop_4.tcl b/tcl/drivers/secop_4.tcl index 0eaf539..b8d279b 100644 --- a/tcl/drivers/secop_4.tcl +++ b/tcl/drivers/secop_4.tcl @@ -610,7 +610,7 @@ proc secop::update_ {} { } set writestatus [silent done hgetpropval $objpath writestatus] if {$value < 100 || $value >= 400} { # error - updateerror $objpath $text_value + # updateerror $objpath $text_value catch { updateerror $objpath/target $text_value }