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

Use hostport_config for quokka detector addresses and ports.

Browse Source
This commit is contained in:
Ferdi Franceschini
2013-05-13 23:31:12 +10:00
parent babc5fe17e
commit bf3bd5342e
4 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
site_ansto/instrument/sans/config/hmm/nhq200_detector_config.tcl
View File

@@ -6,7 +6,9 @@ if {$::sim_mode == "true"} {
EvFactory new dhv1 sim EvFactory new dhv1 sim
} else { } else {
clientput "FastCom Detector Voltage control" clientput "FastCom Detector Voltage control"
makeasyncqueue acq NHQ200 ca1-quokka 4002 set host [dict get $::HISTMEM_HOSTPORT NHQ200 HOST]
set port [dict get $::HISTMEM_HOSTPORT NHQ200 PORT]
makeasyncqueue acq NHQ200 $host $port
evfactory new dhv1 nhq200 acq 1 evfactory new dhv1 nhq200 acq 1
dhv1 tolerance 5 dhv1 tolerance 5
dhv1 rate 10 dhv1 rate 10

4
site_ansto/instrument/sans/config/hmm/ordela_detector_config.tcl
View File

@@ -25,7 +25,9 @@ set upper_SN003 57
set dhvMax $dhv1Max_SN006 set dhvMax $dhv1Max_SN006
set dhvUpper $upper_SN006 set dhvUpper $upper_SN006
::scobj::dethvps::init 137.157.202.71 4001 [expr 0.1 * $dhvMax /63.0] set host [dict get $::HISTMEM_HOSTPORT ORDELA HOST]
set port [dict get $::HISTMEM_HOSTPORT ORDELA PORT]
::scobj::dethvps::init $host $port [expr 0.1 * $dhvMax /63.0]
# Voltage = potval * (dhv1.max / 63) # Voltage = potval * (dhv1.max / 63)
# if potval = 60 and dhv1.max = 2400 then voltage = 60 * 2400/63 = 2285.7V # if potval = 60 and dhv1.max = 2400 then voltage = 60 * 2400/63 = 2285.7V
dhv1 max $dhvMax dhv1 max $dhvMax

2
site_ansto/instrument/sans/hostport_config.tcl
View File

@@ -23,6 +23,8 @@ foreach {bm host port} {
foreach {key host port} { foreach {key host port} {
HMM das1-quokka.nbi.ansto.gov.au 8080 HMM das1-quokka.nbi.ansto.gov.au 8080
HMSTAT das1-quokka.nbi.ansto.gov.au 8081 HMSTAT das1-quokka.nbi.ansto.gov.au 8081
ORDELA 137.157.202.71 4001
NHQ200 ca1-quokka 4002
} { } {
dict set HISTMEM_HOSTPORT $key HOST $host dict set HISTMEM_HOSTPORT $key HOST $host
dict set HISTMEM_HOSTPORT $key PORT $port dict set HISTMEM_HOSTPORT $key PORT $port

2
site_ansto/instrument/sans/hostport_config_test.tcl
View File

@@ -25,6 +25,8 @@ foreach {key host port} {
foreach {key host port} { foreach {key host port} {
HMM das1-test.nbi.ansto.gov.au 8080 HMM das1-test.nbi.ansto.gov.au 8080
HMSTAT das1-test.nbi.ansto.gov.au 8081 HMSTAT das1-test.nbi.ansto.gov.au 8081
ORDELA localhost 4001
NHQ200 localhost 4002
} { } {
dict set HISTMEM_HOSTPORT $key HOST $host dict set HISTMEM_HOSTPORT $key HOST $host
dict set HISTMEM_HOSTPORT $key PORT $port dict set HISTMEM_HOSTPORT $key PORT $port