Added motor_driver_type variable so we can switch between the real (DMC2280) drivers and the simulated drivers.

r1956 | ffr | 2007-05-10 16:12:25 +1000 (Thu, 10 May 2007) | 2 lines
This commit is contained in:
Ferdi Franceschini
2007-05-10 16:12:25 +10:00
committed by Douglas Clowes
parent 7a2f0c238a
commit 6d9120f796
3 changed files with 106 additions and 85 deletions

View File

@@ -1,11 +1,18 @@
# $Revision: 1.1 $
# $Date: 2007-05-07 05:30:02 $
# $Revision: 1.2 $
# $Date: 2007-05-10 06:12:25 $
# Author: Ferdi Franceschini (ffr@ansto.gov.au)
# Last revision by: $Author: ffr $
# START MOTOR CONFIGURATION
set animal kowari
set sim_mode [SplitReply [motor_simulation]]
if {$sim_mode == "true"} {
set motor_driver_type asim
} else {
set motor_driver_type DMC2280
}
# Setup addresses of Galil DMC2280 controllers.
set dmc2280_controller1(host) mc1-$animal
set dmc2280_controller1(port) pmc1-$animal
@@ -47,7 +54,7 @@ set move_count 10
#
# Monochromator phi, Tilt 1, upper
Motor mphi DMC2280 [params \
Motor mphi $motor_driver_type [params \
multichan mc1\
host $dmc2280_controller1(host)\
port $dmc2280_controller1(port)\
@@ -70,7 +77,7 @@ mphi part crystal
mphi long_name phi
# Monochromator chi, Tilt 2, lower
Motor mchi DMC2280 [params \
Motor mchi $motor_driver_type [params \
multichan mc1\
host $dmc2280_controller1(host)\
port $dmc2280_controller1(port)\
@@ -93,7 +100,7 @@ mchi part crystal
mchi long_name chi
# Monochromator Trans 1, upper
Motor my DMC2280 [params \
Motor my $motor_driver_type [params \
multichan mc1\
host $dmc2280_controller1(host)\
port $dmc2280_controller1(port)\
@@ -116,7 +123,7 @@ my part crystal
my long_name translate_y
# Monochromator Trans 2, lower
Motor mx DMC2280 [params \
Motor mx $motor_driver_type [params \
multichan mc1\
host $dmc2280_controller1(host)\
port $dmc2280_controller1(port)\
@@ -139,7 +146,7 @@ mx part crystal
mx long_name translate_x
# Monochromator omega, rotate
Motor mom DMC2280 [params \
Motor mom $motor_driver_type [params \
multichan mc1\
host $dmc2280_controller1(host)\
port $dmc2280_controller1(port)\
@@ -162,7 +169,7 @@ mom part crystal
mom long_name rotate
# Monochromator two-theta, flight-tube rotate
Motor mtth DMC2280 [params \
Motor mtth $motor_driver_type [params \
multichan mc1\
host $dmc2280_controller1(host)\
port $dmc2280_controller1(port)\
@@ -203,7 +210,7 @@ mtth long_name takeoff_angle
#
# Sample Trans, vertical, first stage
Motor sz1 DMC2280 [params \
Motor sz1 $motor_driver_type [params \
multichan mc2\
host $dmc2280_controller2(host)\
port $dmc2280_controller2(port)\
@@ -222,7 +229,7 @@ sz1 part sample.first
sz1 long_name vertical_translation
# Sample Trans, vertical, second stage
Motor sz2 DMC2280 [params \
Motor sz2 $motor_driver_type [params \
multichan mc2\
host $dmc2280_controller2(host)\
port $dmc2280_controller2(port)\
@@ -241,7 +248,7 @@ sz2 part sample.second
sz2 long_name vertical_translation
# Sample Trans 1, upper, y
Motor sy DMC2280 [params \
Motor sy $motor_driver_type [params \
multichan mc2\
host $dmc2280_controller2(host)\
port $dmc2280_controller2(port)\
@@ -264,7 +271,7 @@ sy part sample
sy long_name translate_y
# Sample Trans2, lower, x
Motor sx DMC2280 [params \
Motor sx $motor_driver_type [params \
multichan mc2\
host $dmc2280_controller2(host)\
port $dmc2280_controller2(port)\
@@ -287,7 +294,7 @@ sx part sample
sx long_name translate_x
# Sample Omega, rotate
Motor som DMC2280 [params \
Motor som $motor_driver_type [params \
multichan mc2\
host $dmc2280_controller2(host)\
port $dmc2280_controller2(port)\
@@ -309,7 +316,7 @@ som part sample
som long_name rotate
# Sample two-theta, detector rotate
Motor stth DMC2280 [params \
Motor stth $motor_driver_type [params \
multichan mc2\
host $dmc2280_controller2(host)\
port $dmc2280_controller2(port)\
@@ -342,7 +349,7 @@ stth long_name azimuthal_angle
#
# Monochromator Focusing (HOPG)
#Motor mf1 DMC2280 [params \
#Motor mf1 $motor_driver_type [params \
# multichan mc3\
# host $dmc2280_controller3(host)\
# port $dmc2280_controller3(port)\
@@ -365,7 +372,7 @@ stth long_name azimuthal_angle
#mf1 long_name mf1
# Monochromator Focusing (Ge)
Motor mf2 DMC2280 [params \
Motor mf2 $motor_driver_type [params \
host $dmc2280_controller3(host)\
port $dmc2280_controller3(port)\
axis B\
@@ -386,7 +393,7 @@ mf2 part monochromator
mf2 long_name mf2
## Eulerian-chi
#Motor echi DMC2280 [params \
#Motor echi $motor_driver_type [params \
# host $dmc2280_controller3(host)\
# port $dmc2280_controller3(port)\
# axis G\
@@ -400,7 +407,7 @@ mf2 long_name mf2
#echi precision 0.01
## Eulerian-phi
#Motor ephi DMC2280 [params \
#Motor ephi $motor_driver_type [params \
# host $dmc2280_controller3(host)\
# port $dmc2280_controller3(port)\
# axis H\
@@ -421,7 +428,7 @@ mf2 long_name mf2
#
# Primary Slit, horizontal offset, 0-30mm
Motor psho DMC2280 [params \
Motor psho $motor_driver_type [params \
host $dmc2280_controller4(host)\
port $dmc2280_controller4(port)\
axis A\
@@ -438,7 +445,7 @@ psho long_name horizontal_offset
setHomeandRange -motor psho -home 0 -lowrange 0 -uprange 30
# Primary Slit, position 0-150mm
Motor psp DMC2280 [params \
Motor psp $motor_driver_type [params \
host $dmc2280_controller4(host)\
port $dmc2280_controller4(port)\
axis B\
@@ -455,7 +462,7 @@ psp long_name position
setHomeandRange -motor psp -home 0 -lowrange 0 -uprange 150
# Primary Slit, width, 0-30mm
Motor psw DMC2280 [params \
Motor psw $motor_driver_type [params \
host $dmc2280_controller4(host)\
port $dmc2280_controller4(port)\
axis C\
@@ -472,7 +479,7 @@ psw part long_name width
setHomeandRange -motor psw -home 0 -lowrange 0 -uprange 30
## Primary Slit, height, 0-30mm
#Motor psh DMC2280 [params \
#Motor psh $motor_driver_type [params \
# host $dmc2280_controller4(host)\
# port $dmc2280_controller4(port)\
# axis D\
@@ -491,7 +498,7 @@ setHomeandRange -motor psw -home 0 -lowrange 0 -uprange 30
#--------------------------------------------------------
# Secondary Slit, horizontal offset
Motor ssho DMC2280 [params \
Motor ssho $motor_driver_type [params \
host $dmc2280_controller4(host)\
port $dmc2280_controller4(port)\
axis E\
@@ -508,7 +515,7 @@ ssho long_name horizontal_offset
setHomeandRange -motor ssho -home 0 -lowrange 0 -uprange 30
# Secondary Slit, position
Motor ssp DMC2280 [params \
Motor ssp $motor_driver_type [params \
host $dmc2280_controller4(host)\
port $dmc2280_controller4(port)\
axis F\
@@ -525,7 +532,7 @@ ssp long_name position
setHomeandRange -motor ssp -home 0 -lowrange 0 -uprange 150
# Secondary Slit, width
Motor ssw DMC2280 [params \
Motor ssw $motor_driver_type [params \
host $dmc2280_controller4(host)\
port $dmc2280_controller4(port)\
axis G\
@@ -542,7 +549,7 @@ ssw long_name width
setHomeandRange -motor ssw -home 0 -lowrange 0 -uprange 30
## Secondary Slit, height
#Motor ssh DMC2280 [params \
#Motor ssh $motor_driver_type [params \
# host $dmc2280_controller4(host)\
# port $dmc2280_controller4(port)\
# axis H\