linse/sea
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
l_samenv
2023-03-23 13:56:49 +01:00
parent 1282217907 c883a83567
commit d0c153f408
4 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tcl/ccr4.config Normal file
View File

@ -0,0 +1,15 @@
deviceDesc = sumitomo closed cycle cryostat from IFE norway
defineTemperature tt
GraphAdd tt K T_main
makenv tt -driver [lsdriver] {
lsc_sensor tm A -sensor dt-670 -sensorname main
lsc_loop set -loop 1 -channel A -maxheater 100W -resist 25Ohm
}
tt set/limit 310
tt set/prop 25
tt set/integ 10
catch {
enableTable 0
}

14
tcl/drivers/secop_4.tcl
View File

@ -610,7 +610,7 @@ proc secop::update_ {} {
} }
set writestatus [silent done hgetpropval $objpath writestatus] set writestatus [silent done hgetpropval $objpath writestatus]
if {$value < 100 || $value >= 400} { # error if {$value < 100 || $value >= 400} { # error
updateerror $objpath $text_value # updateerror $objpath $text_value
catch { catch {
updateerror $objpath/target $text_value updateerror $objpath/target $text_value
} }
@ -618,12 +618,12 @@ proc secop::update_ {} {
hsetprop $objpath status posfault hsetprop $objpath status posfault
} }
} else { } else {
if {[silent idle hgetpropval $objpath status] eq "run" && $writestatus ne "done" # if {[silent idle hgetpropval $objpath status] eq "run" && $writestatus ne "done"
&& ($value < 300 || $value >= 390)} { # && ($value < 300 || $value >= 390)} {
clientput "$objpath/target changed, but status not BUSY: $value $text_value ($writestatus)" # clientput "$objpath/target changed, but status not BUSY: $value $text_value ($writestatus)"
set value 300 # set value 300
set text_value "target changed ($text_value)" # set text_value "target changed ($text_value)"
} # }
if {$value < 300 || $value >= 390} { # not busy or finalizing if {$value < 300 || $value >= 390} { # not busy or finalizing
hsetprop $objpath status idle hsetprop $objpath status idle
} }

2
tcl/ma02.config
View File

@ -19,7 +19,7 @@ tt set/integ 10
makeCCU4 ma02 nv n2 makeCCU4 ma02 nv n2
hupdate /nv/set 1.8 hupdate /nv/set 1.2
makeIps -limit 1.8 -startRamp 0.5 -port ma02-ts:3002 makeIps -limit 1.8 -startRamp 0.5 -port ma02-ts:3002

3
tcl/startup/hdb.tcl
View File

@ -102,7 +102,8 @@ proc hdbItem {path title} {
return return
} else { } else {
set cmd2 "" set cmd2 ""
if {[catch {set val [result $cmd]} msg]} { # using {set val [result $cmd]} will have strange effects: 'xatto info' is like 'run xatto inf'!
if {[catch {set val [hval $path]} msg]} {
if {$msg eq "ERROR: not read yet"} { if {$msg eq "ERROR: not read yet"} {
set val "" set val ""
} else { } else {