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

tcl/drivers/ccu4flow.tcl

@@ -41,7 +41,7 @@ proc stdConfig::ccu4flow {args} {
     node flow upd -secop=nvflow
 
     node set out
-    default 2.0
+    default 1.0
     prop check ccu4flow::checkset
     prop write stdSct::complete
     prop label "flow set"
@@ -89,11 +89,11 @@ proc stdConfig::ccu4flow {args} {
       node hystpulse_c par 0
       prop help {motor pulse to overcome hysteresis when closing}
 
-      node tol par 0.1
+      node tol par 0.25
       prop label tolerance
       prop help {valid below 3 mbar}
     
-      node tolhigh par 0.2
+      node tolhigh par 0.5
       prop label tol. above 4
       prop help {valid above 4 mbar}
     

tcl/ill2.config

@@ -12,6 +12,6 @@ makenv tt -driver [lsdriver]  {
 }
 tt set/limit 310
 makeCCU4 ill2 nv n2 he
-hupdate /nv/set 2.0
+hupdate /nv/set 1.0
 
 source std_orange.table

tcl/ill5.config

@@ -11,6 +11,7 @@ makenv tt -driver [lsdriver] {
 }
 tt set/limit 310
 makeCCU4 ill5 nv n2 he
+nv set 1
 
 source maxi_orange.table
 

tcl/ill5pgas5.config

@@ -32,6 +32,7 @@ makenv pccu -driver ccu4 pressure_ccu
 makenv p -driver ccupressure pccu 28
 GraphAdd p bar p auto
 
+# needed for TASMAD: must be drivable
 makenv i1 -driver drvpar /p
 
 hsetprop /tc group "capillary temperature"

tcl/ma10.config

@@ -38,6 +38,8 @@ mf gen/limit 10
 
 mf gen/wait_switch_on 15
 mf gen/wait_switch_off 30
+mf gen/wait_stable_leads 5
+mf gen/wait_stable_field 15
 
 makeIpsLev -port ma10-ts:3001 -controller _mf
 

tcl/ma6.config

@@ -17,7 +17,7 @@ makenv tt -driver [lsdriver] {
 #tt set/limit 310
 
 makeCCU4 ma6 nv
-hupdate /nv/set 2.0
+hupdate /nv/set 1.2
 makeN2Fill ccu4ilm {
   ln2fill lowlevel 10
   ln2fill highlevel 100
@@ -29,6 +29,9 @@ makeN2Fill ccu4ilm {
 makeHeFill ccu4ilm
 
 makeIps -limit 6 -startRamp 0.3844 -port ma6-ts:3002
+if {[result instrument] eq "tasp"} {
+  mf limit 4
+}
 
 makeIlm -channels 2 -port ma6-ts:3001