diff --git a/tcl/dil5.stick b/tcl/dil5.stick index 3df72ae..e413300 100644 --- a/tcl/dil5.stick +++ b/tcl/dil5.stick @@ -1,4 +1,4 @@ -deviceDesc = DIL5 Frappy history recorder +stickDesc = DIL5 Frappy history recorder set ::secop_version 4 diff --git a/tcl/frappy2.config b/tcl/frappy2.config index 134c560..836ec49 100644 --- a/tcl/frappy2.config +++ b/tcl/frappy2.config @@ -15,3 +15,4 @@ if {[string match "prep*" $ins]} { makenv frappy_stick -driver secop -port localhost:15201 makeHePump } +GraphOrder K W mbar % Tesla Ohm diff --git a/tcl/ill1.config b/tcl/ill1.config index 2df9da5..bc6f2c7 100644 --- a/tcl/ill1.config +++ b/tcl/ill1.config @@ -16,9 +16,9 @@ makenv tt -driver [lsdriver] { tt set/limit 310 tt maxwait 7200 makeCCU4 ill1 nv n2 he -hupdate /nv/set 1.5 -nv ctrl/deriv_o 10 -nv ctrl/deriv_c 10 +hupdate /nv/set 0.6 +nv ctrl/deriv_o 30 +nv ctrl/deriv_c 30 nv ctrl/prop_o 0.2 nv ctrl/prop_c 0.1 diff --git a/tcl/mb11.stick b/tcl/mb11.stick index 613f28f..0ea1b0e 100644 --- a/tcl/mb11.stick +++ b/tcl/mb11.stick @@ -1,4 +1,4 @@ -deviceDesc = MB11 stick Frappy history recorder +stickDesc = MB11 stick Frappy history recorder set ::secop_version 4 diff --git a/tcl/startup/graph.tcl b/tcl/startup/graph.tcl index 4c56028..edb31e5 100644 --- a/tcl/startup/graph.tcl +++ b/tcl/startup/graph.tcl @@ -257,6 +257,9 @@ proc GraphOrder args { } foreach unit [graph_order items] { foreach {item enable} $new($unit) { + if {"$unit" eq "none"} { + set enable 0 + } graph_shown makeitem $item $enable } }