From cd0de991b423ca58688b62867954e14c865d7877 Mon Sep 17 00:00:00 2001 From: Ferdi Franceschini Date: Mon, 26 Mar 2007 12:29:10 +1000 Subject: [PATCH] Update config for new multichannel controller which no longer requires an RS232 controller and accepts named hosts and ports. r1723 | ffr | 2007-03-26 12:29:10 +1000 (Mon, 26 Mar 2007) | 2 lines --- .../config/motors/motor_configuration.tcl | 83 +++++++++---------- 1 file changed, 38 insertions(+), 45 deletions(-) diff --git a/site_ansto/instrument/reflectometer/config/motors/motor_configuration.tcl b/site_ansto/instrument/reflectometer/config/motors/motor_configuration.tcl index 92e75ff6..8620b1d3 100644 --- a/site_ansto/instrument/reflectometer/config/motors/motor_configuration.tcl +++ b/site_ansto/instrument/reflectometer/config/motors/motor_configuration.tcl @@ -1,7 +1,7 @@ -# $Revision: 1.1 $ -# $Date: 2007-03-23 02:48:51 $ +# $Revision: 1.2 $ +# $Date: 2007-03-26 02:29:10 $ # Author: Ferdi Franceschini (ffr@ansto.gov.au) -# Last revision by: $Author: dcl $ +# Last revision by: $Author: ffr $ # START MOTOR CONFIGURATION @@ -19,18 +19,11 @@ set dmc2280_controller3(port) pmc3-$animal set dmc2280_controller4(host) mc4-$animal set dmc2280_controller4(port) pmc4-$animal -set use_multichan 1 +MakeMultiChan mc1 $dmc2280_controller1(host) $dmc2280_controller1(port) +MakeMultiChan mc2 $dmc2280_controller2(host) $dmc2280_controller2(port) +MakeMultiChan mc3 $dmc2280_controller3(host) $dmc2280_controller3(port) +MakeMultiChan mc4 $dmc2280_controller4(host) $dmc2280_controller4(port) -if {$use_multichan == 1} { -MakeRS232Controller dmc_rs1 137.157.202.131 1034 -MakeRS232Controller dmc_rs2 137.157.202.132 1034 -MakeRS232Controller dmc_rs3 137.157.202.133 1034 -MakeRS232Controller dmc_rs4 137.157.202.134 1034 -MakeMultiChan dmc_mc1 dmc_rs1 -MakeMultiChan dmc_mc2 dmc_rs2 -MakeMultiChan dmc_mc3 dmc_rs3 -MakeMultiChan dmc_mc4 dmc_rs4 -} #Measured absolute encoder reading at home position set bz_home 8142000 @@ -107,7 +100,7 @@ set move_count 100 # Beam Shade Vertical Translation (6mm/T double helix, 500mm) Motor bz DMC2280 [params \ - multichan dmc_mc1\ + multichan mc1\ host $dmc2280_controller1(host)\ port $dmc2280_controller1(port)\ axis A\ @@ -127,7 +120,7 @@ bz home 0 # Collimator Table Horizontal Translation, X Motor c1ht DMC2280 [params \ - multichan dmc_mc1\ + multichan mc1\ host $dmc2280_controller1(host)\ port $dmc2280_controller1(port)\ axis B\ @@ -147,7 +140,7 @@ c1ht home 0 # Collimator Tilt, Z axis, positive is down Motor m1ro DMC2280 [params \ - multichan dmc_mc1\ + multichan mc1\ host $dmc2280_controller1(host)\ port $dmc2280_controller1(port)\ axis C\ @@ -167,7 +160,7 @@ m1ro home 0 # Beam Attenuator (16mm/turn, 200mm travel) Motor bat DMC2280 [params \ - multichan dmc_mc1\ + multichan mc1\ host $dmc2280_controller1(host)\ port $dmc2280_controller1(port)\ axis D\ @@ -187,7 +180,7 @@ bat home 0 # Slit 3 Tower Translation (1mm/T, +/- 100mm) Motor st3vt DMC2280 [params \ - multichan dmc_mc1\ + multichan mc1\ host $dmc2280_controller1(host)\ port $dmc2280_controller1(port)\ axis E\ @@ -207,7 +200,7 @@ st3vt home 0 # Slit 4 Tower Translation (1mm/T, +/- 100mm) Motor st4vt DMC2280 [params \ - multichan dmc_mc1\ + multichan mc1\ host $dmc2280_controller1(host)\ port $dmc2280_controller1(port)\ axis F\ @@ -235,7 +228,7 @@ st4vt home 0 # Sample Tilt 1, upper (1 degree/turn) Motor sth DMC2280 [params \ - multichan dmc_mc2\ + multichan mc2\ host $dmc2280_controller2(host)\ port $dmc2280_controller2(port)\ axis A\ @@ -255,7 +248,7 @@ sth precision 0.01 # Sample Tilt 2, lower (1 degree/turn) Motor sphi DMC2280 [params \ - multichan dmc_mc2\ + multichan mc2\ host $dmc2280_controller2(host)\ port $dmc2280_controller2(port)\ axis B\ @@ -275,7 +268,7 @@ sphi precision 0.01 # Sample Translation, Linear X (5mm/T, 0-750mm) Motor sx DMC2280 [params \ - multichan dmc_mc2\ + multichan mc2\ host $dmc2280_controller2(host)\ port $dmc2280_controller2(port)\ axis C\ @@ -295,7 +288,7 @@ sx home 0 # Sample Translation, Linear Y #Motor sy DMC2280 [params \ -# multichan dmc_mc2\ +# multichan mc2\ # host $dmc2280_controller2(host)\ # port $dmc2280_controller2(port)\ # axis D\ @@ -315,7 +308,7 @@ sx home 0 # Sample Translation, Linear Z (??/T, 300mm) Motor sz DMC2280 [params \ - multichan dmc_mc2\ + multichan mc2\ host $dmc2280_controller2(host)\ port $dmc2280_controller2(port)\ axis E\ @@ -336,7 +329,7 @@ sz speed 2 # Detector Translation, Linear Y (Not Motorized) #Motor dy DMC2280 [params \ -# multichan dmc_mc2\ +# multichan mc2\ # host $dmc2280_controller2(host)\ # port $dmc2280_controller2(port)\ # axis F\ @@ -356,7 +349,7 @@ sz speed 2 # Detector Translation, Linear Z (5mm/T gearing unknown) Motor dz DMC2280 [params \ - multichan dmc_mc2\ + multichan mc2\ host $dmc2280_controller2(host)\ port $dmc2280_controller2(port)\ axis G\ @@ -383,7 +376,7 @@ dz home 0 # Slit 1, lower Motor ss1d DMC2280 [params \ - multichan dmc_mc3\ + multichan mc3\ host $dmc2280_controller3(host)\ port $dmc2280_controller3(port)\ axis D\ @@ -401,7 +394,7 @@ ss1d home 0 # Slit 1, upper Motor ss1u DMC2280 [params \ - multichan dmc_mc3\ + multichan mc3\ host $dmc2280_controller3(host)\ port $dmc2280_controller3(port)\ axis C\ @@ -419,7 +412,7 @@ ss1u home 0 # Slit 1, left Motor ss1l DMC2280 [params \ - multichan dmc_mc3\ + multichan mc3\ host $dmc2280_controller3(host)\ port $dmc2280_controller3(port)\ axis A\ @@ -437,7 +430,7 @@ ss1l home 0 # Slit 1, right Motor ss1r DMC2280 [params \ - multichan dmc_mc3\ + multichan mc3\ host $dmc2280_controller3(host)\ port $dmc2280_controller3(port)\ axis B\ @@ -455,7 +448,7 @@ ss1r home 0 # Slit 2, lower Motor ss2d DMC2280 [params \ - multichan dmc_mc3\ + multichan mc3\ host $dmc2280_controller3(host)\ port $dmc2280_controller3(port)\ axis H\ @@ -473,7 +466,7 @@ ss2d home 0 # Slit 2, upper Motor ss2u DMC2280 [params \ - multichan dmc_mc3\ + multichan mc3\ host $dmc2280_controller3(host)\ port $dmc2280_controller3(port)\ axis G\ @@ -491,7 +484,7 @@ ss2u home 0 # Slit 2, left Motor ss2l DMC2280 [params \ - multichan dmc_mc3\ + multichan mc3\ host $dmc2280_controller3(host)\ port $dmc2280_controller3(port)\ axis E\ @@ -509,7 +502,7 @@ ss2l home 0 # Slit 2, right Motor ss2r DMC2280 [params \ - multichan dmc_mc3\ + multichan mc3\ host $dmc2280_controller3(host)\ port $dmc2280_controller3(port)\ axis F\ @@ -527,7 +520,7 @@ ss2r home 0 # Slit 3, lower Motor ss3d DMC2280 [params \ - multichan dmc_mc4\ + multichan mc4\ host $dmc2280_controller4(host)\ port $dmc2280_controller4(port)\ axis A\ @@ -545,7 +538,7 @@ ss3d home 0 # Slit 3, upper Motor ss3u DMC2280 [params \ - multichan dmc_mc4\ + multichan mc4\ host $dmc2280_controller4(host)\ port $dmc2280_controller4(port)\ axis B\ @@ -563,7 +556,7 @@ ss3u home 0 # Slit 3, Left Motor ss3l DMC2280 [params \ - multichan dmc_mc4\ + multichan mc4\ host $dmc2280_controller4(host)\ port $dmc2280_controller4(port)\ axis C\ @@ -581,7 +574,7 @@ ss3l home 0 # Slit 3, right Motor ss3r DMC2280 [params \ - multichan dmc_mc4\ + multichan mc4\ host $dmc2280_controller4(host)\ port $dmc2280_controller4(port)\ axis D\ @@ -599,7 +592,7 @@ ss3r home 0 # Slit 4, lower Motor ss4d DMC2280 [params \ - multichan dmc_mc4\ + multichan mc4\ host $dmc2280_controller4(host)\ port $dmc2280_controller4(port)\ axis E\ @@ -617,7 +610,7 @@ ss4d home 0 # Slit 4, upper Motor ss4u DMC2280 [params \ - multichan dmc_mc4\ + multichan mc4\ host $dmc2280_controller4(host)\ port $dmc2280_controller4(port)\ axis F\ @@ -635,7 +628,7 @@ ss4u home 0 # Slit 4, left Motor ss4l DMC2280 [params \ - multichan dmc_mc4\ + multichan mc4\ host $dmc2280_controller4(host)\ port $dmc2280_controller4(port)\ axis G\ @@ -653,7 +646,7 @@ ss4l home 0 # Slit 4, right Motor ss4r DMC2280 [params \ - multichan dmc_mc4\ + multichan mc4\ host $dmc2280_controller4(host)\ port $dmc2280_controller4(port)\ axis H\ @@ -671,7 +664,7 @@ ss4r home 0 ## Polarization Analyzer Vertical Translation, Z #Motor anzvt DMC2280 [params \ -# multichan dmc_mc2\ +# multichan mc2\ # host $dmc2280_controller2(host)\ # port $dmc2280_controller2(port)\ # axis xxxx\ @@ -691,7 +684,7 @@ ss4r home 0 ## Polarization Analyzer Rotation #Motor anro DMC2280 [params \ -# multichan dmc_mc2\ +# multichan mc2\ # host $dmc2280_controller2(host)\ # port $dmc2280_controller2(port)\ # axis xxxx\