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

SICS-587 Setup hostport dictionary based configuration for dingo.

Browse Source 
Also added simulated camera server and a camtest configuration file to
run test scans against a dummy motor.
This commit is contained in:
Ferdi Franceschini
2013-06-14 10:18:45 +10:00
parent c71cbbc521
commit 2df9297a3f
9 changed files with 264 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
site_ansto/instrument/dingo/config/counter/counter.tcl
View File

@@ -19,9 +19,6 @@ proc ::counter::cm_initialize {} {
variable isc_cm_address
variable isc_cm_port
set isc_cm_address 137.157.204.193
#set isc_cm_address localhost
set isc_cm_port 33000
MakeAsyncQueue cmserver CAMERA $isc_cm_address $isc_cm_port
MakeCounter cm1 anstocamera cmserver
@@ -68,14 +65,16 @@ proc ::counter::isc_initialize {} {
variable isc_monitor_address
variable isc_portlist
variable isc_beam_monitor_list {MONITOR_1 MONITOR_2 MONITOR_3}
variable isc_cm_address
variable isc_cm_port
#set isc_monitor_address "das1-[SplitReply [instrument]]"
#set isc_portlist [list 33000 33001 33002 33003 33004 33005 33006 33007]
#set isc_numchannels [llength $isc_beam_monitor_list]
#::counter::ic_initialize
set isc_cm_address 137.157.204.193
set isc_cm_port 33000
set isc_cm_address [dict get $::CAMERA_HOSTPORT HOST]
set isc_cm_port [dict get $::CAMERA_HOSTPORT PORT]
::counter::cm_initialize
} message ] {
if {$::errorCode=="NONE"} {return $message}

21
site_ansto/instrument/dingo/config/motors/motor_configuration.tcl
View File

@@ -7,28 +7,13 @@ set use_tiltstage 0
set animal dingo
set sim_mode [SplitReply [motor_simulation]]
# Setup addresses of Galil DMC2280 controllers.
set dmc2280_controller1(host) mc1-$animal
set dmc2280_controller1(port) pmc1-$animal
set dmc2280_controller2(host) mc2-$animal
set dmc2280_controller2(port) pmc2-$animal
set dmc2280_controller3(host) mc3-$animal
set dmc2280_controller3(port) pmc3-$animal
#set dmc2280_controller4(host) mc4-$animal
#set dmc2280_controller4(port) pmc4-$animal
if {$sim_mode == "true"} {
set motor_driver_type asim
} else {
set motor_driver_type DMC2280
MakeAsyncQueue mc1 DMC2280 $dmc2280_controller1(host) $dmc2280_controller1(port)
MakeAsyncQueue mc2 DMC2280 $dmc2280_controller2(host) $dmc2280_controller2(port)
MakeAsyncQueue mc3 DMC2280 $dmc2280_controller3(host) $dmc2280_controller3(port)
# MakeAsyncQueue mc4 DMC2280 $dmc2280_controller4(host) $dmc2280_controller4(port)
# MakeAsyncQueue mc6 DMC2280 $dmc2280_controller6(host) $dmc2280_controller6(port)
MakeAsyncQueue mc1 DMC2280 [dict get $::MOTOR_HOSTPORT MC1 HOST] [dict get $::MOTOR_HOSTPORT MC1 PORT]
MakeAsyncQueue mc2 DMC2280 [dict get $::MOTOR_HOSTPORT MC2 HOST] [dict get $::MOTOR_HOSTPORT MC2 PORT]
MakeAsyncQueue mc3 DMC2280 [dict get $::MOTOR_HOSTPORT MC3 HOST] [dict get $::MOTOR_HOSTPORT MC3 PORT]
}

6
site_ansto/instrument/dingo/config/plc/plc.tcl
View File

@@ -1,8 +1,8 @@
set sim_mode [SplitReply [plc_simulation]]
#if {$sim_mode == "false"} {
MakeAsyncQueue plc_chan SafetyPLC 137.157.204.213 30000
if {$sim_mode == "false"} {
MakeAsyncQueue plc_chan SafetyPLC [dict get $::PLC_HOSTPORT HOST] [dict get $::PLC_HOSTPORT PORT]
MakeSafetyPLC plc plc_chan 0
#}
}
proc shutter {args} {
set cmd "set shutter=$args\r\n"