From 749b177ee21628cc1ed98a7e5fac76e6c209582b Mon Sep 17 00:00:00 2001 From: eiger Date: Mon, 3 Jul 2023 17:53:44 +0200 Subject: [PATCH 01/16] adjust ma15 settings --- tcl/ma15.config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tcl/ma15.config b/tcl/ma15.config index 0cbebe9..f2ea536 100644 --- a/tcl/ma15.config +++ b/tcl/ma15.config @@ -15,10 +15,10 @@ tt set/limit 310 makeCCU4 ma15 nv he_ilm catch { - hupdate /nv/set 1.5 + hupdate /nv/set 1 nv ctrl/minpulse_o 0.01 nv ctrl/minpulse_c 0.05 - nv tol 0.02 + cc mc 75 } makeIps -limit 14.9 -startRamp 0.31 -port ma15-ts:3002 From c588a86a63ade266b6c59dc51ad9d71317a23665 Mon Sep 17 00:00:00 2001 From: eiger Date: Mon, 3 Jul 2023 17:54:19 +0200 Subject: [PATCH 02/16] fix a check for neodry pump --- tcl/startup/hepump.tcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tcl/startup/hepump.tcl b/tcl/startup/hepump.tcl index fc22477..7008cb2 100644 --- a/tcl/startup/hepump.tcl +++ b/tcl/startup/hepump.tcl @@ -15,7 +15,7 @@ proc makeHePump {} { } hset /hepump $type - if {$type == 0} { + if {$type == 0 || $type == 8} { makenv hemot -driver trinamic -base /hepump/ hepump if {[silent 0 result instconfig sensirion]} { makenv nvflow -driver sensirion -controller _hemot From 66be0e0684d026c4915abcbeba5c334f61164e22 Mon Sep 17 00:00:00 2001 From: eiger Date: Mon, 3 Jul 2023 17:55:02 +0200 Subject: [PATCH 03/16] make pfeffertpg more general --- tcl/pfeiffertpg.addon | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tcl/pfeiffertpg.addon b/tcl/pfeiffertpg.addon index 22c54df..045cd3f 100644 --- a/tcl/pfeiffertpg.addon +++ b/tcl/pfeiffertpg.addon @@ -1,6 +1,6 @@ addonDesc = Pfeiffer Pressure gauge RS232 -makenv hvac -driver pfeiffertpg -port ldmse3-ts:3005 +makenv hvac -driver pfeiffertpg -GraphAdd hvac mbar ivc blue +GraphAdd hvac mbar hvac blue From 94b4dbdf82b66273b58b5c2fdb76c44e4293c2ab Mon Sep 17 00:00:00 2001 From: dmc Date: Mon, 3 Jul 2023 17:59:47 +0200 Subject: [PATCH 04/16] drivers/dil12.tcl: add ignore_vti_temp helps in case vti temperature is not reliable --- tcl/drivers/dil12.tcl | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/tcl/drivers/dil12.tcl b/tcl/drivers/dil12.tcl index 3199b58..d5169ab 100644 --- a/tcl/drivers/dil12.tcl +++ b/tcl/drivers/dil12.tcl @@ -257,6 +257,9 @@ proc stdConfig::dil12 args { prop label "remove mixture status" prop check dil12::check_removephase prop write stdSct::completeUpdate + + node ignore_vti_temp -int par 0 + prop enum 1 } } hset $name/heatermode 0 @@ -992,10 +995,15 @@ proc dil12::autostep {phase init} { dil12::openvalves v1 v6 v12 v13 vm_open sorb mode 0 - dil12::set_VtiT 1.25 hset [sct]/onekstate 0 nv set [silent 5 hvali [sct]/circulateflow] - nv 2 ;# auto + if {[hval [sct]/ignore_vti_temp]} { + dil12::set_VtiT 0 + nv 1 ;# controlled + } else { + dil12::set_VtiT 1.25 + nv 2 ;# auto + } dil12::msg "" } circulate { @@ -1034,7 +1042,11 @@ proc dil12::autostep {phase init} { sct optimize [clock seconds] clientput "reduced VTI flow to [hvali [sct]/circulateflow]" nv set $circulateflow - nv 2 ;# auto + if {[hval [sct]/ignore_vti_temp]} { + nv 1 ;# controlled + } else { + nv 2 ;# auto + } } } } From 74acd765eed5a772a008624a0d33f7a6861caf0b Mon Sep 17 00:00:00 2001 From: dmc Date: Mon, 3 Jul 2023 18:04:25 +0200 Subject: [PATCH 05/16] reduce nv flow for variox --- tcl/variox.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tcl/variox.config b/tcl/variox.config index cf64014..2bb42c3 100644 --- a/tcl/variox.config +++ b/tcl/variox.config @@ -14,6 +14,6 @@ tt set/limit 310 tt set/prop 20 tt set/integ 10 makeCCU4 variox nv n2 he -hupdate /nv/set 2.5 +hupdate /nv/set 1.2 nv ctrl/minpulse_o 0.01 nv ctrl/minpulse_c 0.1 From 4fd3ad498530718be44d41fad46723a9d1646a5d Mon Sep 17 00:00:00 2001 From: camea Date: Mon, 3 Jul 2023 18:06:13 +0200 Subject: [PATCH 06/16] fix error in error_update (erepr) --- 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 130a830..9691392 100644 --- a/tcl/drivers/secop_4.tcl +++ b/tcl/drivers/secop_4.tcl @@ -758,7 +758,7 @@ proc secop::update_ {} { } error_update { lassign $val etype erepr - set etext erepr + set etext $erepr regexp {.*'(.*)'} $erepr -> etext hsetprop $path geterror "${etype}: $etext" } From b2c0c1c62e3a56ce038963361ce393c3389bdcec Mon Sep 17 00:00:00 2001 From: camea Date: Mon, 3 Jul 2023 18:06:51 +0200 Subject: [PATCH 07/16] fix error with dblctrl (not going to 'up' mode) --- tcl/drivers/trun.tcl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tcl/drivers/trun.tcl b/tcl/drivers/trun.tcl index 585b0a1..53bc8ad 100644 --- a/tcl/drivers/trun.tcl +++ b/tcl/drivers/trun.tcl @@ -496,10 +496,12 @@ proc trun::read_run {} { } set now [DoubleTime] set tr [silent none sct target] + set prev_tr [silent $tr sct prev_tr] + sct prev_tr $tr if {$tr eq "none"} { set tr $tmain } else { - set dif [expr abs($tr) - [hvali [sct]/target]] + set dif [expr $tr - $prev_tr] updateval_u [sct]/target $tr 0 set dblmode [silent -1 hval [sct]/dblctrl/mode] if {$dblmode >= 0} { # not disabled From e8f6f0c3a91f6a6bc80367b8bf251835f2d40231 Mon Sep 17 00:00:00 2001 From: camea Date: Mon, 3 Jul 2023 18:07:33 +0200 Subject: [PATCH 08/16] reducae base flow ORI3 --- tcl/ori3.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tcl/ori3.config b/tcl/ori3.config index cf3d0b8..ac60246 100644 --- a/tcl/ori3.config +++ b/tcl/ori3.config @@ -11,7 +11,7 @@ makenv tt -driver [lsdriver] { } tt set/limit 310 makeCCU4 ori3 nv n2 he -hupdate /nv/set 1.6 +hupdate /nv/set 1.2 source maxi_orange.table From 1d7ab6fb463fbf2902dd1e5958714e18afe2e2db Mon Sep 17 00:00:00 2001 From: camea Date: Mon, 3 Jul 2023 18:08:25 +0200 Subject: [PATCH 09/16] frappy/get_all_param: catch error when object is missing --- tcl/startup/frappy.tcl | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tcl/startup/frappy.tcl b/tcl/startup/frappy.tcl index 9d9984a..d8cc670 100644 --- a/tcl/startup/frappy.tcl +++ b/tcl/startup/frappy.tcl @@ -266,9 +266,12 @@ proc frappy_async_client {} { proc get_all_param {args} { foreach obj $args { - set hp [get_obj_path $obj] - hnotify $hp 1 - get_param_values $hp + catch { + set hp [get_obj_path $obj] + hnotify $hp 1 + get_param_values $hp + } + # todo: create error message on failure } } From 9832ae9c690ec75bc36cd14e8daacb1b6262832f Mon Sep 17 00:00:00 2001 From: hrpt Date: Tue, 4 Jul 2023 08:09:42 +0200 Subject: [PATCH 10/16] fw.config: change reg channel to C --- tcl/fw.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tcl/fw.config b/tcl/fw.config index 5833000..94618aa 100644 --- a/tcl/fw.config +++ b/tcl/fw.config @@ -9,7 +9,7 @@ makenv tt -driver 340_lsc -port @lsc340a { lsc_sensor t2 D -sensor type-c-k1000 -sensorname t2 -alarm 1805 # lsc_sensor te B -sensor rhfe4140 -sensorname outer -alarm 323 lsc_sensor p A -sensor vacuum -sensorname vacuum - lsc_loop set -loop 1 -channel D -maxheater 0.05A -resist 1000Ohm -linearpower 3000 + lsc_loop set -loop 1 -channel C -maxheater 0.05A -resist 1000Ohm -linearpower 3000 hsetprop /tt dblmode disabled hsetprop /tt/dblctrl visible false hdelprop /tt/dblctrl group From 41f24a9907e59775d5594dff8cbae394c263e61f Mon Sep 17 00:00:00 2001 From: hrpt Date: Tue, 4 Jul 2023 08:28:05 +0200 Subject: [PATCH 11/16] remove obsolete makeHeFill from configs --- tcl/ma02.config | 4 +--- tcl/ma10.config | 3 +-- tcl/ma11.config | 3 +-- tcl/ma6.config | 1 - 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/tcl/ma02.config b/tcl/ma02.config index 97097d7..cccbc76 100644 --- a/tcl/ma02.config +++ b/tcl/ma02.config @@ -17,13 +17,11 @@ tt set/limit 310 tt set/prop 15 tt set/integ 10 -makeCCU4 ma02 nv n2 +makeCCU4 ma02 nv n2 he_ilm hupdate /nv/set 1.2 makeIps -limit 1.8 -startRamp 0.5 -port ma02-ts:3002 makeIlm -channels 1 -port ma02-ts:3001 -makeHeFill ccu4ilm -#makeHeFill lev diff --git a/tcl/ma10.config b/tcl/ma10.config index 920a11c..bc041b8 100644 --- a/tcl/ma10.config +++ b/tcl/ma10.config @@ -14,7 +14,7 @@ makenv tt -driver [lsdriver] { } tt set/limit 310 -makeCCU4 ma10 nv_release_blocked +makeCCU4 ma10 nv_release_blocked he_ilm hupdate /nv/set 1.8 makenv mf -driver ipsmag -port ma10-ts:3001 -controller _mf @@ -54,7 +54,6 @@ makeN2Fill ccu4ilm { ln2fill minholdhours 12 ln2fill maxholdhours 96 } -makeHeFill ccu4ilm # increase motor current cc mc 75 diff --git a/tcl/ma11.config b/tcl/ma11.config index 7c81220..8e30baf 100644 --- a/tcl/ma11.config +++ b/tcl/ma11.config @@ -16,7 +16,7 @@ makenv tt -driver [lsdriver] { } tt set/limit 310 -makeCCU4 ma11 nv +makeCCU4 ma11 nv he_ilm hupdate /nv/set 1.5 makeN2Fill ccu4ilm { ln2fill lowlevel 30 @@ -28,7 +28,6 @@ makeN2Fill ccu4ilm { # appendVars ln2fill.smooth/%/N2smooth/13 } -makeHeFill ccu4ilm catch { hefill minfillminutes 20 hefill maxfillminutes 60 diff --git a/tcl/ma6.config b/tcl/ma6.config index bc79aab..34283dd 100644 --- a/tcl/ma6.config +++ b/tcl/ma6.config @@ -27,7 +27,6 @@ makeN2Fill ccu4ilm { ln2fill minholdhours 12 ln2fill maxholdhours 96 } -makeHeFill ccu4ilm makeIps -limit 6 -startRamp 0.3844 -port ma6-ts:3002 if {[result instrument] eq "tasp"} { From 14fcf5851e2b72f5010b017c242da30a0601927f Mon Sep 17 00:00:00 2001 From: zebra Date: Tue, 4 Jul 2023 08:31:26 +0200 Subject: [PATCH 12/16] ccu4flow: no offset in slope (more conservative) --- tcl/drivers/ccu4flow.tcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tcl/drivers/ccu4flow.tcl b/tcl/drivers/ccu4flow.tcl index cf6c0ca..ef0bbfe 100644 --- a/tcl/drivers/ccu4flow.tcl +++ b/tcl/drivers/ccu4flow.tcl @@ -546,7 +546,7 @@ proc ccu4flow::ctrl {} { } elseif {$now < $lastim + $period} { # wait } else { - set slope [expr 0.01 + abs($dif) * $period / [hvali [sct]/ctrl/deriv$_dir]] + set slope [expr 0.00 + abs($dif) * $period / [hvali [sct]/ctrl/deriv$_dir]] set totalmin "" set ddif [format %.2f [expr -($dif - [sct olddif]) * [sct dir]]] sct filtered_ddif [expr max(0,[silent 0 sct filtered_ddif] * 0.9 + $ddif * 0.1)] From 44b29bd086234cd3a3422d3097f37ee5760d4c3f Mon Sep 17 00:00:00 2001 From: zebra Date: Tue, 4 Jul 2023 08:33:36 +0200 Subject: [PATCH 13/16] fix rack selection --- tcl/startup/rack.tcl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tcl/startup/rack.tcl b/tcl/startup/rack.tcl index 69b9193..cb8e2c9 100644 --- a/tcl/startup/rack.tcl +++ b/tcl/startup/rack.tcl @@ -59,7 +59,8 @@ proc get_rack {{oldrack ""}} { } } } - if {$mysubnet ne "office" && [llength $inmynet]} { + set hostname [lindex [split [info hostname] .] 0] + if {$mysubnet ne "office" && [llength $inmynet] && $hostname eq [result instrument]} { # if any rack is in the instrument subnet, racks in office net are not shown return $inmynet } From 1964490fa9060b63f4c4f262cbd85054697b44be Mon Sep 17 00:00:00 2001 From: zebra Date: Tue, 4 Jul 2023 08:34:57 +0200 Subject: [PATCH 14/16] jtccr: configure extra lakeshore --- tcl/jtccr.config | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tcl/jtccr.config b/tcl/jtccr.config index 9095b19..9cddd1f 100644 --- a/tcl/jtccr.config +++ b/tcl/jtccr.config @@ -2,7 +2,7 @@ deviceDesc = CCR with JT-stage defineTemperature tt -makenv tt -driver [lsdriver] { +makenv tt -driver 336_lsc -port jtccr-ls:7777 { lsc_sensor main A x63710 lsc_sensor ccr B x67737 lsc_loop set -loop 1 -channel A -maxheater 5W -resist 500Ohm @@ -41,8 +41,6 @@ makenv epc epc8210 -port jtccr-ts:3007 {jt-compressor 1 jt-pump 2 ccr-compressor #makenv clt -driver loop -invar "/tt" -outvar "v motpos/set" \ # -outmin 0.06 -outmax 0.9 -prop -1 -int 20 -maxdelta 10 -precision 0.01 -#makeCCU4 jtccr n2 - #makenv n2 n2_ccu ccu #appendVars n2.upper/K2/N2_Upper n2.lower/K2/N2_Lower From 97cf59a346ddaded07a049230dc58de378fe2c2c Mon Sep 17 00:00:00 2001 From: sans Date: Tue, 4 Jul 2023 08:44:41 +0200 Subject: [PATCH 15/16] ma7: reduce nv flow --- tcl/ma7.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tcl/ma7.config b/tcl/ma7.config index a225c24..a64ba9f 100644 --- a/tcl/ma7.config +++ b/tcl/ma7.config @@ -17,7 +17,7 @@ tt set/limit 310 makeCCU4 ma7 nv_release_blocked he_ilm -hupdate /nv/set 2.5 +hupdate /nv/set 1.2 # increase n.v. motor current cc mc 75 nv ctrl/openpulse 2 From 45d29524881db635442ecd23d30acf81c9c8f5f5 Mon Sep 17 00:00:00 2001 From: morpheus Date: Tue, 4 Jul 2023 08:48:18 +0200 Subject: [PATCH 16/16] addon for flexbos from mlz --- tcl/flexbox.addon | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 tcl/flexbox.addon diff --git a/tcl/flexbox.addon b/tcl/flexbox.addon new file mode 100644 index 0000000..7c00e54 --- /dev/null +++ b/tcl/flexbox.addon @@ -0,0 +1,7 @@ +addonDesc = Coils from MLZ + +set ::secop_version 4 + +makenv secop -driver secop -port flexbox:10767 + +