Merge branch 'master' of gitlab.psi.ch-samenv:samenv/sea

2023-07-03 18:04:46 +02:00
parent 74acd765ee 66be0e0684
commit dd4c9efdbd
3 changed files with 5 additions and 5 deletions
--- 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
--- 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

--- 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