From a151a2a163a3ce808c5640fa4a16ba49d20cd48b Mon Sep 17 00:00:00 2001 From: Ferdi Franceschini Date: Thu, 10 May 2007 13:24:28 +1000 Subject: [PATCH] Set motor_driver_type to "asim" when motor_simulation flag is true, otherwise set it to DMC2280. r1952 | ffr | 2007-05-10 13:24:28 +1000 (Thu, 10 May 2007) | 2 lines --- .../config/motors/motor_configuration.tcl | 61 +++++++++++-------- 1 file changed, 34 insertions(+), 27 deletions(-) diff --git a/site_ansto/instrument/hrpd/config/motors/motor_configuration.tcl b/site_ansto/instrument/hrpd/config/motors/motor_configuration.tcl index 3495754a..73e20373 100644 --- a/site_ansto/instrument/hrpd/config/motors/motor_configuration.tcl +++ b/site_ansto/instrument/hrpd/config/motors/motor_configuration.tcl @@ -1,11 +1,18 @@ -# $Revision: 1.15 $ -# $Date: 2007-04-20 01:53:31 $ +# $Revision: 1.16 $ +# $Date: 2007-05-10 03:24:28 $ # Author: Ferdi Franceschini (ffr@ansto.gov.au) # Last revision by: $Author: ffr $ # START MOTOR CONFIGURATION set animal echidna +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 @@ -102,7 +109,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)\ @@ -125,7 +132,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)\ @@ -148,7 +155,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)\ @@ -171,7 +178,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)\ @@ -194,7 +201,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)\ @@ -217,7 +224,7 @@ mom part crystal mom long_name omega # 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)\ @@ -250,7 +257,7 @@ mtth part crystal mtth long_name takeoff_angle # Primary Collimator Translation X -Motor pcx DMC2280 [params \ +Motor pcx $motor_driver_type [params \ multichan mc1\ host $dmc2280_controller1(host)\ port $dmc2280_controller1(port)\ @@ -273,7 +280,7 @@ pcx part collimator pcx long_name primary_collimator_translation # Primary Collimator Rotation -Motor pcr DMC2280 [params \ +Motor pcr $motor_driver_type [params \ multichan mc1\ host $dmc2280_controller1(host)\ port $dmc2280_controller1(port)\ @@ -302,7 +309,7 @@ pcr long_name primary_collimator_rotation ############################ # 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)\ @@ -325,7 +332,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)\ @@ -348,7 +355,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)\ @@ -371,7 +378,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)\ @@ -394,7 +401,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)\ @@ -417,7 +424,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)\ @@ -450,7 +457,7 @@ stth long_name azimuthal_angle # # Monochromator Focusing (Ge) -#Motor mf1 DMC2280 [params \ +#Motor mf1 $motor_driver_type [params \ # multichan mc3\ # host $dmc2280_controller3(host)\ # port $dmc2280_controller3(port)\ @@ -469,7 +476,7 @@ stth long_name azimuthal_angle #mf1 precision 0.01 # Slit 1, right -Motor ss1r DMC2280 [params \ +Motor ss1r $motor_driver_type [params \ multichan mc3\ host $dmc2280_controller3(host)\ port $dmc2280_controller3(port)\ @@ -490,7 +497,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)\ @@ -511,7 +518,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)\ @@ -532,7 +539,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 # Little is known about the Eulerian Cradle ## Eulerian-phi -#Motor ephi DMC2280 [params \ +#Motor ephi $motor_driver_type [params \ # multichan mc4\ # host $dmc2280_controller4(host)\ # port $dmc2280_controller4(port)\ @@ -576,7 +583,7 @@ ss1d long_name bottom # cntsPerX xxxx] #setHomeandRange -motor ephi -home 0 -lowrange 180 -uprange 180 -#Motor echi DMC2280 [params \ +#Motor echi $motor_driver_type [params \ # multichan mc4\ # host $dmc2280_controller4(host)\ # port $dmc2280_controller4(port)\ @@ -592,7 +599,7 @@ ss1d long_name bottom #setHomeandRange -motor echi -home 0 -lowrange 180 -uprange 180 # Slit 2, right -Motor ss2r DMC2280 [params \ +Motor ss2r $motor_driver_type [params \ multichan mc4\ host $dmc2280_controller4(host)\ port $dmc2280_controller4(port)\ @@ -613,7 +620,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)\ @@ -634,7 +641,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)\ @@ -655,7 +662,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)\