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

site_ansto/instrument/hipd/config/motors/motor_configuration.tcl

@@ -1,11 +1,18 @@
-# $Revision: 1.12 $
-# $Date: 2007-04-20 01:53:31 $
+# $Revision: 1.13 $
+# $Date: 2007-05-10 06:12:25 $
 # Author: Ferdi Franceschini (ffr@ansto.gov.au)
 # Last revision by: $Author: ffr $
 
 # START MOTOR CONFIGURATION
 
 set animal wombat
+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
@@ -101,7 +108,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)\
@@ -124,7 +131,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)\
@@ -147,7 +154,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)\
@@ -170,7 +177,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)\
@@ -193,7 +200,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)\
@@ -216,7 +223,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)\
@@ -255,7 +262,7 @@ mtth long_name takeoff_angle
 ############################
 
 # Sample Tilt 1, upper, phi
-Motor sphi DMC2280 [params \
+Motor sphi $motor_driver_type [params \
   multichan mc2\
   host $dmc2280_controller2(host)\
   port $dmc2280_controller2(port)\
@@ -278,7 +285,7 @@ sphi part sample
 sphi long_name phi
 
 # Sample Tilt 2, lower, chi
-Motor schi DMC2280 [params \
+Motor schi $motor_driver_type [params \
   multichan mc2\
   host $dmc2280_controller2(host)\
   port $dmc2280_controller2(port)\
@@ -301,7 +308,7 @@ schi part sample
 schi long_name chi
 
 # 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)\
@@ -324,7 +331,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)\
@@ -347,7 +354,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)\
@@ -369,7 +376,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)\
@@ -394,7 +401,7 @@ stth part sample
 stth long_name azimuthal_angle
 
 # Oscillating Collimator Translation
-Motor oct DMC2280 [params \
+Motor oct $motor_driver_type [params \
   multichan mc2\
   host $dmc2280_controller2(host)\
   port $dmc2280_controller2(port)\
@@ -425,7 +432,7 @@ oct long_name oct
 #
 
 # Monochromator Focusing (HOPG)
-#Motor mf1 DMC2280 [params \
+#Motor mf1 $motor_driver_type [params \
 #  multichan mc3\
 #  host $dmc2280_controller3(host)\
 #  port $dmc2280_controller3(port)\
@@ -448,7 +455,7 @@ oct long_name oct
 #mf1 long_name mf1
 
 # Monochromator Focusing (Ge)
-Motor mf2 DMC2280 [params \
+Motor mf2 $motor_driver_type [params \
   multichan mc3\
   host $dmc2280_controller3(host)\
   port $dmc2280_controller3(port)\
@@ -470,7 +477,7 @@ mf2 part monochromator
 mf2 long_name mf2
 
 # Slit 1, right
-Motor ss1r DMC2280 [params \
+Motor ss1r $motor_driver_type [params \
   multichan mc3\
   host $dmc2280_controller3(host)\
   port $dmc2280_controller3(port)\
@@ -491,7 +498,7 @@ ss1r part aperture.first
 ss1r long_name right
 
 # Slit 1, left
-Motor ss1l DMC2280 [params \
+Motor ss1l $motor_driver_type [params \
   multichan mc3\
   host $dmc2280_controller3(host)\
   port $dmc2280_controller3(port)\
@@ -512,7 +519,7 @@ ss1l part aperture.first
 ss1l long_name left
 
 # Slit 1, up
-Motor ss1u DMC2280 [params \
+Motor ss1u $motor_driver_type [params \
   multichan mc3\
   host $dmc2280_controller3(host)\
   port $dmc2280_controller3(port)\
@@ -533,7 +540,7 @@ ss1u part aperture.first
 ss1u long_name top
 
 # Slit 1, down
-Motor ss1d DMC2280 [params \
+Motor ss1d $motor_driver_type [params \
   multichan mc3\
   host $dmc2280_controller3(host)\
   port $dmc2280_controller3(port)\
@@ -561,7 +568,7 @@ ss1d long_name bottom
 #
 
 # Slit 2, right
-Motor ss2r DMC2280 [params \
+Motor ss2r $motor_driver_type [params \
   multichan mc4\
   host $dmc2280_controller4(host)\
   port $dmc2280_controller4(port)\
@@ -582,7 +589,7 @@ ss2r part aperture.second
 ss2r long_name right
 
 # Slit 2, left
-Motor ss2l DMC2280 [params \
+Motor ss2l $motor_driver_type [params \
   multichan mc4\
   host $dmc2280_controller4(host)\
   port $dmc2280_controller4(port)\
@@ -603,7 +610,7 @@ ss2l part aperture.second
 ss2l long_name left
 
 # Slit 2, up
-Motor ss2u DMC2280 [params \
+Motor ss2u $motor_driver_type [params \
   multichan mc4\
   host $dmc2280_controller4(host)\
   port $dmc2280_controller4(port)\
@@ -624,7 +631,7 @@ ss2u part aperture.second
 ss2u long_name top
 
 # Slit 2, down
-Motor ss2d DMC2280 [params \
+Motor ss2d $motor_driver_type [params \
   multichan mc4\
   host $dmc2280_controller4(host)\
   port $dmc2280_controller4(port)\