diff --git a/site_ansto/instrument/tas/config/motors/motor_configuration.tcl b/site_ansto/instrument/tas/config/motors/motor_configuration.tcl index b0f5ae89..1a723727 100644 --- a/site_ansto/instrument/tas/config/motors/motor_configuration.tcl +++ b/site_ansto/instrument/tas/config/motors/motor_configuration.tcl @@ -70,10 +70,10 @@ set slitStepRate [expr (250.0*161.0)/2.0] #Measured slit gap, in units, after homing on limit switches #ps=ss1 set ss1h_Gap 52.7 -set ss1v_Gap 142.5 +set ss1v_Gap 126.0 #pa=ss2 set ss2h_Gap 53.5 -set ss2v_Gap 213.0 +set ss2v_Gap 207.0 set ss1l_Home [expr $ss1h_Gap/2*$slitStepRate] set ss1r_Home [expr $ss1h_Gap/2*$slitStepRate] @@ -626,7 +626,7 @@ Motor ps_right $motor_driver_type [params \ axis A\ units mm\ hardlowerlim -27\ - hardupperlim -3\ + hardupperlim -2\ maxSpeed 1.4907\ maxAccel 3.0020\ maxDecel 3.0020\ @@ -635,8 +635,8 @@ Motor ps_right $motor_driver_type [params \ ps_right part slits ps_right long_name ps_right ps_right softlowerlim -27 -ps_right softupperlim -3 -ps_right home -10.0000 +ps_right softupperlim -2 +ps_right home 0.0 ps_right movecount $move_count # mc6: Pre-sample left aperture -- Slit s1 left Blade @@ -647,7 +647,7 @@ Motor ps_left $motor_driver_type [params \ axis B\ units mm\ hardlowerlim -27\ - hardupperlim -4\ + hardupperlim -2\ maxSpeed 1.4907\ maxAccel 3.0020\ maxDecel 3.0020\ @@ -656,8 +656,8 @@ Motor ps_left $motor_driver_type [params \ ps_left part slits ps_left long_name ps_left ps_left softlowerlim -27 -ps_left softupperlim -4 -ps_left home -10.0000 +ps_left softupperlim -2 +ps_left home 0.0 ps_left movecount $move_count @@ -668,7 +668,7 @@ Motor ps_top $motor_driver_type [params \ port pmc6-taipan\ axis C\ units mm\ - hardlowerlim -200\ + hardlowerlim -63\ hardupperlim -2\ maxSpeed 1.4907\ maxAccel 3.0020\ @@ -677,9 +677,9 @@ Motor ps_top $motor_driver_type [params \ motorHome $ss1t_Home] s_top part slits ps_top long_name ps_top -ps_top softlowerlim -200 +ps_top softlowerlim -63 ps_top softupperlim -2 -ps_top home -19.0000 +ps_top home 0.0 ps_top movecount $move_count # mc6: Pre-sample bottom aperture -- Slit s1 bottom Blade @@ -689,7 +689,7 @@ Motor ps_bottom $motor_driver_type [params \ port pmc6-taipan\ axis D\ units mm\ - hardlowerlim -200\ + hardlowerlim -63\ hardupperlim -2\ maxSpeed 1.4907\ maxAccel 3.0020\ @@ -698,9 +698,9 @@ Motor ps_bottom $motor_driver_type [params \ motorHome $ss1b_Home] ps_bottom part slits ps_bottom long_name ps_bottom -ps_bottom softlowerlim -200 +ps_bottom softlowerlim -63 ps_bottom softupperlim -2 -ps_bottom home -21.0000 +ps_bottom home 0.0 ps_bottom movecount $move_count # mc6: Pre-sample right aperture -- Slit s2 right Blade @@ -721,7 +721,7 @@ pa_right part slits pa_right long_name pa_right pa_right softlowerlim -26 pa_right softupperlim -2 -pa_right home -6.0000 +pa_right home 0.0 pa_right movecount $move_count # mc6: Pre-sample left aperture -- Slit s2 left Blade @@ -742,7 +742,7 @@ pa_left part slits pa_left long_name pa_left pa_left softlowerlim -26 pa_left softupperlim -2 -pa_left home -6.0000 +pa_left home 0.0 pa_left movecount $move_count # mc6: Pre-sample top aperture -- Slit s2 top Blade @@ -752,8 +752,8 @@ Motor pa_top $motor_driver_type [params \ port pmc6-taipan\ axis G\ units mm\ - hardlowerlim -200\ - hardupperlim -3\ + hardlowerlim -102\ + hardupperlim -2\ maxSpeed 1.4907\ maxAccel 3.0020\ maxDecel 3.0020\ @@ -761,9 +761,9 @@ Motor pa_top $motor_driver_type [params \ motorHome $ss2t_Home] pa_top part slits pa_top long_name pa_top -pa_top softlowerlim -200 -pa_top softupperlim -3 -pa_top home -19.0000 +pa_top softlowerlim -102 +pa_top softupperlim -2 +pa_top home 0.0 # mc6: Pre-sample bottom aperture -- Slit s2 bottom Blade Motor pa_bottom $motor_driver_type [params \ @@ -772,8 +772,8 @@ Motor pa_bottom $motor_driver_type [params \ port pmc6-taipan\ axis H\ units mm\ - hardlowerlim -200\ - hardupperlim -3\ + hardlowerlim -102\ + hardupperlim -2\ maxSpeed 1.4907\ maxAccel 3.0020\ maxDecel 3.0020\ @@ -781,9 +781,9 @@ Motor pa_bottom $motor_driver_type [params \ motorHome $ss2b_Home] pa_bottom part slits pa_bottom long_name pa_bottom -pa_bottom softlowerlim -200 -pa_bottom softupperlim -3 -pa_bottom home -16.0000 +pa_bottom softlowerlim -102 +pa_bottom softupperlim -2 +pa_bottom home 0.0000 proc motor_set_sobj_attributes {} { }