From 6d9120f7967036f59bedfcd9e92de4a2fc4600cf Mon Sep 17 00:00:00 2001 From: Ferdi Franceschini Date: Thu, 10 May 2007 16:12:25 +1000 Subject: [PATCH] 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 --- .../config/motors/motor_configuration.tcl | 57 +++++++------- .../config/motors/motor_configuration.tcl | 75 ++++++++++--------- .../rsd/config/motors/motor_configuration.tcl | 59 ++++++++------- 3 files changed, 106 insertions(+), 85 deletions(-) diff --git a/site_ansto/instrument/hipd/config/motors/motor_configuration.tcl b/site_ansto/instrument/hipd/config/motors/motor_configuration.tcl index 2bd22396..35417d9a 100644 --- a/site_ansto/instrument/hipd/config/motors/motor_configuration.tcl +++ b/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)\ diff --git a/site_ansto/instrument/reflectometer/config/motors/motor_configuration.tcl b/site_ansto/instrument/reflectometer/config/motors/motor_configuration.tcl index b9f1eb3d..88e0e96a 100644 --- a/site_ansto/instrument/reflectometer/config/motors/motor_configuration.tcl +++ b/site_ansto/instrument/reflectometer/config/motors/motor_configuration.tcl @@ -1,11 +1,18 @@ -# $Revision: 1.12 $ -# $Date: 2007-04-19 00:08:59 $ +# $Revision: 1.13 $ +# $Date: 2007-05-10 06:12:25 $ # Author: Ferdi Franceschini (ffr@ansto.gov.au) -# Last revision by: $Author: dcl $ +# Last revision by: $Author: ffr $ # START MOTOR CONFIGURATION set animal platypus +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 @@ -143,7 +150,7 @@ set move_count 100 # # Beam Shade Vertical Translation (6mm/T double helix, 500mm) -Motor bz DMC2280 [params \ +Motor bz $motor_driver_type [params \ multichan mc1\ host $dmc2280_controller1(host)\ port $dmc2280_controller1(port)\ @@ -165,7 +172,7 @@ bz softupperlim 275 bz home 0 # Collimator Table Horizontal Translation, X -Motor c1ht DMC2280 [params \ +Motor c1ht $motor_driver_type [params \ multichan mc1\ host $dmc2280_controller1(host)\ port $dmc2280_controller1(port)\ @@ -187,7 +194,7 @@ c1ht softupperlim 1065 c1ht home 0 # Collimator Tilt, Z axis, positive is down -Motor m1ro DMC2280 [params \ +Motor m1ro $motor_driver_type [params \ multichan mc1\ host $dmc2280_controller1(host)\ port $dmc2280_controller1(port)\ @@ -209,7 +216,7 @@ m1ro softupperlim 3.5 m1ro home 0 # Beam Attenuator (16mm/turn, 200mm travel) -Motor bat DMC2280 [params \ +Motor bat $motor_driver_type [params \ multichan mc1\ host $dmc2280_controller1(host)\ port $dmc2280_controller1(port)\ @@ -231,7 +238,7 @@ bat softupperlim 200 bat home 0 # Slit 3 Tower Translation (1mm/T, +/- 100mm) -Motor st3vt DMC2280 [params \ +Motor st3vt $motor_driver_type [params \ multichan mc1\ host $dmc2280_controller1(host)\ port $dmc2280_controller1(port)\ @@ -253,7 +260,7 @@ st3vt softupperlim 253 st3vt home 0 # Slit 4 Tower Translation (1mm/T, +/- 100mm) -Motor st4vt DMC2280 [params \ +Motor st4vt $motor_driver_type [params \ multichan mc1\ host $dmc2280_controller1(host)\ port $dmc2280_controller1(port)\ @@ -283,7 +290,7 @@ st4vt home 0 # # Sample Tilt 1, upper (1 degree/turn) -Motor sth DMC2280 [params \ +Motor sth $motor_driver_type [params \ multichan mc2\ host $dmc2280_controller2(host)\ port $dmc2280_controller2(port)\ @@ -305,7 +312,7 @@ sth speed 1 sth precision 0.01 # Sample Tilt 2, lower (1 degree/turn) -Motor sphi DMC2280 [params \ +Motor sphi $motor_driver_type [params \ multichan mc2\ host $dmc2280_controller2(host)\ port $dmc2280_controller2(port)\ @@ -327,7 +334,7 @@ sphi speed 1 sphi precision 0.01 # Sample Translation, Linear X (5mm/T, 0-750mm) -Motor sx DMC2280 [params \ +Motor sx $motor_driver_type [params \ multichan mc2\ host $dmc2280_controller2(host)\ port $dmc2280_controller2(port)\ @@ -349,7 +356,7 @@ sx softupperlim 730 sx home 0 # Sample Translation, Linear 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 @@ sx home 0 #sy home -450 # Sample Translation, Linear Z (??/T, 300mm) -Motor sz DMC2280 [params \ +Motor sz $motor_driver_type [params \ multichan mc2\ host $dmc2280_controller2(host)\ port $dmc2280_controller2(port)\ @@ -395,7 +402,7 @@ sz speed 2 sth precision 0.001 # Detector Translation, Linear Y (Not Motorized) -#Motor dy DMC2280 [params \ +#Motor dy $motor_driver_type [params \ # multichan mc2\ # host $dmc2280_controller2(host)\ # port $dmc2280_controller2(port)\ @@ -415,7 +422,7 @@ sth precision 0.001 #dy home 0 # Detector Translation, Linear Z (5mm/T gearing unknown) -Motor dz DMC2280 [params \ +Motor dz $motor_driver_type [params \ multichan mc2\ host $dmc2280_controller2(host)\ port $dmc2280_controller2(port)\ @@ -444,7 +451,7 @@ dz home 0 # # Slit 1, left -Motor ss1l DMC2280 [params \ +Motor ss1l $motor_driver_type [params \ multichan mc3\ host $dmc2280_controller3(host)\ port $dmc2280_controller3(port)\ @@ -464,7 +471,7 @@ ss1l softupperlim $ss1l_HiRange ss1l home 0 # Slit 1, right -Motor ss1r DMC2280 [params \ +Motor ss1r $motor_driver_type [params \ multichan mc3\ host $dmc2280_controller3(host)\ port $dmc2280_controller3(port)\ @@ -484,7 +491,7 @@ ss1r softupperlim $ss1r_HiRange ss1r home 0 # Slit 1, upper -Motor ss1u DMC2280 [params \ +Motor ss1u $motor_driver_type [params \ multichan mc3\ host $dmc2280_controller3(host)\ port $dmc2280_controller3(port)\ @@ -504,7 +511,7 @@ ss1u softupperlim $ss1u_HiRange ss1u home 0 # Slit 1, lower -Motor ss1d DMC2280 [params \ +Motor ss1d $motor_driver_type [params \ multichan mc3\ host $dmc2280_controller3(host)\ port $dmc2280_controller3(port)\ @@ -524,7 +531,7 @@ ss1d softupperlim $ss1d_HiRange ss1d home 0 # Slit 2, left -Motor ss2l DMC2280 [params \ +Motor ss2l $motor_driver_type [params \ multichan mc3\ host $dmc2280_controller3(host)\ port $dmc2280_controller3(port)\ @@ -544,7 +551,7 @@ ss2l softupperlim $ss2l_HiRange ss2l home 0 # Slit 2, right -Motor ss2r DMC2280 [params \ +Motor ss2r $motor_driver_type [params \ multichan mc3\ host $dmc2280_controller3(host)\ port $dmc2280_controller3(port)\ @@ -564,7 +571,7 @@ ss2r softupperlim $ss2r_HiRange ss2r home 0 # Slit 2, upper -Motor ss2u DMC2280 [params \ +Motor ss2u $motor_driver_type [params \ multichan mc3\ host $dmc2280_controller3(host)\ port $dmc2280_controller3(port)\ @@ -584,7 +591,7 @@ ss2u softupperlim $ss2u_HiRange ss2u home 0 # Slit 2, lower -Motor ss2d DMC2280 [params \ +Motor ss2d $motor_driver_type [params \ multichan mc3\ host $dmc2280_controller3(host)\ port $dmc2280_controller3(port)\ @@ -611,7 +618,7 @@ ss2d home 0 # # Slit 3, lower -Motor ss3d DMC2280 [params \ +Motor ss3d $motor_driver_type [params \ multichan mc4\ host $dmc2280_controller4(host)\ port $dmc2280_controller4(port)\ @@ -631,7 +638,7 @@ ss3d softupperlim $ss3d_HiRange ss3d home 0 # Slit 3, upper -Motor ss3u DMC2280 [params \ +Motor ss3u $motor_driver_type [params \ multichan mc4\ host $dmc2280_controller4(host)\ port $dmc2280_controller4(port)\ @@ -651,7 +658,7 @@ ss3u softupperlim $ss3u_HiRange ss3u home 0 # Slit 3, Left -Motor ss3l DMC2280 [params \ +Motor ss3l $motor_driver_type [params \ multichan mc4\ host $dmc2280_controller4(host)\ port $dmc2280_controller4(port)\ @@ -671,7 +678,7 @@ ss3l softupperlim $ss3l_HiRange ss3l home 0 # Slit 3, right -Motor ss3r DMC2280 [params \ +Motor ss3r $motor_driver_type [params \ multichan mc4\ host $dmc2280_controller4(host)\ port $dmc2280_controller4(port)\ @@ -691,7 +698,7 @@ ss3r softupperlim $ss3r_HiRange ss3r home 0 # Slit 4, lower -Motor ss4d DMC2280 [params \ +Motor ss4d $motor_driver_type [params \ multichan mc4\ host $dmc2280_controller4(host)\ port $dmc2280_controller4(port)\ @@ -711,7 +718,7 @@ ss4d softupperlim $ss4d_HiRange ss4d home 0 # Slit 4, upper -Motor ss4u DMC2280 [params \ +Motor ss4u $motor_driver_type [params \ multichan mc4\ host $dmc2280_controller4(host)\ port $dmc2280_controller4(port)\ @@ -731,7 +738,7 @@ ss4u softupperlim $ss4u_HiRange ss4u home 0 # Slit 4, left -Motor ss4l DMC2280 [params \ +Motor ss4l $motor_driver_type [params \ multichan mc4\ host $dmc2280_controller4(host)\ port $dmc2280_controller4(port)\ @@ -751,7 +758,7 @@ ss4l softupperlim $ss4l_HiRange ss4l home 0 # Slit 4, right -Motor ss4r DMC2280 [params \ +Motor ss4r $motor_driver_type [params \ multichan mc4\ host $dmc2280_controller4(host)\ port $dmc2280_controller4(port)\ @@ -771,7 +778,7 @@ ss4r softupperlim $ss4r_HiRange ss4r home 0 ## Polarization Analyzer Vertical Translation, Z -#Motor anzvt DMC2280 [params \ +#Motor anzvt $motor_driver_type [params \ # multichan mc2\ # host $dmc2280_controller2(host)\ # port $dmc2280_controller2(port)\ @@ -793,7 +800,7 @@ ss4r home 0 #anzvt home 0 ## Polarization Analyzer Rotation -#Motor anro DMC2280 [params \ +#Motor anro $motor_driver_type [params \ # multichan mc2\ # host $dmc2280_controller2(host)\ # port $dmc2280_controller2(port)\ diff --git a/site_ansto/instrument/rsd/config/motors/motor_configuration.tcl b/site_ansto/instrument/rsd/config/motors/motor_configuration.tcl index c148af94..4f0eff40 100644 --- a/site_ansto/instrument/rsd/config/motors/motor_configuration.tcl +++ b/site_ansto/instrument/rsd/config/motors/motor_configuration.tcl @@ -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\