From fcd464121340ef14ebb9e3a1d8de1b545fa0a15c Mon Sep 17 00:00:00 2001 From: zebra Date: Thu, 14 Sep 2023 11:12:14 +0200 Subject: [PATCH 1/4] fix lambda stage outmin/outmax --- tcl/ma15.config | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tcl/ma15.config b/tcl/ma15.config index f2ea536..c85d700 100644 --- a/tcl/ma15.config +++ b/tcl/ma15.config @@ -48,8 +48,9 @@ makenv tcoil -driver mom -port ma15-ts:3003 { } makeLPR lpr lnv ma15-ts:3004 "/tcoil/tb /tcoil/ta /tcoil/tc /tcoil/td" -lpr outmin 12 -lpr outmax 35 +# outmax must be lower than outmin as a lower T means higher flow (inversed from typical T control) +lpr outmax 12 +lpr outmin 35 lpr prop 0.5 lpr int 600 From 1852e3bd028c2927897cbd481c53895c9c0de6a1 Mon Sep 17 00:00:00 2001 From: camea Date: Thu, 14 Sep 2023 11:33:02 +0200 Subject: [PATCH 2/4] camea-be-filter: move to end --- tcl/camea-be-filter.addon | 1 + 1 file changed, 1 insertion(+) diff --git a/tcl/camea-be-filter.addon b/tcl/camea-be-filter.addon index 271316e..a6c6bba 100644 --- a/tcl/camea-be-filter.addon +++ b/tcl/camea-be-filter.addon @@ -17,3 +17,4 @@ GraphAdd t_be_filter.det K_4 Detector t_be_filter relay1 A t_be_filter relay2 B +hsetprop /t_be_filter layoutpos 90 From 4b676aec87669c74c982147e1b0503028d88edd8 Mon Sep 17 00:00:00 2001 From: camea Date: Thu, 14 Sep 2023 11:34:29 +0200 Subject: [PATCH 3/4] mb11.config: code depends on instrument --- tcl/mb11.config | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tcl/mb11.config b/tcl/mb11.config index d203126..bef6fac 100644 --- a/tcl/mb11.config +++ b/tcl/mb11.config @@ -5,8 +5,12 @@ set ::secop_version 4 set ins [result instrument] if {[string match "prep*" $ins]} { set nr [string range $ins end end] + makenv frappy_main -driver secop -port localhost:1511$nr + makeHePump +} elseif {[lindex [split [info hostname] .] 0] ne $ins} { + error "runs on instruments or prep0-9 only" } else { - error "runs on prep0-9 only" + makenv frappy_main -driver secop -port localhost:15101 + makenv frappy_stick -driver secop -port localhost:15201 + makeHePump } -makenv frappy_main -driver secop -port localhost:1511$nr -makeHePump From b37f2bac2800041b275b4a14be91e85d70daf896 Mon Sep 17 00:00:00 2001 From: tasp Date: Thu, 14 Sep 2023 11:39:31 +0200 Subject: [PATCH 4/4] ILL5: improve nv pid --- tcl/ill5.config | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tcl/ill5.config b/tcl/ill5.config index 703deec..f6fdc39 100644 --- a/tcl/ill5.config +++ b/tcl/ill5.config @@ -13,5 +13,8 @@ tt set/limit 310 makeCCU4 ill5 nv n2 he nv set 1 +nv ctrl/prop_o 0.05 +nv ctrl/prop_c 0.03 + source maxi_orange.table