diff --git a/tcl/dil5.stick b/tcl/dil5.stick index 2200687..3df72ae 100644 --- a/tcl/dil5.stick +++ b/tcl/dil5.stick @@ -1,54 +1,13 @@ -stickDesc = 100 mm dilution +deviceDesc = DIL5 Frappy history recorder -set box linse-dil5 +set ::secop_version 4 -proc triton {kind obj name db col {htrdb ""}} { - upvar box box - makenv $obj -driver itc$kind -port ${box}:33576 -controller _tritondil $db $htrdb - switch $kind { - temp { - GraphAdd $obj K_3 T_$name - # GraphAdd $obj.raw Ohm_3 R_$name - } - press { - GraphAdd $obj mbar_2 p_$name - } - } +set ins [result instrument] +if {[string match "prep*" $ins]} { + set nr [string range $ins end end] + makenv frappy_stick -driver secop -port localhost:1521$nr +} elseif {[lindex [split [info hostname] .] 0] ne $ins} { + error "runs on instruments or prep0-9 only" +} else { + makenv frappy_stick -driver secop -port localhost:15201 } - -proc itcchan {obj name dbt dbh col setcol} { - upvar box box - makenv $obj -driver itctemp -port ${box}:3000 -controller _itcdil ${dbt}.T1 ${dbh}.H1 - GraphAdd $obj K_5 T_$name - GraphAdd $obj.set K_5 T_${name}_set $setcol - # GraphAdd $obj.pow W_3 pow_$name - # GraphAdd $obj.raw Ohm_3 R_$name -} - -itcchan twstill wupstill MB1 MB0 blue cyan - -itcchan tonek oneK DB5 DB3 red orange - -itcchan twmix wupMix DB6 DB1 green lightgreen - -itcchan twivc wupIVC DB7 DB2 magenta violet - -itcchan tcond cond DB8 DB3 yellow grey - -triton temp tsorb sorb T1 dark_violet -triton temp tivc IVC T2 brown -triton temp tstill still T3 orange -triton temp tcp cond T4 grey -triton temp tmix mix T5 cyan H1 - -triton press pdump dump P1 cyan -triton press pcond cond P2 blue -triton press pstill still P3 black -triton press pfore fore P4 green -triton press pback back P5 red - -makenv tmixdrv -driver drvpar /tmix - -defineTemperature tmixdrv - -