From 58f23cc91dc3dfc91093a20a420f50b1c61b68bd Mon Sep 17 00:00:00 2001 From: Ferdi Franceschini Date: Fri, 13 Jun 2014 08:52:26 +1000 Subject: [PATCH] Motor configuration updates from Bilby motion control spreadsheets. --- ...ilby_motion_control_commissioning_checklist.csv | 14 ++++++++------ .../bilby/config/motors/sicsmot_attlist.csv | 12 +++++------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/site_ansto/instrument/bilby/config/motors/Bilby_motion_control_commissioning_checklist.csv b/site_ansto/instrument/bilby/config/motors/Bilby_motion_control_commissioning_checklist.csv index bda9eb31..a8e68453 100755 --- a/site_ansto/instrument/bilby/config/motors/Bilby_motion_control_commissioning_checklist.csv +++ b/site_ansto/instrument/bilby/config/motors/Bilby_motion_control_commissioning_checklist.csv @@ -231,14 +231,14 @@ curtaindet_description,CURTAIN DETECTOR CARRIAGE Y TRANS curtaindet_dflt_accel_steps,10000 curtaindet_dflt_decel_steps,10000 curtaindet_dflt_speed_steps,150000 -curtaindet_fwd_enc_lim,13683594 +curtaindet_fwd_enc_lim,13669085 curtaindet_home,8528.7 curtaindet_maxaccel,38.6657557364898 curtaindet_maxdecel,38.6657557364898 curtaindet_maxspeed,38.6657557364898 curtaindet_mc,mc8 curtaindet_part,detector -curtaindet_rev_enc_lim,5958431.48151552 +curtaindet_rev_enc_lim,5978770 curtaindet_steps_per_x,-3879.40173786495 curtaindet_units,mm curtainl_absenchome,17511203 @@ -324,7 +324,7 @@ det_description,CURTAIN DETECTOR CARRIAGE Y TRANS det_dflt_accel_steps,10000 det_dflt_decel_steps,10000 det_dflt_speed_steps,150000 -det_fwd_enc_lim,9404909.51848448 +det_fwd_enc_lim,9370061 det_home,18400.4 det_maxaccel,38.6657557364898 det_maxdecel,38.6657557364898 @@ -530,6 +530,7 @@ samz_part,sample samz_rev_enc_lim,755970 samz_steps_per_x,200000 samz_units,mm +som_absenchome,33286381 som_axis,C som_axis_number,35 som_cnts_per_x,66.3703703703704 @@ -537,14 +538,15 @@ som_description,SAMPLE ROTATION som_dflt_accel_steps,50000 som_dflt_decel_steps,50000 som_dflt_speed_steps,150000 -som_fwd_enc_lim,33286183 +som_fwd_enc_lim,33286248 +som_home,0 som_maxaccel,3.85714285714286 som_maxdecel,3.85714285714286 som_maxspeed,3.85714285714286 som_mc,mc5 som_part,sample -som_rev_enc_lim,33309055 -som_steps_per_x,38888.8888888889 +som_rev_enc_lim,33308987 +som_steps_per_x,-38888.8888888889 som_units,degrees ss1d_axis,D ss1d_axis_number,20 diff --git a/site_ansto/instrument/bilby/config/motors/sicsmot_attlist.csv b/site_ansto/instrument/bilby/config/motors/sicsmot_attlist.csv index 9a47f181..519e06c3 100644 --- a/site_ansto/instrument/bilby/config/motors/sicsmot_attlist.csv +++ b/site_ansto/instrument/bilby/config/motors/sicsmot_attlist.csv @@ -75,8 +75,8 @@ curtaind_rev_lim,46.8039 curtaind_speed,1.5000 curtaindet_accel,2.5777 curtaindet_decel,2.5777 -curtaindet_fwd_lim,15424.5122 -curtaindet_rev_lim,611.6986 +curtaindet_fwd_lim,15385.5136 +curtaindet_rev_lim,639.5193 curtaindet_speed,38.6658 curtainl_accel,0.2500 curtainl_decel,0.2500 @@ -103,7 +103,7 @@ cutoff_speed,1.3333 det_accel,2.5777 det_decel,2.5777 det_fwd_lim,18399.5122 -det_rev_lim,3586.6986 +det_rev_lim,3653.5198 det_speed,38.6658 pc1_absenchome,3902.0000 pc1_accel,0.3333 @@ -178,12 +178,10 @@ samz_fwd_lim,-501.0043 samz_home,0.0000 samz_rev_lim,0.0000 samz_speed,1.0000 -som_absenchome,33309055.0000 som_accel,1.2857 som_decel,1.2857 -som_fwd_lim,-344.6116 -som_home,0.0000 -som_rev_lim,0.0000 +som_fwd_lim,340.6038 +som_rev_lim,-2.0039 som_speed,3.8571 ss1d_absenchome,33398312.0000 ss1d_accel,0.5000