diff --git a/site_ansto/instrument/reflectometer/hipadaba_configuration.tcl b/site_ansto/instrument/reflectometer/hipadaba_configuration.tcl index d7b167ea..45707065 100644 --- a/site_ansto/instrument/reflectometer/hipadaba_configuration.tcl +++ b/site_ansto/instrument/reflectometer/hipadaba_configuration.tcl @@ -1,7 +1,7 @@ -# $Revision: 1.1 $ -# $Date: 2006-11-10 03:30:18 $ +# $Revision: 1.2 $ +# $Date: 2006-11-13 21:29:39 $ # Author: Ferdi Franceschini (ffr@ansto.gov.au) -# Last revision by: $Author: ffr $ +# Last revision by: $Author: dcl $ # Defines hashes which map motor names to arrays source hpaths.tcl @@ -48,10 +48,10 @@ makeHdbVirtMotor $motor_hpath(s4hg) s4hg s4hg makeHdbVirtMotor $motor_hpath(s4ho) s4ho s4ho makeHdbMotor $motor_hpath(st4vt) st4vt st4vt -makeHdbMotor $motor_hpath(say) say say +makeHdbMotor $motor_hpath(saz) saz saz makeHdbMotor $motor_hpath(sax) sax sax makeHdbMotor $motor_hpath(sath) sath sath makeHdbMotor $motor_hpath(saphi) saphi saphi -makeHdbMotor $motor_hpath(dsyvt) dsyvt dsyvt -makeHdbMotor $motor_hpath(deyvt) deyvt deyvt +makeHdbMotor $motor_hpath(dszvt) dszvt dszvt +makeHdbMotor $motor_hpath(dezvt) dezvt dezvt diff --git a/site_ansto/instrument/reflectometer/hpaths.tcl b/site_ansto/instrument/reflectometer/hpaths.tcl index 0419f58b..a936791b 100644 --- a/site_ansto/instrument/reflectometer/hpaths.tcl +++ b/site_ansto/instrument/reflectometer/hpaths.tcl @@ -38,9 +38,9 @@ s4vo /slits/4 \ s4hg /slits/4 \ s4ho /slits/4 \ st4vt /slits/4 \ -say /sample \ +saz /sample \ sax /sample \ sath /sample \ saphi /sample \ -dsyvt /detector \ -deyvt /detector ] +dszvt /detector \ +dezvt /detector ] diff --git a/site_ansto/instrument/reflectometer/motor_configuration.tcl b/site_ansto/instrument/reflectometer/motor_configuration.tcl index 296bf397..e18e6e29 100644 --- a/site_ansto/instrument/reflectometer/motor_configuration.tcl +++ b/site_ansto/instrument/reflectometer/motor_configuration.tcl @@ -366,7 +366,7 @@ m1ro softlowerlim -5 m1ro softupperlim 5 m1ro home 0 -Motor say DMC2280 [params \ +Motor saz DMC2280 [params \ host $dmc2280_controller2(host)\ port $dmc2280_controller2(port)\ axis D\ @@ -378,11 +378,11 @@ Motor say DMC2280 [params \ absEnc 1\ absEncHome 7500000\ cntsPerX 8192] -say hardlowerlim -600 -say hardupperlim -300 -say softlowerlim -600 -say softupperlim -300 -say home -450 +saz hardlowerlim -600 +saz hardupperlim -300 +saz softlowerlim -600 +saz softupperlim -300 +saz home -450 #Motor sax DMC2280 [params \ # host $dmc2280_controller2(host)\ @@ -438,7 +438,7 @@ saphi softlowerlim -20 saphi softupperlim 20 saphi home 0 -#Motor anyvt DMC2280 [params \ +#Motor anzvt DMC2280 [params \ # host $dmc2280_controller2(host)\ # port $dmc2280_controller2(port)\ # axis xxxx\ @@ -450,11 +450,11 @@ saphi home 0 # absEnc 1\ # absEncHome 7500000\ # cntsPerX 8192] -#anyvt hardlowerlim xxxx -#anyvt hardupperlim xxxx -#anyvt softlowerlim xxxx -#anyvt softupperlim xxxx -#anyvt home 0 +#anzvt hardlowerlim xxxx +#anzvt hardupperlim xxxx +#anzvt softlowerlim xxxx +#anzvt softupperlim xxxx +#anzvt home 0 #Motor anro DMC2280 [params \ # host $dmc2280_controller2(host)\ @@ -474,7 +474,7 @@ saphi home 0 #anro softupperlim 10 #anro home 0 -#Motor dsyvt DMC2280 [params \ +#Motor dszvt DMC2280 [params \ # host $dmc2280_controller1(host)\ # port $dmc2280_controller1(port)\ # axis A\ @@ -486,13 +486,13 @@ saphi home 0 # absEnc 1\ # absEncHome 7500000\ # cntsPerX 8192] -#dsyvt hardlowerlim xxxx -#dsyvt hardupperlim xxxx -#dsyvt softlowerlim xxxx -#dsyvt softupperlim xxxx -#dsyvt home 0 +#dszvt hardlowerlim xxxx +#dszvt hardupperlim xxxx +#dszvt softlowerlim xxxx +#dszvt softupperlim xxxx +#dszvt home 0 -Motor deyvt DMC2280 [params \ +Motor dezvt DMC2280 [params \ host $dmc2280_controller2(host)\ port $dmc2280_controller2(port)\ axis F\ @@ -504,11 +504,11 @@ Motor deyvt DMC2280 [params \ absEnc 1\ absEncHome 7500000\ cntsPerX 8192] -deyvt hardlowerlim -595 -deyvt hardupperlim 800 -deyvt softlowerlim -595 -deyvt softupperlim 800 -deyvt home 0 +dezvt hardlowerlim -595 +dezvt hardupperlim 800 +dezvt softlowerlim -595 +dezvt softupperlim 800 +dezvt home 0 #Motor dezht DMC2280 [params \ # host $dmc2280_controllerxxxx(host)\