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

SICS-587 (in progress) Put IP and PORT configurations in a single file.

Browse Source 
TODO environment
This commit is contained in:
Ferdi Franceschini
2013-05-06 20:41:37 +10:00
parent 3e33a7b8b2
commit 5c76f7a243
5 changed files with 56 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
site_ansto/instrument/tas/MANIFEST.TXT
View File

@@ -3,3 +3,5 @@ script_validator_ports.tcl
taipan_configuration.tcl taipan_configuration.tcl
config config
util util
hostport_config.tcl
hostport_config_test.tcl

10
site_ansto/instrument/tas/config/counter/counter.tcl
View File

@@ -15,10 +15,14 @@ proc ::counter::isc_initialize {} {
variable isc_numchannels variable isc_numchannels
variable isc_monitor_address variable isc_monitor_address
variable isc_portlist variable isc_portlist
variable isc_beam_monitor_list {MONITOR_1 MONITOR_2}
set isc_monitor_address [hostnam "das2-[SplitReply [instrument]]"] dict for {k v} $::MONITOR_HOSTPORT {
set isc_portlist [list 33000 33001 33002 33003 33004 33005 33006 33007] lappend monlist $k
lappend hostlist [dict get $v HOST]
lappend isc_portlist [dict get $v PORT]
}
variable isc_beam_monitor_list $monlist
set isc_monitor_address [lindex $hostlist 0]
set isc_numchannels [llength $isc_beam_monitor_list] set isc_numchannels [llength $isc_beam_monitor_list]
::counter::ic_initialize ::counter::ic_initialize
} message ] { } message ] {

26
site_ansto/instrument/tas/config/motors/motor_configuration.tcl
View File

@@ -10,31 +10,15 @@ set use_tiltstage 0
set animal taipan set animal taipan
set sim_mode [SplitReply [motor_simulation]] set sim_mode [SplitReply [motor_simulation]]
# Setup addresses of Galil DMC2280 controllers.
set dmc2280_controller1(host) [hostnam mc1-$animal]
set dmc2280_controller1(port) [portnum pmc1-$animal]
set dmc2280_controller2(host) [hostnam mc2-$animal]
set dmc2280_controller2(port) [portnum pmc2-$animal]
set dmc2280_controller3(host) [hostnam mc3-$animal]
set dmc2280_controller3(port) [portnum pmc3-$animal]
set dmc2280_controller4(host) [hostnam mc4-$animal]
set dmc2280_controller4(port) [portnum pmc4-$animal]
set dmc2280_controller6(host) [hostnam mc6-$animal]
set dmc2280_controller6(port) [portnum pmc6-$animal]
if {$sim_mode == "true"} { if {$sim_mode == "true"} {
set motor_driver_type asim set motor_driver_type asim
} else { } else {
set motor_driver_type DMC2280 set motor_driver_type DMC2280
MakeAsyncQueue mc1 DMC2280 $dmc2280_controller1(host) $dmc2280_controller1(port) MakeAsyncQueue mc1 DMC2280 [dict get $::MOTOR_HOSTPORT MC1 HOST] [dict get $::MOTOR_HOSTPORT MC1 PORT]
MakeAsyncQueue mc2 DMC2280 $dmc2280_controller2(host) $dmc2280_controller2(port) MakeAsyncQueue mc2 DMC2280 [dict get $::MOTOR_HOSTPORT MC2 HOST] [dict get $::MOTOR_HOSTPORT MC2 PORT]
MakeAsyncQueue mc3 DMC2280 $dmc2280_controller3(host) $dmc2280_controller3(port) MakeAsyncQueue mc3 DMC2280 [dict get $::MOTOR_HOSTPORT MC3 HOST] [dict get $::MOTOR_HOSTPORT MC3 PORT]
MakeAsyncQueue mc4 DMC2280 $dmc2280_controller4(host) $dmc2280_controller4(port) MakeAsyncQueue mc4 DMC2280 [dict get $::MOTOR_HOSTPORT MC4 HOST] [dict get $::MOTOR_HOSTPORT MC4 PORT]
MakeAsyncQueue mc6 DMC2280 $dmc2280_controller6(host) $dmc2280_controller6(port) MakeAsyncQueue mc6 DMC2280 [dict get $::MOTOR_HOSTPORT MC6 HOST] [dict get $::MOTOR_HOSTPORT MC6 PORT]
} }
#Measured absolute encoder reading at home position #Measured absolute encoder reading at home position

20
site_ansto/instrument/tas/hostport_config.tcl Normal file
View File

@@ -0,0 +1,20 @@
# MOTOR HOST AND PORT
foreach {mc host port} {
MC1 mc1-taipan pmc1-taipan
MC2 mc2-taipan pmc2-taipan
MC3 mc3-taipan pmc3-taipan
MC4 mc4-taipan pmc4-taipan
MC6 mc6-taipan pmc6-taipan
} {
dict set MOTOR_HOSTPORT $mc HOST $host
dict set MOTOR_HOSTPORT $mc PORT $port
}
# BEAM MONITOR HOST AND PORT
foreach {bm host port} {
MONITOR_1 das1-taipan 33000
MONITOR_2 das1-taipan 33001
} {
dict set MONITOR_HOSTPORT $bm HOST $host
dict set MONITOR_HOSTPORT $bm PORT $port
}

22
site_ansto/instrument/tas/hostport_config_test.tcl Normal file
View File

@@ -0,0 +1,22 @@
# Specify NONE for HOST and PORT if there is no fake device to talk to.
# TEST MOTOR HOST AND PORT
foreach {key host port} {
MC1 localhost 62730
MC2 localhost 62731
MC3 localhost 62732
MC4 localhost 62733
MC6 localhost 62734
} {
dict set MOTOR_HOSTPORT $key HOST $host
dict set MOTOR_HOSTPORT $key PORT $port
}
# TEST BEAM MONITOR HOST AND PORT
foreach {key host port} {
MONITOR_1 localhost 33000
MONITOR_2 localhost 33001
} {
dict set MONITOR_HOSTPORT $key HOST $host
dict set MONITOR_HOSTPORT $key PORT $port
}