diff --git a/site_ansto/instrument/rsd/config/motors/motor_configuration.tcl b/site_ansto/instrument/rsd/config/motors/motor_configuration.tcl index ae13b712..fa55a7b8 100644 --- a/site_ansto/instrument/rsd/config/motors/motor_configuration.tcl +++ b/site_ansto/instrument/rsd/config/motors/motor_configuration.tcl @@ -1,5 +1,5 @@ -# $Revision: 1.22 $ -# $Date: 2008-05-12 01:06:54 $ +# $Revision: 1.23 $ +# $Date: 2008-05-29 04:55:49 $ # Author: Ferdi Franceschini (ffr@ansto.gov.au) # Last revision by: $Author: dcl $ @@ -62,8 +62,8 @@ set sx_Home 9067806 set sy_Home 18782188 set som_Home 23164850 -set stth_Home 28686300 -set mf1_Home 7500000 +#set stth_Home 28686300 +set stth_Home 29446192 #set psho_home 542093 set psho_home 7576691 @@ -381,17 +381,17 @@ Motor stth $motor_driver_type [params \ asyncqueue mc2\ axis F\ units degrees\ - hardlowerlim -120\ - hardupperlim 30\ + hardlowerlim -90\ + hardupperlim 120\ maxSpeed 0.5\ maxAccel 0.1\ maxDecel 0.1\ - stepsPerX 125000\ + stepsPerX 25000\ absEnc 1\ absEncHome $stth_Home\ - cntsPerX -93207] -stth softlowerlim -120 -stth softupperlim 30 + cntsPerX -8192] +stth softlowerlim -90 +stth softupperlim 120 stth home 0 stth speed 0.5 stth movecount $move_count @@ -408,25 +408,28 @@ stth long_name azimuthal_angle # # Monochromator Focusing (HOPG) -#Motor mf1 $motor_driver_type [params \ -# asyncqueue mc3\ -# axis A\ -# units degrees\ -# hardlowerlim xxxx\ -# hardupperlim xxxx\ -# maxSpeed xxxx\ -# maxAccel xxxx\ -# maxDecel xxxx\ -# stepsPerX xxxx\ -# absEnc 1\ -# absEncHome $mf1_Home\ -# cntsPerX xxxx] -#setHomeandRange -motor mf1 -home 0 -lowrange 0 -uprange 360 -#mf1 speed 1 -#mfl movecount $move_count -#mf1 precision 0.01 -#mf1 part monochromator -#mf1 long_name mf1 +Motor mf1 $motor_driver_type [params \ + asyncqueue mc3\ + axis A\ + units degrees\ + hardlowerlim 0\ + hardupperlim 1\ + maxSpeed 1\ + maxAccel 1\ + maxDecel 1\ + stepsPerX 1000000\ + absEnc 1\ + absEncHome 0\ + bias_bias -4200\ + bias_bits 14\ + cntsPerX 10000] +setHomeandRange -motor mf1 -home 0 -lowrange 0 -uprange 1 +mf1 speed 0.1 +mf1 movecount $move_count +mf1 precision 0.01 +mf1 part monochromator.focus +mf1 long_name horizontal +mf1 creep_offset 1 # Monochromator Focusing (Ge) Motor mf2 $motor_driver_type [params \ @@ -438,15 +441,19 @@ Motor mf2 $motor_driver_type [params \ maxSpeed 1\ maxAccel 1\ maxDecel 1\ - stepsPerX 25000\ + stepsPerX -1000000\ absEnc 1\ - absEncHome 1400\ - cntsPerX 14600] + absEncHome 0\ + bias_bias -4000\ + bias_bits 14\ + cntsPerX 12000] setHomeandRange -motor mf2 -home 0 -lowrange 0 -uprange 1 mf2 speed 0.1 +mf2 movecount $move_count mf2 precision 0.01 -mf2 part monochromator -mf2 long_name mf2 +mf2 part monochromator.focus +mf2 long_name vertical +mf2 creep_offset 1 ## Eulerian-chi #Motor echi $motor_driver_type [params \ @@ -655,4 +662,33 @@ sicslist setatt sth long_name half_azimuthal_angle proc motor_set_sobj_attributes {} { } + +#-------------------------------------------------------- + +proc psgg {} { return [expr [SplitReply [psw]]] } +proc psgs {val} { + set offset [expr ([SplitReply [psho]] + [SplitReply [psw]])/2.0] + set psw_pos [expr $offset - ($val/2.0)] + set psho_pos [expr $offset + ($val/2.0)] + return "psw=$psw_pos,psho=$psho_pos" +} +publish psgg user +publish psgs user +MakeConfigurableMotor psg +psg readscript psgg +psg drivescript psgs + +proc ssgg {} { return [expr [SplitReply [ssw]]] } +proc ssgs {val} { + set offset [expr ([SplitReply [ssho]] + [SplitReply [ssw]])/2.0] + set ssw_pos [expr $offset - ($val/2.0)] + set ssho_pos [expr $offset + ($val/2.0)] + return "ssw=$ssw_pos,ssho=$ssho_pos" +} +MakeConfigurableMotor ssg +ssg readscript ssgg +ssg drivescript ssgs +publish ssgg user +publish ssgs user + # END MOTOR CONFIGURATION