diff --git a/site_ansto/instrument/emu/config/motors/Emu_motion_control_commissioning_checklist.csv b/site_ansto/instrument/emu/config/motors/Emu_motion_control_commissioning_checklist.csv index 4a926912..a9fcacef 100755 --- a/site_ansto/instrument/emu/config/motors/Emu_motion_control_commissioning_checklist.csv +++ b/site_ansto/instrument/emu/config/motors/Emu_motion_control_commissioning_checklist.csv @@ -1,3 +1,21 @@ +chom_absenchome,222114 +chom_axis,F +chom_axis_number,14 +chom_cnts_per_x,8192 +chom_description,2nd Reflector rotation +chom_dflt_accel_steps,25000 +chom_dflt_decel_steps,25000 +chom_dflt_speed_steps,100000 +chom_fwd_enc_lim,293114 +chom_home,20.8 +chom_maxaccel,0.4 +chom_maxdecel,0.4 +chom_maxspeed,0.4 +chom_mc,mc2 +chom_part,NXdisk_chopper +chom_rev_enc_lim,23251 +chom_steps_per_x,500000 +chom_units,degrees mchi_absenchome,4196137 mchi_axis,A mchi_axis_number,1 @@ -12,7 +30,7 @@ mchi_maxaccel,0.1 mchi_maxdecel,0.1 mchi_maxspeed,0.1 mchi_mc,mc1 -mchi_part,instrument +mchi_part,crystal mchi_rev_enc_lim,4210266 mchi_steps_per_x,500000 mchi_units,degrees @@ -30,28 +48,10 @@ mom_maxaccel,0.1 mom_maxdecel,0.1 mom_maxspeed,0.1 mom_mc,mc2 -mom_part,instrument +mom_part,crystal mom_rev_enc_lim,20287178 mom_steps_per_x,500000 mom_units,degrees -mtth_absenchome,222114 -mtth_axis,F -mtth_axis_number,14 -mtth_cnts_per_x,8192 -mtth_description,2nd Reflector rotation -mtth_dflt_accel_steps,25000 -mtth_dflt_decel_steps,25000 -mtth_dflt_speed_steps,100000 -mtth_fwd_enc_lim,293114 -mtth_home,20.8 -mtth_maxaccel,0.4 -mtth_maxdecel,0.4 -mtth_maxspeed,0.4 -mtth_mc,mc2 -mtth_part,instrument -mtth_rev_enc_lim,23251 -mtth_steps_per_x,500000 -mtth_units,degrees my_axis,B my_axis_number,2 my_cnts_per_x,-10241 @@ -64,7 +64,7 @@ my_maxaccel,0.4 my_maxdecel,0.4 my_maxspeed,0.4 my_mc,mc1 -my_part,instrument +my_part,crystal my_rev_enc_lim,4275488 my_steps_per_x,125000 my_units,mm diff --git a/site_ansto/instrument/emu/config/motors/generated_motor_configuration.tcl b/site_ansto/instrument/emu/config/motors/generated_motor_configuration.tcl index 8095d6d2..0226dbc5 100644 --- a/site_ansto/instrument/emu/config/motors/generated_motor_configuration.tcl +++ b/site_ansto/instrument/emu/config/motors/generated_motor_configuration.tcl @@ -37,6 +37,31 @@ if {$sim_mode == false} { MakeAsyncQueue mc2 DMC2280 [dict get $::MOTOR_HOSTPORT MC2 HOST] [dict get $::MOTOR_HOSTPORT MC2 PORT] } +# chom configuration +# 2nd Reflector rotation +# Axis number 14 +Motor chom $motor_driver_type [params\ + asyncqueue mc2\ + axis F\ + units $chom_units\ + hardlowerlim $chom_rev_lim\ + hardupperlim $chom_fwd_lim\ + maxSpeed $chom_maxspeed\ + maxAccel $chom_maxaccel\ + maxDecel $chom_maxdecel\ + stepsPerX $chom_steps_per_x\ + absEnc 1\ + absEncHome $chom_absenchome\ + cntsPerX $chom_cnts_per_x] +chom softlowerlim $chom_rev_lim +chom softupperlim $chom_fwd_lim +chom home $chom_home +chom part $chom_part +chom long_name chom +chom speed $chom_speed +chom accel $chom_accel +chom decel $chom_decel + # mchi configuration # Pre Mono Tilt # Axis number 1 @@ -87,31 +112,6 @@ mom speed $mom_speed mom accel $mom_accel mom decel $mom_decel -# mtth configuration -# 2nd Reflector rotation -# Axis number 14 -Motor mtth $motor_driver_type [params\ - asyncqueue mc2\ - axis F\ - units $mtth_units\ - hardlowerlim $mtth_rev_lim\ - hardupperlim $mtth_fwd_lim\ - maxSpeed $mtth_maxspeed\ - maxAccel $mtth_maxaccel\ - maxDecel $mtth_maxdecel\ - stepsPerX $mtth_steps_per_x\ - absEnc 1\ - absEncHome $mtth_absenchome\ - cntsPerX $mtth_cnts_per_x] -mtth softlowerlim $mtth_rev_lim -mtth softupperlim $mtth_fwd_lim -mtth home $mtth_home -mtth part $mtth_part -mtth long_name mtth -mtth speed $mtth_speed -mtth accel $mtth_accel -mtth decel $mtth_decel - # my configuration # Pre Mono Translation # Axis number 2 diff --git a/site_ansto/instrument/emu/config/motors/sicsmot_attlist.csv b/site_ansto/instrument/emu/config/motors/sicsmot_attlist.csv index 753335e4..45e60f6a 100644 --- a/site_ansto/instrument/emu/config/motors/sicsmot_attlist.csv +++ b/site_ansto/instrument/emu/config/motors/sicsmot_attlist.csv @@ -1,3 +1,8 @@ +chom_accel,0.0500 +chom_decel,0.0500 +chom_fwd_lim,29.4670 +chom_rev_lim,-3.4753 +chom_speed,0.2000 mchi_accel,0.1000 mchi_decel,0.1000 mchi_fwd_lim,7.1735 @@ -8,11 +13,6 @@ mom_decel,0.1000 mom_fwd_lim,26.6799 mom_rev_lim,15.7744 mom_speed,0.1000 -mtth_accel,0.0500 -mtth_decel,0.0500 -mtth_fwd_lim,29.4670 -mtth_rev_lim,-3.4753 -mtth_speed,0.2000 my_absenchome,4275488.0000 my_accel,0.4000 my_decel,0.4000