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

tcl/calib.stick

@@ -31,4 +31,4 @@ calib tlist 1.38 1.42 1.51 logstep0.04 288 302 310
 # timing is such that 2 * 24h are not enough
 # try with a little more precision (expecially at hi T)
 
-calib slopelimit 0.002
+calib slopelimit 0.005

tcl/ccr2ht.config

@@ -5,9 +5,6 @@ defineTemperature tt
 makenv tt -driver [lsdriver] {
   lsc_sensor tm B -sensor pt1000e -sensorname main -alarm 650
   lsc_sensor te C -sensor x31318 -sensorname screen
-#  lsc_sensor tk A -sensor x31319 -sensorname coldfinger -alarm 310
-# 2.8.2022 changed tk from ChA to ChD
-#--this is a temporary fix-- needs to be undone when the wiring has been fixed
   lsc_sensor tk A -sensor x31319 -sensorname coldfinger -alarm 310
   lsc_loop set -loop 1 -channel B -maxheater 100W -resist 25Ohm
   if {[lsdriver] eq "336_lsc"} {

tcl/drivers/ccu4.tcl

@@ -385,12 +385,14 @@ proc stdConfig::ccu4 {{title CCU4} args} {
       } elseif {[string match valve* $a]} {
         set nvalve [string range $a 5 end]
         for {set ch 1} {$ch <= 12} {incr ch} {
-          node v$ch upd
+          node v$ch rd -int 10
+          prop read ccu4::readValve v$ch
           prop enum valve_off,valve_on,no_valve,timeout,timeout1,boost
           if {$ch > $nvalve} {
             prop visible false
           }
           node vc$ch out -int
+          prop write ccu4::writeValve v$ch
           prop enum valve_off,valve_on
           if {$ch > $nvalve} {
             prop visible false
@@ -404,6 +406,20 @@ proc stdConfig::ccu4 {{title CCU4} args} {
   return "CCU4"
 } 
 
+proc ccu4::readValve {valve} {
+  # for some strange reason, v... are not queried with '?'
+  # we have to do it here
+  sct send $valve
+  return ccu4::complete
+}
+
+proc ccu4::writeValve {valve} {
+  set res [ccu4::write]
+  # update readback value immediately
+  hupdate [sct parent]/$valve [sct target]
+  return $res
+}
+
 proc ccu4::completeStart {name} {
   set resval(cid) 0
   set resval(cir) ""

tcl/drivers/dil12.tcl

@@ -264,6 +264,7 @@ proc stdConfig::dil12 args {
   }
   hset $name/heatermode 0
   dolater 0 hset $name/autoprop/integ 5
+  dolater 0 apply_dilpars
 }
 
 proc dil12::check_set {} {

tcl/drivers/dilpars.tcl

@@ -0,0 +1,18 @@
+# any parameter to be entered by hand
+namespace eval dilpars {} {
+}
+
+proc stdConfig::dilpars {args} {
+  variable hostport none
+  variable name
+  controller syncedprot
+
+  scanargs $args var -circulateflow 4 -condenseflow 8
+
+  obj dummy -none
+  kids hidden {
+    node condenseflow par $condenseflow
+    node circulateflow par $circulateflow
+  }
+  dolater 0 apply_dilargs
+}

tcl/drivers/trun.tcl

@@ -497,9 +497,9 @@ 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
+    sct prev_tr $tr
   } else {
     set dif [expr $tr - $prev_tr]
     updateval_u [sct]/target $tr 0

tcl/jtccr.config

@@ -30,10 +30,6 @@ GraphAdd p4 bar p4 yellow
 makenv -objname pressreg  -driver bronkpreg  -port jtccr-ts:3005  18
 GraphAdd pressreg bar preg magenta 
 
-#makenv -objname v -driver svumot -port jtccr-ts:3006 {
-#  v1 1 v2 2 v3 3 v4 4 v5 5 v6 6 v7 7 v8 mot
-#}
-
 makenv epc epc8210 -port jtccr-ts:3007 {jt-compressor 1 jt-pump 2 ccr-compressor 3}
 
 

tcl/ma15prep.config

@@ -53,7 +53,11 @@ appendVars n2coolPar.istate|i|State|1 lc|mbar|Lambda_p|4
 makeN2cool "tcoil ta"
 catch {
   # finish hour (tomorrow morning)
-  n2coolPar time 6
+  # previous procedure:
+  #  day 1, morning: start N2, day2 morning: start fill (fast, He vessel pressurized)
+  # new procedure
+  #  day 1, morning or noon: start N2:, day2 afternoon:  slow fill overnight (self pressured He vessel)
+  n2coolPar time 12
   # target temperature for MagBot
   n2coolPar topLimit 85
   # cooling rate K / min.

tcl/ma6.config

@@ -5,9 +5,11 @@ device stick_menu "ma6 dil2 dil3 dil4 coil"
 
 makenv tt -driver [lsdriver] {
   lsc_sensor tm A -sensor x48581 -sensorname VTI
-  lsc_sensor ts C -sensorname sample
-#  lsc_sensor code D -sensor code -sensorname code
-  lsc_sensor ts_2 D  -sensor code -sensorname sample2
+# 2023-07-06: sample sensor seems defect, use hx sensor
+#  lsc_sensor ts C -sensorname sample
+#  lsc_sensor ts_2 D  -sensor code -sensorname sample2
+  lsc_sensor ts D -sensorname sample
+  lsc_sensor ts_2 C  -sensor code -sensorname sample2
   lsc_loop set -loop 1 -channel A -maxheater 32W -resist 80Ohm -color green
   if {[lsdriver] eq "336_lsc"} {
     lsc_loop setsamp -loop 2 -channel C -maxheater 62.5W -resist 20Ohm -color dark_green -loopname sample

tcl/ma6.stick

@@ -1,4 +1,4 @@
 stickDesc = standard MA6 stick
 
-stick_sensors x63161 undefined
+stick_sensors x63163 undefined
 # stick_sensors x63161 x63163

tcl/ori7.config

@@ -31,5 +31,6 @@ makenv table -driver table /tt/tm {
 
 table tbl_tt_dblctrl_prop_lo 20:0.1 50:0.4
 
+makenv dilpars -driver dilpars -condenseflow 3 -circulateflow 1.6
 #GraphAdd cc.mp sec pulse red
 #GraphAdd cc.msp sec speed green

tcl/seacom.tcl

@@ -2109,15 +2109,20 @@ proc ObjState {} {
     lappend list $obj
   }
   set canNotConnect 0
+  set showRackList 0
+  set rack [silent no result device rack]
   foreach obj $list {
     if {$obj eq "_cc"} {
       set canNotConnect [showStatus _cc 1]
+      if {$canNotConnect || $rack eq "no"} {
+         set showRackList 1
+      }
     } else {
       showStatus $obj 1
     }
   }
   if {[result device name] eq "none"} {
-    Group rack "choose rack"
+    set showRackList 1
   } elseif {$canNotConnect} {
     Style warning
     if {[silent no result device rack] eq "other"} {
@@ -2136,6 +2141,8 @@ proc ObjState {} {
       Style hotwarning
       Label "please select rack (rack number as labelled on the top of the rack)"
     }
+  }
+  if {$showRackList} {
     Group rack "choose rack"
   }
 }