SICS-587 (in progress) IP and PORT configurations DONE for Quokka.

TODO Environment controllers etc.
This commit is contained in:
Ferdi Franceschini
2013-04-24 16:54:22 +10:00
parent 20a3dff71e
commit d8b48728b4
9 changed files with 116 additions and 30 deletions

View File

@@ -1,18 +1,18 @@
fileeval $cfPath(beamline)/sct_flipper.tcl
# NOTE: opCurr is 10 * your operating current, ie if the current is 7.1 then opCurr = 71
::scobj::rfgen::mkFlipper {
::scobj::rfgen::mkFlipper [subst {
name "flipper"
address 1
opCurr 71
opFreq 407
IP 137.157.202.86
PORT 4001
IP [dict get $::ACGEN_HOSTPORT ANSFR83B HOST]
PORT [dict get $::ACGEN_HOSTPORT ANSFR83B PORT]
tuning 1
interval 2
currtol 1
compCurr 1
guideCurr 1
thickness 1
}
}]

View File

@@ -15,10 +15,14 @@ proc ::counter::isc_initialize {} {
variable isc_numchannels
variable isc_monitor_address
variable isc_portlist
variable isc_beam_monitor_list {MONITOR_1 MONITOR_2 MONITOR_3}
set isc_monitor_address "das1-[SplitReply [instrument]]"
set isc_portlist [list 30000 30001 30002 30003 30004 30005 30006 30007]
dict for {k v} $::MONITOR_HOSTPORT {
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]
::counter::ic_initialize
} message ] {

View File

@@ -10,26 +10,14 @@ set animal quokka
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 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]
MakeAsyncQueue mc4 DMC2280 [dict get $::MOTOR_HOSTPORT MC4 HOST] [dict get $::MOTOR_HOSTPORT MC4 PORT]
}
# Beam stop gearing and signs (BS1=largest)

View File

@@ -26,8 +26,8 @@ namespace eval ::scobj::velocity_selector {
switch $::currVelSel {
40 {
set velsel_ID "NVS40"
set velsel_IP "137.157.202.73"
set velsel_port 10000
set velsel_IP [dict get $VELSEL_HOSTPORT $velsel_ID HOST]
set velsel_port [dict get $VELSEL_HOSTPORT $velsel_ID PORT]
set ::scobj::velocity_selector::UID "NVS"
set ::scobj::velocity_selector::PWD "NVS"
set ::scobj::velocity_selector::blocked_speeds {
@@ -40,8 +40,8 @@ namespace eval ::scobj::velocity_selector {
43 {
# dc2-quokka.nbi.ansto.gov.au
set velsel_ID "NVS43"
set velsel_IP "137.157.202.74"
set velsel_port 10000
set velsel_IP [dict get $VELSEL_HOSTPORT $velsel_ID HOST]
set velsel_port [dict get $VELSEL_HOSTPORT $velsel_ID PORT]
set ::scobj::velocity_selector::UID "NVS"
set ::scobj::velocity_selector::PWD "NVS"
set ::scobj::velocity_selector::blocked_speeds {