From 0ba5045fd9a787856170ac9288f28e4338559b3e Mon Sep 17 00:00:00 2001
From: Ferdi Franceschini <ffr@ansto.gov.au>
Date: Wed, 17 Sep 2014 07:47:17 +1000
Subject: [PATCH] Update motor configuration from ics1-taipan. Also put off
 renaming s1 to ms1 for magnet config.  We need to make sure that there is a
 sample/s1 link to sample/ms1 and use ms1 in tasub.

---
 .../tas/config/motors/motor_configuration.tcl      | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/site_ansto/instrument/tas/config/motors/motor_configuration.tcl b/site_ansto/instrument/tas/config/motors/motor_configuration.tcl
index a63341d2..6e89389b 100644
--- a/site_ansto/instrument/tas/config/motors/motor_configuration.tcl
+++ b/site_ansto/instrument/tas/config/motors/motor_configuration.tcl
@@ -113,12 +113,14 @@ if { [ info exists ::config_dict ] } {
 switch $axis_config {
   0 {
     set use_normal_config "true"
+    set tilt_motor_driver_type $motor_driver_type
   }
   1 {
-    set magmot "ms1"
+    set magmot s1
     set magmot_aq "mc2"
     set magmot_axis "A"
     set use_normal_config "false"
+    set tilt_motor_driver_type asim
     fileeval $cfPath(motors)/magnet_configuration.tcl
   }
 }
@@ -183,7 +185,7 @@ Motor mtilt $motor_driver_type [params \
   maxDecel 1\
   stepsPerX 25000\
   absEnc 1\
-  absEncHome 79650\
+  absEncHome 27115\
   cntsPerX 4096]
 mtilt part crystal
 mtilt long_name mtilt
@@ -206,7 +208,7 @@ Motor mtrans $motor_driver_type [params \
   maxDecel 1\
   stepsPerX 25000\
   absEnc 1\
-  absEncHome 469388\
+  absEncHome 859242\
   cntsPerX 4096]
 mtrans part crystal
 mtrans long_name mtrans
@@ -534,7 +536,7 @@ Motor mhfocus $motor_driver_type [params \
   maxSpeed 3.6\
   maxAccel 1.728\
   maxDecel 1.728\
-  stepsPerX [expr 25000.0 * 50.0 / 360.0]\
+  stepsPerX [expr -25000.0 * 50.0 / 360.0]\
   absEnc 1\
   bias_bits 12\
   bias_bias 1540\
@@ -564,13 +566,13 @@ Motor m1 $motor_driver_type [params \
   maxDecel 0.25\
   stepsPerX 100000\
   absEnc 1\
-  absEncHome 16323070\
+  absEncHome 16189898\
   cntsPerX -2048]
 m1 part crystal
 m1 long_name m1
 m1 softlowerlim 5
 m1 softupperlim 40
-m1 home 20.45933
+m1 home 0
 m1 backlash_offset -1.0
 
 # mc4: Analyzer Tilt 1 -- Two-theta Angle