From 5960ce1d00371288b44fa4be2a8e50af00795bf7 Mon Sep 17 00:00:00 2001 From: Douglas Clowes Date: Mon, 26 Mar 2007 08:09:46 +1000 Subject: [PATCH] Modify to use multichannel controller for motor connections r1722 | dcl | 2007-03-26 08:09:46 +1000 (Mon, 26 Mar 2007) | 2 lines --- .../config/motors/motor_configuration.tcl | 32 +++++++++++++++-- .../config/motors/motor_configuration.tcl | 34 +++++++++++++++++-- 2 files changed, 62 insertions(+), 4 deletions(-) diff --git a/site_ansto/instrument/hipd/config/motors/motor_configuration.tcl b/site_ansto/instrument/hipd/config/motors/motor_configuration.tcl index 20f7da05..9db057a7 100644 --- a/site_ansto/instrument/hipd/config/motors/motor_configuration.tcl +++ b/site_ansto/instrument/hipd/config/motors/motor_configuration.tcl @@ -1,5 +1,5 @@ -# $Revision: 1.6 $ -# $Date: 2007-03-08 02:30:10 $ +# $Revision: 1.7 $ +# $Date: 2007-03-25 22:09:46 $ # Author: Ferdi Franceschini (ffr@ansto.gov.au) # Last revision by: $Author: dcl $ @@ -19,6 +19,11 @@ set dmc2280_controller3(port) pmc3-$animal set dmc2280_controller4(host) mc4-$animal set dmc2280_controller4(port) pmc4-$animal +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) + #Measured absolute encoder reading at home position # 7613185, 7504518, 6770094, 7463036, 8901369, 19927837, 22369621, 22369621 # 7613516, 7503905, 6767221, 7464891 @@ -91,6 +96,7 @@ set move_count 100 # Monochromator phi, Tilt 1, upper Motor mphi DMC2280 [params \ + multichan mc1\ host $dmc2280_controller1(host)\ port $dmc2280_controller1(port)\ axis A\ @@ -111,6 +117,7 @@ mphi precision 0.01 # Monochromator chi, Tilt 2, lower Motor mchi DMC2280 [params \ + multichan mc1\ host $dmc2280_controller1(host)\ port $dmc2280_controller1(port)\ axis B\ @@ -131,6 +138,7 @@ mchi precision 0.01 # Monochromator Trans 1, upper Motor my DMC2280 [params \ + multichan mc1\ host $dmc2280_controller1(host)\ port $dmc2280_controller1(port)\ axis C\ @@ -151,6 +159,7 @@ my precision 0.01 # Monochromator Trans 2, lower Motor mx DMC2280 [params \ + multichan mc1\ host $dmc2280_controller1(host)\ port $dmc2280_controller1(port)\ axis D\ @@ -171,6 +180,7 @@ mx precision 0.01 # Monochromator omega, rotate Motor mom DMC2280 [params \ + multichan mc1\ host $dmc2280_controller1(host)\ port $dmc2280_controller1(port)\ axis E\ @@ -191,6 +201,7 @@ mom precision 0.01 # Monochromator two-theta, flight-tube rotate Motor mtth DMC2280 [params \ + multichan mc1\ host $dmc2280_controller1(host)\ port $dmc2280_controller1(port)\ axis F\ @@ -227,6 +238,7 @@ mtth blockage_check_interval 5 # Sample Tilt 1, upper, phi Motor sphi DMC2280 [params \ + multichan mc2\ host $dmc2280_controller2(host)\ port $dmc2280_controller2(port)\ axis A\ @@ -247,6 +259,7 @@ sphi precision 0.01 # Sample Tilt 2, lower, chi Motor schi DMC2280 [params \ + multichan mc2\ host $dmc2280_controller2(host)\ port $dmc2280_controller2(port)\ axis B\ @@ -267,6 +280,7 @@ schi precision 0.01 # Sample Trans 1, upper, y Motor sy DMC2280 [params \ + multichan mc2\ host $dmc2280_controller2(host)\ port $dmc2280_controller2(port)\ axis C\ @@ -287,6 +301,7 @@ sy precision 0.01 # Sample Trans2, lower, x Motor sx DMC2280 [params \ + multichan mc2\ host $dmc2280_controller2(host)\ port $dmc2280_controller2(port)\ axis D\ @@ -307,6 +322,7 @@ sx precision 0.01 # Sample Omega, rotate Motor som DMC2280 [params \ + multichan mc2\ host $dmc2280_controller2(host)\ port $dmc2280_controller2(port)\ axis E\ @@ -326,6 +342,7 @@ som precision 0.01 # Sample two-theta, detector rotate Motor stth DMC2280 [params \ + multichan mc2\ host $dmc2280_controller2(host)\ port $dmc2280_controller2(port)\ axis F\ @@ -348,6 +365,7 @@ stth precision 0.01 # Oscillating Collimator Translation Motor oct DMC2280 [params \ + multichan mc2\ host $dmc2280_controller2(host)\ port $dmc2280_controller2(port)\ axis G\ @@ -376,6 +394,7 @@ oct precision 0.01 # Monochromator Focusing (HOPG) #Motor mf1 DMC2280 [params \ +# multichan mc3\ # host $dmc2280_controller3(host)\ # port $dmc2280_controller3(port)\ # axis A\ @@ -396,6 +415,7 @@ oct precision 0.01 # Monochromator Focusing (Ge) Motor mf2 DMC2280 [params \ + multichan mc3\ host $dmc2280_controller3(host)\ port $dmc2280_controller3(port)\ axis A\ @@ -415,6 +435,7 @@ mf2 precision 0.01 # Slit 1, right Motor ss1r DMC2280 [params \ + multichan mc3\ host $dmc2280_controller3(host)\ port $dmc2280_controller3(port)\ axis E\ @@ -431,6 +452,7 @@ ss1r movecount $move_count # Slit 1, left Motor ss1l DMC2280 [params \ + multichan mc3\ host $dmc2280_controller3(host)\ port $dmc2280_controller3(port)\ axis F\ @@ -447,6 +469,7 @@ ss1l movecount $move_count # Slit 1, up Motor ss1u DMC2280 [params \ + multichan mc3\ host $dmc2280_controller3(host)\ port $dmc2280_controller3(port)\ axis G\ @@ -463,6 +486,7 @@ ss1u movecount $move_count # Slit 1, down Motor ss1d DMC2280 [params \ + multichan mc3\ host $dmc2280_controller3(host)\ port $dmc2280_controller3(port)\ axis H\ @@ -486,6 +510,7 @@ ss1d movecount $move_count # Slit 2, right Motor ss2r DMC2280 [params \ + multichan mc4\ host $dmc2280_controller4(host)\ port $dmc2280_controller4(port)\ axis E\ @@ -502,6 +527,7 @@ ss2r movecount $move_count # Slit 2, left Motor ss2l DMC2280 [params \ + multichan mc4\ host $dmc2280_controller4(host)\ port $dmc2280_controller4(port)\ axis F\ @@ -518,6 +544,7 @@ ss2l movecount $move_count # Slit 2, up Motor ss2u DMC2280 [params \ + multichan mc4\ host $dmc2280_controller4(host)\ port $dmc2280_controller4(port)\ axis G\ @@ -534,6 +561,7 @@ ss2u movecount $move_count # Slit 2, down Motor ss2d DMC2280 [params \ + multichan mc4\ host $dmc2280_controller4(host)\ port $dmc2280_controller4(port)\ axis H\ diff --git a/site_ansto/instrument/hrpd/config/motors/motor_configuration.tcl b/site_ansto/instrument/hrpd/config/motors/motor_configuration.tcl index 5570d374..2ca713c0 100644 --- a/site_ansto/instrument/hrpd/config/motors/motor_configuration.tcl +++ b/site_ansto/instrument/hrpd/config/motors/motor_configuration.tcl @@ -1,5 +1,5 @@ -# $Revision: 1.7 $ -# $Date: 2007-03-21 02:22:22 $ +# $Revision: 1.8 $ +# $Date: 2007-03-25 22:09:46 $ # Author: Ferdi Franceschini (ffr@ansto.gov.au) # Last revision by: $Author: dcl $ @@ -19,6 +19,11 @@ set dmc2280_controller3(port) pmc3-$animal set dmc2280_controller4(host) mc4-$animal set dmc2280_controller4(port) pmc4-$animal +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) + #Measured absolute encoder reading at home position set mphi_Home 7413209 set mchi_Home 7818834 @@ -86,6 +91,7 @@ set move_count 100 # Monochromator phi, Tilt 1, upper Motor mphi DMC2280 [params \ + multichan mc1\ host $dmc2280_controller1(host)\ port $dmc2280_controller1(port)\ axis A\ @@ -106,6 +112,7 @@ mphi precision 0.05 # Monochromator chi, Tilt 2, lower Motor mchi DMC2280 [params \ + multichan mc1\ host $dmc2280_controller1(host)\ port $dmc2280_controller1(port)\ axis B\ @@ -126,6 +133,7 @@ mchi precision 0.01 # Monochromator Trans 1, upper Motor my DMC2280 [params \ + multichan mc1\ host $dmc2280_controller1(host)\ port $dmc2280_controller1(port)\ axis C\ @@ -146,6 +154,7 @@ my precision 0.01 # Monochromator Trans 2, lower Motor mx DMC2280 [params \ + multichan mc1\ host $dmc2280_controller1(host)\ port $dmc2280_controller1(port)\ axis D\ @@ -166,6 +175,7 @@ mx precision 0.01 # Monochromator omega, rotate Motor mom DMC2280 [params \ + multichan mc1\ host $dmc2280_controller1(host)\ port $dmc2280_controller1(port)\ axis E\ @@ -186,6 +196,7 @@ mom precision 0.01 # Monochromator two-theta, flight-tube rotate Motor mtth DMC2280 [params \ + multichan mc1\ host $dmc2280_controller1(host)\ port $dmc2280_controller1(port)\ axis F\ @@ -215,6 +226,7 @@ mtth failafter 10 mtth blockage_check_interval 5 # Primary Collimator Translation X Motor pcx DMC2280 [params \ + multichan mc1\ host $dmc2280_controller1(host)\ port $dmc2280_controller1(port)\ axis G\ @@ -235,6 +247,7 @@ pcx precision 0.01 # Primary Collimator Rotation Motor pcr DMC2280 [params \ + multichan mc1\ host $dmc2280_controller1(host)\ port $dmc2280_controller1(port)\ axis H\ @@ -261,6 +274,7 @@ pcr precision 0.01 # Sample Tilt 1, upper, phi Motor sphi DMC2280 [params \ + multichan mc2\ host $dmc2280_controller2(host)\ port $dmc2280_controller2(port)\ axis A\ @@ -281,6 +295,7 @@ sphi precision 0.01 # Sample Tilt 2, lower, chi Motor schi DMC2280 [params \ + multichan mc2\ host $dmc2280_controller2(host)\ port $dmc2280_controller2(port)\ axis B\ @@ -301,6 +316,7 @@ schi precision 0.01 # Sample Trans 1, upper, y Motor sy DMC2280 [params \ + multichan mc2\ host $dmc2280_controller2(host)\ port $dmc2280_controller2(port)\ axis C\ @@ -321,6 +337,7 @@ sy precision 0.01 # Sample Trans2, lower, x Motor sx DMC2280 [params \ + multichan mc2\ host $dmc2280_controller2(host)\ port $dmc2280_controller2(port)\ axis D\ @@ -341,6 +358,7 @@ sx precision 0.01 # Sample Omega, rotate Motor som DMC2280 [params \ + multichan mc2\ host $dmc2280_controller2(host)\ port $dmc2280_controller2(port)\ axis E\ @@ -361,6 +379,7 @@ som precision 0.01 # Sample two-theta, detector rotate Motor stth DMC2280 [params \ + multichan mc2\ host $dmc2280_controller2(host)\ port $dmc2280_controller2(port)\ axis F\ @@ -391,6 +410,7 @@ stth blockage_check_interval 2 # Monochromator Focusing (Ge) #Motor mf1 DMC2280 [params \ +# multichan mc3\ # host $dmc2280_controller3(host)\ # port $dmc2280_controller3(port)\ # axis A\ @@ -409,6 +429,7 @@ stth blockage_check_interval 2 # Slit 1, right Motor ss1r DMC2280 [params \ + multichan mc3\ host $dmc2280_controller3(host)\ port $dmc2280_controller3(port)\ axis E\ @@ -425,6 +446,7 @@ ss1r movecount $move_count # Slit 1, left Motor ss1l DMC2280 [params \ + multichan mc3\ host $dmc2280_controller3(host)\ port $dmc2280_controller3(port)\ axis F\ @@ -441,6 +463,7 @@ ss1l movecount $move_count # Slit 1, up Motor ss1u DMC2280 [params \ + multichan mc3\ host $dmc2280_controller3(host)\ port $dmc2280_controller3(port)\ axis G\ @@ -457,6 +480,7 @@ ss1u movecount $move_count # Slit 1, down Motor ss1d DMC2280 [params \ + multichan mc3\ host $dmc2280_controller3(host)\ port $dmc2280_controller3(port)\ axis H\ @@ -481,6 +505,7 @@ ss1d movecount $move_count # Little is known about the Eulerian Cradle ## Eulerian-phi #Motor ephi DMC2280 [params \ +# multichan mc4\ # host $dmc2280_controller4(host)\ # port $dmc2280_controller4(port)\ # axis A\ @@ -495,6 +520,7 @@ ss1d movecount $move_count #setHomeandRange -motor ephi -home 0 -lowrange 180 -uprange 180 #Motor echi DMC2280 [params \ +# multichan mc4\ # host $dmc2280_controller4(host)\ # port $dmc2280_controller4(port)\ # axis B\ @@ -510,6 +536,7 @@ ss1d movecount $move_count # Slit 2, right Motor ss2r DMC2280 [params \ + multichan mc4\ host $dmc2280_controller4(host)\ port $dmc2280_controller4(port)\ axis E\ @@ -526,6 +553,7 @@ ss2r movecount $move_count # Slit 2, left Motor ss2l DMC2280 [params \ + multichan mc4\ host $dmc2280_controller4(host)\ port $dmc2280_controller4(port)\ axis F\ @@ -542,6 +570,7 @@ ss2l movecount $move_count # Slit 2, up Motor ss2u DMC2280 [params \ + multichan mc4\ host $dmc2280_controller4(host)\ port $dmc2280_controller4(port)\ axis G\ @@ -558,6 +587,7 @@ ss2u movecount $move_count # Slit 2, down Motor ss2d DMC2280 [params \ + multichan mc4\ host $dmc2280_controller4(host)\ port $dmc2280_controller4(port)\ axis H\