diff --git a/site_ansto/instrument/pelican/config/motors/motor_configuration.tcl b/site_ansto/instrument/pelican/config/motors/motor_configuration.tcl index 626e601b..33938b0d 100644 --- a/site_ansto/instrument/pelican/config/motors/motor_configuration.tcl +++ b/site_ansto/instrument/pelican/config/motors/motor_configuration.tcl @@ -19,8 +19,8 @@ set dmc2280_controller3(port) pmc3-$animal set dmc2280_controller4(host) mc4-$animal set dmc2280_controller4(port) pmc4-$animal -set dmc2280_controller6(host) mc6-$animal -set dmc2280_controller6(port) pmc6-$animal +set dmc2280_controller5(host) mc5-$animal +set dmc2280_controller5(port) pmc5-$animal if {$sim_mode == "true"} { set motor_driver_type asim @@ -583,11 +583,11 @@ mfilter softlowerlim -112 mfilter softupperlim 112 mfilter home 0 -# mc6: Pre-sample right aperture -- Slit s1 right Blade +# mc5: Pre-sample right aperture -- Slit s1 right Blade Motor ps_right $motor_driver_type [params \ - asyncqueue mc6\ - host mc6-pelican\ - port pmc6-pelican\ + asyncqueue mc5\ + host mc5-pelican\ + port pmc5-pelican\ axis A\ units mm\ hardlowerlim -27\ @@ -605,11 +605,11 @@ ps_right softlowerlim -27 ps_right softupperlim -2 ps_right home 0 -# mc6: Pre-sample left aperture -- Slit s1 left Blade +# mc5: Pre-sample left aperture -- Slit s1 left Blade Motor ps_left $motor_driver_type [params \ - asyncqueue mc6\ - host mc6-pelican\ - port pmc6-pelican\ + asyncqueue mc5\ + host mc5-pelican\ + port pmc5-pelican\ axis B\ units mm\ hardlowerlim -27\ @@ -627,11 +627,11 @@ ps_left softlowerlim -27 ps_left softupperlim -2 ps_left home 0 -# mc6: Pre-sample top aperture -- Slit s1 top Blade +# mc5: Pre-sample top aperture -- Slit s1 top Blade Motor ps_top $motor_driver_type [params \ - asyncqueue mc6\ - host mc6-pelican\ - port pmc6-pelican\ + asyncqueue mc5\ + host mc5-pelican\ + port pmc5-pelican\ axis C\ units mm\ hardlowerlim -200\ @@ -649,11 +649,11 @@ ps_top softlowerlim -200 ps_top softupperlim -2 ps_top home 0 -# mc6: Pre-sample bottom aperture -- Slit s1 bottom Blade +# mc5: Pre-sample bottom aperture -- Slit s1 bottom Blade Motor ps_bottom $motor_driver_type [params \ - asyncqueue mc6\ - host mc6-pelican\ - port pmc6-pelican\ + asyncqueue mc5\ + host mc5-pelican\ + port pmc5-pelican\ axis D\ units mm\ hardlowerlim -200\ @@ -671,11 +671,11 @@ ps_bottom softlowerlim -200 ps_bottom softupperlim -2 ps_bottom home 0 -# mc6: Pre-sample right aperture -- Slit s2 right Blade +# mc5: Pre-sample right aperture -- Slit s2 right Blade Motor pa_right $motor_driver_type [params \ - asyncqueue mc6\ - host mc6-pelican\ - port pmc6-pelican\ + asyncqueue mc5\ + host mc5-pelican\ + port pmc5-pelican\ axis E\ units mm\ hardlowerlim -26\ @@ -693,11 +693,11 @@ pa_right softlowerlim -26 pa_right softupperlim 2 pa_right home 0 -# mc6: Pre-sample left aperture -- Slit s2 left Blade +# mc5: Pre-sample left aperture -- Slit s2 left Blade Motor pa_left $motor_driver_type [params \ - asyncqueue mc6\ - host mc6-pelican\ - port pmc6-pelican\ + asyncqueue mc5\ + host mc5-pelican\ + port pmc5-pelican\ axis F\ units mm\ hardlowerlim -26\ @@ -715,11 +715,11 @@ pa_left softlowerlim -26 pa_left softupperlim 2 pa_left home 0 -# mc6: Pre-sample top aperture -- Slit s2 top Blade +# mc5: Pre-sample top aperture -- Slit s2 top Blade Motor pa_top $motor_driver_type [params \ - asyncqueue mc6\ - host mc6-pelican\ - port pmc6-pelican\ + asyncqueue mc5\ + host mc5-pelican\ + port pmc5-pelican\ axis G\ units mm\ hardlowerlim -200\ @@ -737,11 +737,11 @@ pa_left softlowerlim -200 pa_left softupperlim 0 pa_left home 0 -# mc6: Pre-sample bottom aperture -- Slit s2 bottom Blade +# mc5: Pre-sample bottom aperture -- Slit s2 bottom Blade Motor pa_bottom $motor_driver_type [params \ - asyncqueue mc6\ - host mc6-pelican\ - port pmc6-pelican\ + asyncqueue mc5\ + host mc5-pelican\ + port pmc5-pelican\ axis H\ units mm\ hardlowerlim -200\ diff --git a/site_ansto/instrument/pelican/config/motors/positmotor_configuration.tcl b/site_ansto/instrument/pelican/config/motors/positmotor_configuration.tcl index 95a418a9..3f958a30 100644 --- a/site_ansto/instrument/pelican/config/motors/positmotor_configuration.tcl +++ b/site_ansto/instrument/pelican/config/motors/positmotor_configuration.tcl @@ -6,11 +6,13 @@ set port1 [portnum pmc1-pelican] set port2 [portnum pmc2-pelican] set port3 [portnum pmc3-pelican] set port4 [portnum pmc4-pelican] +set port5 [portnum pmc5-pelican] makesctcontroller sct_mc1 std mc1-pelican:$port1 makesctcontroller sct_mc2 std mc2-pelican:$port2 makesctcontroller sct_mc3 std mc3-pelican:$port3 makesctcontroller sct_mc4 std mc4-pelican:$port4 +makesctcontroller sct_mc5 std mc5-pelican:$port5 # label pos #index position