From 30d9edb0ddc9db8060d3bee5a79f7f7fe550151a Mon Sep 17 00:00:00 2001 From: Jing Chen Date: Thu, 28 Apr 2011 10:39:23 +1000 Subject: [PATCH] update group for motors r3117 | jgn | 2011-04-28 10:39:23 +1000 (Thu, 28 Apr 2011) | 1 line --- .../config/motors/motor_configuration.tcl | 33 ++++++++--------- .../tas/config/motors/motor_configuration.tcl | 35 ++++++++++--------- 2 files changed, 33 insertions(+), 35 deletions(-) diff --git a/site_ansto/instrument/lyrebird/config/motors/motor_configuration.tcl b/site_ansto/instrument/lyrebird/config/motors/motor_configuration.tcl index 302a839e..952575bc 100644 --- a/site_ansto/instrument/lyrebird/config/motors/motor_configuration.tcl +++ b/site_ansto/instrument/lyrebird/config/motors/motor_configuration.tcl @@ -1,8 +1,5 @@ # Author: Jing Chen (jgn@ansto.gov.au) -# START MOTOR CONFIGURATION -#::utility::mkVar FastShutter text manager FastShutter false instrument true false - # SET TO 1 TO USE THE TILT STAGE ie sample phi and chi set use_tiltstage 0 @@ -130,7 +127,7 @@ Motor mtilt $motor_driver_type [params \ absEnc 1\ absEncHome $samchi_Home\ cntsPerX 4096] -mtilt part sample +mtilt part crystal mtilt long_name mtilt mtilt softlowerlim -5 mtilt softupperlim 5 @@ -152,7 +149,7 @@ Motor mtrans $motor_driver_type [params \ absEnc 1\ absEncHome $samphi_Home\ cntsPerX 4096] -mtrans part sample +mtrans part crystal mtrans long_name mtrans mtrans softlowerlim -10 mtrans softupperlim 195 @@ -197,7 +194,7 @@ Motor a2 $motor_driver_type [params \ absEnc 1\ absEncHome $samy_Home\ cntsPerX 4096] -a2 part sample +a2 part detector a2 long_name a2 a2 softlowerlim -55 a2 softupperlim 55 @@ -396,7 +393,7 @@ Motor mvfocus $motor_driver_type [params \ absEnc 1\ absEncHome $samthet_Home\ cntsPerX 4096] -mvfocus part sample +mvfocus part crystal mvfocus long_name mvfocus mvfocus softlowerlim 0 mvfocus softupperlim 240 @@ -418,7 +415,7 @@ Motor mhfocus $motor_driver_type [params \ absEnc 1\ absEncHome $samthet_Home\ cntsPerX 4096] -mhfocus part sample +mhfocus part crystal mhfocus long_name mhfocus mhfocus softlowerlim 0 mhfocus softupperlim 240 @@ -440,7 +437,7 @@ Motor m1 $motor_driver_type [params \ absEnc 1\ absEncHome $samthet_Home\ cntsPerX 4096] -m1 part sample +m1 part crystal m1 long_name m1 m1 softlowerlim 5 m1 softupperlim 40 @@ -594,7 +591,7 @@ Motor collimator $motor_driver_type [params \ absEnc 1\ absEncHome $samthet_Home\ cntsPerX 4096] -mfilter part sample +mfilter part collimator mfilter long_name collimator mfilter softlowerlim -112 mfilter softupperlim 112 @@ -616,7 +613,7 @@ Motor ps_right $motor_driver_type [params \ absEnc 1\ absEncHome $samthet_Home\ cntsPerX 4096] -ps_right part sample +ps_right part slits ps_right long_name ps_right ps_right softlowerlim -27 ps_right softupperlim -2 @@ -638,7 +635,7 @@ Motor ps_left $motor_driver_type [params \ absEnc 1\ absEncHome $samthet_Home\ cntsPerX 4096] -ps_left part sample +ps_left part slits ps_left long_name ps_left ps_left softlowerlim -27 ps_left softupperlim -2 @@ -660,7 +657,7 @@ Motor ps_top $motor_driver_type [params \ absEnc 1\ absEncHome $samthet_Home\ cntsPerX 4096] -ps_top part sample +ps_top part slits ps_top long_name ps_top ps_top softlowerlim -200 ps_top softupperlim -2 @@ -682,7 +679,7 @@ Motor ps_bottom $motor_driver_type [params \ absEnc 1\ absEncHome $samthet_Home\ cntsPerX 4096] -ps_bottom part sample +ps_bottom part slits ps_bottom long_name ps_bottom ps_bottom softlowerlim -200 ps_bottom softupperlim -2 @@ -704,7 +701,7 @@ Motor pa_right $motor_driver_type [params \ absEnc 1\ absEncHome $samthet_Home\ cntsPerX 4096] -pa_right part sample +pa_right part slits pa_right long_name pa_right pa_right softlowerlim -26 pa_right softupperlim 2 @@ -726,7 +723,7 @@ Motor pa_left $motor_driver_type [params \ absEnc 1\ absEncHome $samthet_Home\ cntsPerX 4096] -pa_left part sample +pa_left part slits pa_left long_name pa_left pa_left softlowerlim -26 pa_left softupperlim 2 @@ -748,7 +745,7 @@ Motor pa_top $motor_driver_type [params \ absEnc 1\ absEncHome $samthet_Home\ cntsPerX 4096] -pa_left part sample +pa_left part slits pa_left long_name pa_top pa_left softlowerlim -200 pa_left softupperlim 0 @@ -770,7 +767,7 @@ Motor pa_bottom $motor_driver_type [params \ absEnc 1\ absEncHome $samthet_Home\ cntsPerX 4096] -pa_bottom part sample +pa_bottom part slits pa_bottom long_name pa_bottom pa_bottom softlowerlim -200 pa_bottom softupperlim 0 diff --git a/site_ansto/instrument/tas/config/motors/motor_configuration.tcl b/site_ansto/instrument/tas/config/motors/motor_configuration.tcl index 5231e4a5..e3abe3b0 100644 --- a/site_ansto/instrument/tas/config/motors/motor_configuration.tcl +++ b/site_ansto/instrument/tas/config/motors/motor_configuration.tcl @@ -1,7 +1,8 @@ # Author: Jing Chen (jgn@ansto.gov.au) # START MOTOR CONFIGURATION -::utility::mkVar FastShutter text manager FastShutter false instrument true false +# FastShutter is currently set on Quokka only +#::utility::mkVar FastShutter text manager FastShutter false instrument true false # SET TO 1 TO USE THE TILT STAGE ie sample phi and chi set use_tiltstage 0 @@ -115,7 +116,7 @@ Motor mtilt $motor_driver_type [params \ absEnc 1\ absEncHome $samchi_Home\ cntsPerX 4096] -mtilt part sample +mtilt part crystal mtilt long_name mtilt mtilt softlowerlim -5 mtilt softupperlim 5 @@ -140,7 +141,7 @@ Motor mtrans $motor_driver_type [params \ absEnc 1\ absEncHome $samphi_Home\ cntsPerX 4096] -mtrans part sample +mtrans part crystal mtrans long_name mtrans mtrans softlowerlim -10 mtrans softupperlim 195 @@ -184,7 +185,7 @@ Motor a2 $motor_driver_type [params \ absEnc 1\ absEncHome $samy_Home\ cntsPerX 4096] -a2 part sample +a2 part detector a2 long_name a2 a2 softlowerlim -55 a2 softupperlim 55 @@ -324,7 +325,7 @@ Motor s2 $motor_driver_type [params \ absEnc 1\ absEncHome $samthet_Home\ cntsPerX 4096] -s2 part sample +s2 part detector s2 long_name s2 s2 softlowerlim -128 s2 softupperlim 3 @@ -390,7 +391,7 @@ Motor mvfocus $motor_driver_type [params \ absEnc 1\ absEncHome $samthet_Home\ cntsPerX 4096] -mvfocus part sample +mvfocus part crystal mvfocus long_name mvfocus mvfocus softlowerlim 0 mvfocus softupperlim 240 @@ -412,7 +413,7 @@ Motor mhfocus $motor_driver_type [params \ absEnc 1\ absEncHome $samthet_Home\ cntsPerX 4096] -mhfocus part sample +mhfocus part crystal mhfocus long_name mhfocus mhfocus softlowerlim 0 mhfocus softupperlim 240 @@ -434,7 +435,7 @@ Motor m1 $motor_driver_type [params \ absEnc 1\ absEncHome $samthet_Home\ cntsPerX 4096] -m1 part sample +m1 part crystal m1 long_name m1 m1 softlowerlim 5 m1 softupperlim 40 @@ -588,7 +589,7 @@ Motor collimator $motor_driver_type [params \ absEnc 1\ absEncHome $samthet_Home\ cntsPerX 4096] -mfilter part sample +mfilter part collimator mfilter long_name collimator mfilter softlowerlim -112 mfilter softupperlim 112 @@ -610,7 +611,7 @@ Motor ps_right $motor_driver_type [params \ absEnc 1\ absEncHome $samthet_Home\ cntsPerX 4096] -ps_right part sample +ps_right part slits ps_right long_name ps_right ps_right softlowerlim -27 ps_right softupperlim -2 @@ -632,7 +633,7 @@ Motor ps_left $motor_driver_type [params \ absEnc 1\ absEncHome $samthet_Home\ cntsPerX 4096] -ps_left part sample +ps_left part slits ps_left long_name ps_left ps_left softlowerlim -27 ps_left softupperlim -2 @@ -654,7 +655,7 @@ Motor ps_top $motor_driver_type [params \ absEnc 1\ absEncHome $samthet_Home\ cntsPerX 4096] -ps_top part sample +ps_top part slits ps_top long_name ps_top ps_top softlowerlim -200 ps_top softupperlim -2 @@ -676,7 +677,7 @@ Motor ps_bottom $motor_driver_type [params \ absEnc 1\ absEncHome $samthet_Home\ cntsPerX 4096] -ps_bottom part sample +ps_bottom part slits ps_bottom long_name ps_bottom ps_bottom softlowerlim -200 ps_bottom softupperlim -2 @@ -698,7 +699,7 @@ Motor pa_right $motor_driver_type [params \ absEnc 1\ absEncHome $samthet_Home\ cntsPerX 4096] -pa_right part sample +pa_right part slits pa_right long_name pa_right pa_right softlowerlim -26 pa_right softupperlim 2 @@ -720,7 +721,7 @@ Motor pa_left $motor_driver_type [params \ absEnc 1\ absEncHome $samthet_Home\ cntsPerX 4096] -pa_left part sample +pa_left part slits pa_left long_name pa_left pa_left softlowerlim -26 pa_left softupperlim 2 @@ -742,7 +743,7 @@ Motor pa_top $motor_driver_type [params \ absEnc 1\ absEncHome $samthet_Home\ cntsPerX 4096] -pa_left part sample +pa_left part slits pa_left long_name pa_top pa_left softlowerlim -200 pa_left softupperlim 0 @@ -764,7 +765,7 @@ Motor pa_bottom $motor_driver_type [params \ absEnc 1\ absEncHome $samthet_Home\ cntsPerX 4096] -pa_bottom part sample +pa_bottom part slits pa_bottom long_name pa_bottom pa_bottom softlowerlim -200 pa_bottom softupperlim 0