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:
zolliker
2023-07-04 08:51:58 +02:00
parent 90997df420 63d81df726
commit ec5b087613
19 changed files with 48 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tcl/drivers/ccu4flow.tcl
View File

@ -546,7 +546,7 @@ proc ccu4flow::ctrl {} {
} elseif {$now < $lastim + $period} { } elseif {$now < $lastim + $period} {
# wait # wait
} else { } else {
set slope [expr 0.01 + abs($dif) * $period / [hvali [sct]/ctrl/deriv$_dir]] set slope [expr 0.00 + abs($dif) * $period / [hvali [sct]/ctrl/deriv$_dir]]
set totalmin "" set totalmin ""
set ddif [format %.2f [expr -($dif - [sct olddif]) * [sct dir]]] set ddif [format %.2f [expr -($dif - [sct olddif]) * [sct dir]]]
sct filtered_ddif [expr max(0,[silent 0 sct filtered_ddif] * 0.9 + $ddif * 0.1)] sct filtered_ddif [expr max(0,[silent 0 sct filtered_ddif] * 0.9 + $ddif * 0.1)]

14
tcl/drivers/dil12.tcl
View File

@ -257,6 +257,9 @@ proc stdConfig::dil12 args {
prop label "remove mixture status" prop label "remove mixture status"
prop check dil12::check_removephase prop check dil12::check_removephase
prop write stdSct::completeUpdate prop write stdSct::completeUpdate
node ignore_vti_temp -int par 0
prop enum 1
} }
} }
hset $name/heatermode 0 hset $name/heatermode 0
@ -992,10 +995,15 @@ proc dil12::autostep {phase init} {
dil12::openvalves v1 v6 v12 v13 vm_open dil12::openvalves v1 v6 v12 v13 vm_open
sorb mode 0 sorb mode 0
dil12::set_VtiT 1.25
hset [sct]/onekstate 0 hset [sct]/onekstate 0
nv set [silent 5 hvali [sct]/circulateflow] nv set [silent 5 hvali [sct]/circulateflow]
if {[hval [sct]/ignore_vti_temp]} {
dil12::set_VtiT 0
nv 1 ;# controlled
} else {
dil12::set_VtiT 1.25
nv 2 ;# auto nv 2 ;# auto
}
dil12::msg "" dil12::msg ""
} }
circulate { circulate {
@ -1034,12 +1042,16 @@ proc dil12::autostep {phase init} {
sct optimize [clock seconds] sct optimize [clock seconds]
clientput "reduced VTI flow to [hvali [sct]/circulateflow]" clientput "reduced VTI flow to [hvali [sct]/circulateflow]"
nv set $circulateflow nv set $circulateflow
if {[hval [sct]/ignore_vti_temp]} {
nv 1 ;# controlled
} else {
nv 2 ;# auto nv 2 ;# auto
} }
} }
} }
} }
} }
}
init_finished { init_finished {
# close all valves and zero all powers # close all valves and zero all powers
dil12::clearButtons dil12::clearButtons

2
tcl/drivers/secop_4.tcl
View File

@ -758,7 +758,7 @@ proc secop::update_ {} {
} }
error_update { error_update {
lassign $val etype erepr lassign $val etype erepr
set etext erepr set etext $erepr
regexp {.*'(.*)'} $erepr -> etext regexp {.*'(.*)'} $erepr -> etext
hsetprop $path geterror "${etype}: $etext" hsetprop $path geterror "${etype}: $etext"
} }

4
tcl/drivers/trun.tcl
View File

@ -496,10 +496,12 @@ proc trun::read_run {} {
} }
set now [DoubleTime] set now [DoubleTime]
set tr [silent none sct target] set tr [silent none sct target]
set prev_tr [silent $tr sct prev_tr]
sct prev_tr $tr
if {$tr eq "none"} { if {$tr eq "none"} {
set tr $tmain set tr $tmain
} else { } else {
set dif [expr abs($tr) - [hvali [sct]/target]] set dif [expr $tr - $prev_tr]
updateval_u [sct]/target $tr 0 updateval_u [sct]/target $tr 0
set dblmode [silent -1 hval [sct]/dblctrl/mode] set dblmode [silent -1 hval [sct]/dblctrl/mode]
if {$dblmode >= 0} { # not disabled if {$dblmode >= 0} { # not disabled

7
tcl/flexbox.addon Normal file
View File

@ -0,0 +1,7 @@
addonDesc = Coils from MLZ
set ::secop_version 4
makenv secop -driver secop -port flexbox:10767

2
tcl/fw.config
View File

@ -9,7 +9,7 @@ makenv tt -driver 340_lsc -port @lsc340a {
lsc_sensor t2 D -sensor type-c-k1000 -sensorname t2 -alarm 1805 lsc_sensor t2 D -sensor type-c-k1000 -sensorname t2 -alarm 1805
# lsc_sensor te B -sensor rhfe4140 -sensorname outer -alarm 323 # lsc_sensor te B -sensor rhfe4140 -sensorname outer -alarm 323
lsc_sensor p A -sensor vacuum -sensorname vacuum lsc_sensor p A -sensor vacuum -sensorname vacuum
lsc_loop set -loop 1 -channel D -maxheater 0.05A -resist 1000Ohm -linearpower 3000 lsc_loop set -loop 1 -channel C -maxheater 0.05A -resist 1000Ohm -linearpower 3000
hsetprop /tt dblmode disabled hsetprop /tt dblmode disabled
hsetprop /tt/dblctrl visible false hsetprop /tt/dblctrl visible false
hdelprop /tt/dblctrl group hdelprop /tt/dblctrl group

4
tcl/jtccr.config
View File

@ -2,7 +2,7 @@ deviceDesc = CCR with JT-stage
defineTemperature tt defineTemperature tt
makenv tt -driver [lsdriver] { makenv tt -driver 336_lsc -port jtccr-ls:7777 {
lsc_sensor main A x63710 lsc_sensor main A x63710
lsc_sensor ccr B x67737 lsc_sensor ccr B x67737
lsc_loop set -loop 1 -channel A -maxheater 5W -resist 500Ohm lsc_loop set -loop 1 -channel A -maxheater 5W -resist 500Ohm
@ -41,8 +41,6 @@ makenv epc epc8210 -port jtccr-ts:3007 {jt-compressor 1 jt-pump 2 ccr-compressor
#makenv clt -driver loop -invar "/tt" -outvar "v motpos/set" \ #makenv clt -driver loop -invar "/tt" -outvar "v motpos/set" \
# -outmin 0.06 -outmax 0.9 -prop -1 -int 20 -maxdelta 10 -precision 0.01 # -outmin 0.06 -outmax 0.9 -prop -1 -int 20 -maxdelta 10 -precision 0.01
#makeCCU4 jtccr n2
#makenv n2 n2_ccu ccu #makenv n2 n2_ccu ccu
#appendVars n2.upper/K2/N2_Upper n2.lower/K2/N2_Lower #appendVars n2.upper/K2/N2_Upper n2.lower/K2/N2_Lower

4
tcl/ma02.config
View File

@ -17,13 +17,11 @@ tt set/limit 310
tt set/prop 15 tt set/prop 15
tt set/integ 10 tt set/integ 10
makeCCU4 ma02 nv n2 makeCCU4 ma02 nv n2 he_ilm
hupdate /nv/set 1.2 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
makeIlm -channels 1 -port ma02-ts:3001 makeIlm -channels 1 -port ma02-ts:3001
makeHeFill ccu4ilm
#makeHeFill lev

3
tcl/ma10.config
View File

@ -14,7 +14,7 @@ makenv tt -driver [lsdriver] {
} }
tt set/limit 310 tt set/limit 310
makeCCU4 ma10 nv_release_blocked makeCCU4 ma10 nv_release_blocked he_ilm
hupdate /nv/set 1.8 hupdate /nv/set 1.8
makenv mf -driver ipsmag -port ma10-ts:3001 -controller _mf makenv mf -driver ipsmag -port ma10-ts:3001 -controller _mf
@ -54,7 +54,6 @@ makeN2Fill ccu4ilm {
ln2fill minholdhours 12 ln2fill minholdhours 12
ln2fill maxholdhours 96 ln2fill maxholdhours 96
} }
makeHeFill ccu4ilm
# increase motor current # increase motor current
cc mc 75 cc mc 75

3
tcl/ma11.config
View File

@ -16,7 +16,7 @@ makenv tt -driver [lsdriver] {
} }
tt set/limit 310 tt set/limit 310
makeCCU4 ma11 nv makeCCU4 ma11 nv he_ilm
hupdate /nv/set 1.5 hupdate /nv/set 1.5
makeN2Fill ccu4ilm { makeN2Fill ccu4ilm {
ln2fill lowlevel 30 ln2fill lowlevel 30
@ -28,7 +28,6 @@ makeN2Fill ccu4ilm {
# appendVars ln2fill.smooth/%/N2smooth/13 # appendVars ln2fill.smooth/%/N2smooth/13
} }
makeHeFill ccu4ilm
catch { catch {
hefill minfillminutes 20 hefill minfillminutes 20
hefill maxfillminutes 60 hefill maxfillminutes 60

4
tcl/ma15.config
View File

@ -15,10 +15,10 @@ tt set/limit 310
makeCCU4 ma15 nv he_ilm makeCCU4 ma15 nv he_ilm
catch { catch {
hupdate /nv/set 1.5 hupdate /nv/set 1
nv ctrl/minpulse_o 0.01 nv ctrl/minpulse_o 0.01
nv ctrl/minpulse_c 0.05 nv ctrl/minpulse_c 0.05
nv tol 0.02 cc mc 75
} }
makeIps -limit 14.9 -startRamp 0.31 -port ma15-ts:3002 makeIps -limit 14.9 -startRamp 0.31 -port ma15-ts:3002

1
tcl/ma6.config
View File

@ -27,7 +27,6 @@ makeN2Fill ccu4ilm {
ln2fill minholdhours 12 ln2fill minholdhours 12
ln2fill maxholdhours 96 ln2fill maxholdhours 96
} }
makeHeFill ccu4ilm
makeIps -limit 6 -startRamp 0.3844 -port ma6-ts:3002 makeIps -limit 6 -startRamp 0.3844 -port ma6-ts:3002
if {[result instrument] eq "tasp"} { if {[result instrument] eq "tasp"} {

2
tcl/ma7.config
View File

@ -17,7 +17,7 @@ tt set/limit 310
makeCCU4 ma7 nv_release_blocked he_ilm makeCCU4 ma7 nv_release_blocked he_ilm
hupdate /nv/set 2.5 hupdate /nv/set 1.2
# increase n.v. motor current # increase n.v. motor current
cc mc 75 cc mc 75
nv ctrl/openpulse 2 nv ctrl/openpulse 2

2
tcl/ori3.config
View File

@ -11,7 +11,7 @@ makenv tt -driver [lsdriver] {
} }
tt set/limit 310 tt set/limit 310
makeCCU4 ori3 nv n2 he makeCCU4 ori3 nv n2 he
hupdate /nv/set 1.6 hupdate /nv/set 1.2
source maxi_orange.table source maxi_orange.table

4
tcl/pfeiffertpg.addon
View File

@ -1,6 +1,6 @@
addonDesc = Pfeiffer Pressure gauge RS232 addonDesc = Pfeiffer Pressure gauge RS232
makenv hvac -driver pfeiffertpg -port ldmse3-ts:3005 makenv hvac -driver pfeiffertpg
GraphAdd hvac mbar ivc blue GraphAdd hvac mbar hvac blue

3
tcl/startup/frappy.tcl
View File

@ -266,10 +266,13 @@ proc frappy_async_client {} {
proc get_all_param {args} { proc get_all_param {args} {
foreach obj $args { foreach obj $args {
catch {
set hp [get_obj_path $obj] set hp [get_obj_path $obj]
hnotify $hp 1 hnotify $hp 1
get_param_values $hp get_param_values $hp
} }
# todo: create error message on failure
}
} }
proc error_update_script {hp} { proc error_update_script {hp} {

2
tcl/startup/hepump.tcl
View File

@ -15,7 +15,7 @@ proc makeHePump {} {
} }
hset /hepump $type hset /hepump $type
if {$type == 0} { if {$type == 0 || $type == 8} {
makenv hemot -driver trinamic -base /hepump/ hepump makenv hemot -driver trinamic -base /hepump/ hepump
if {[silent 0 result instconfig sensirion]} { if {[silent 0 result instconfig sensirion]} {
makenv nvflow -driver sensirion -controller _hemot makenv nvflow -driver sensirion -controller _hemot

3
tcl/startup/rack.tcl
View File

@ -59,7 +59,8 @@ proc get_rack {{oldrack ""}} {
} }
} }
} }
if {$mysubnet ne "office" && [llength $inmynet]} { set hostname [lindex [split [info hostname] .] 0]
if {$mysubnet ne "office" && [llength $inmynet] && $hostname eq [result instrument]} {
# if any rack is in the instrument subnet, racks in office net are not shown # if any rack is in the instrument subnet, racks in office net are not shown
return $inmynet return $inmynet
} }

2
tcl/variox.config
View File

@ -14,6 +14,6 @@ tt set/limit 310
tt set/prop 20 tt set/prop 20
tt set/integ 10 tt set/integ 10
makeCCU4 variox nv n2 he makeCCU4 variox nv n2 he
hupdate /nv/set 2.5 hupdate /nv/set 1.2
nv ctrl/minpulse_o 0.01 nv ctrl/minpulse_o 0.01
nv ctrl/minpulse_c 0.1 nv ctrl/minpulse_c 0.1