Pullback from Wombat 2015-02-19

site_ansto/instrument/hipd/config/motors/euler_configuration.tcl

@@ -56,20 +56,20 @@ Motor ephi $motor_driver_type [params \
   asyncqueue mc2\
   axis C\
   units degrees\
-  hardlowerlim -185\
-  hardupperlim 185\
+  hardlowerlim -365\
+  hardupperlim 365\
   maxSpeed 5\
   maxAccel 5\
-  maxDecel 1\
+  maxDecel 5\
   stepsPerX -12500\
   absEnc 1\
   absEncHome $ephi_Home\
   cntsPerX -4096]
-setHomeandRange -motor ephi -home 0 -lowrange 180 -uprange 180
-ephi softlowerlim -180
-ephi softupperlim 180
+setHomeandRange -motor ephi -home 0 -lowrange -360 -uprange 360
+ephi softlowerlim -360
+ephi softupperlim 360
 ephi home 0
-ephi speed 1
+ephi speed 3
 ephi movecount $move_count
 ephi precision 0.01
 ephi part sample

site_ansto/instrument/hipd/config/motors/motor_configuration.tcl

@@ -24,8 +24,9 @@ if {$sim_mode == "true"} {
 #set mx_Home 23263535
 set mx_Home 8390583
 #set mom_Home 9274794
-#set mom_Home 8391038
-set mom_Home 8147038
+##set mom_Home 8391038
+#set mom_Home 8147038
+set mom_Home 7979102 
 set mtth_Home 19927837
 #set mphi_Home 7613516
 #set mphi_Home 27847793
@@ -33,6 +34,7 @@ set mphi_Home 8384818
 #set mchi_Home 9050090
 #set mchi_Home 25561619
 set mchi_Home 8389526
+#set mchi_Home 6847710
 #set my_Home 6767221
 set my_Home 8378212
 set som_Home 17214054
@@ -342,7 +344,7 @@ Motor $sample_stage_rotate $motor_driver_type [params \
   asyncqueue mc2\
   axis E\
   units degrees\
-  hardlowerlim -71\
+  hardlowerlim -121\
   hardupperlim 116\
   maxSpeed 5\
   maxAccel 3\
@@ -362,8 +364,10 @@ Motor stth $motor_driver_type [params \
   asyncqueue mc2\
   axis F\
   units degrees\
-  hardlowerlim 15.8\
+  hardlowerlim 13\
   hardupperlim 29.7\
+  softlowerlim 13.4\
+  softupperlim 29.6\
   maxSpeed 0.5\
   maxAccel 0.1\
   maxDecel 0.1\
@@ -373,7 +377,7 @@ Motor stth $motor_driver_type [params \
   bias_bits 25\
   bias_bias 932070\
   cntsPerX -93207]
-stth softlowerlim 15.9
+stth softlowerlim 13.4
 stth softupperlim 29.6
 stth home 28.481113
 #stth home 18.981113
@@ -413,28 +417,34 @@ oct long_name oct
 ############################
 #
 
-# Monochromator Focusing (HOPG)
-#Motor mf1 $motor_driver_type [params \
-#  asyncqueue mc3\
-#  axis A\
-#  units degrees\
-#  hardlowerlim xxxx\
-#  hardupperlim xxxx\
-#  maxSpeed xxxx\
-#  maxAccel xxxx\
-#  maxDecel xxxx\
-#  stepsPerX xxxx\
-#  absEnc 1\
-#  absEncHome $mf1_Home\
-#  cntsPerX xxxx]
-#setHomeandRange -motor mf1 -home 0 -lowrange 0 -uprange 360
-#mf1 speed 1
-#mf1 movecount $move_count
-#mf1 precision 0.01
-#mf1 part monochromator
-#mf1 long_name mf1
+set mf_config 1
 
+
+switch $mf_config {
+   1 {
+# Monochromator Focusing (HOPG)
+       Motor mf1 $motor_driver_type [params \
+         asyncqueue mc3\
+         axis A\
+         units degrees\
+         hardlowerlim -0.1\
+         hardupperlim 1.1\
+         maxSpeed 0.1\
+         maxAccel 0.1\
+         maxDecel 0.1\
+         stepsPerX 22000\
+         absEnc 1\
+         absEncHome 3965\
+         cntsPerX -3500]
+       setHomeandRange -motor mf1 -home 0 -lowrange 0 -uprange 1
+       mf1 speed 0.02
+#       mf1 movecount $move_count
+       mf1 precision 0.005
+       mf1 part monochromator
+       mf1 long_name mf1
+      }
 # Monochromator Focusing (Ge)
+
 ## ffr 31/7/2012
 ## absEncHome was found to be 16777217 on 31/7/2012 when the
 ## encoder clocked over to 114 counts to give a posn
@@ -443,26 +453,32 @@ oct long_name oct
 ## and has a 24bit range (ie max cnt=16777216)
 ## I set a bias of 10000 counts with absenchome = 10000
 ## so that SICS can drive the axis to the allowed limits.
-Motor mf2 $motor_driver_type [params \
-  asyncqueue mc3\
-  axis A\
-  units degrees\
-  hardlowerlim -2\
-  hardupperlim 2\
-  maxSpeed 0.1\
-  maxAccel 0.1\
-  maxDecel 0.1\
-  stepsPerX 22000\
-  absEnc 1\
-  absEncHome 42768\
-  bias_bits 24\
-  bias_bias 10000\
-  cntsPerX -3500]
-setHomeandRange -motor mf2 -home 0 -lowrange 0 -uprange 2
-mf2 speed 0.02
-mf2 precision 0.005
-mf2 part monochromator
-mf2 long_name mf2
+
+   2 {
+
+      Motor mf2 $motor_driver_type [params \
+        asyncqueue mc3\
+        axis A\
+        units degrees\
+        hardlowerlim -0.1\
+        hardupperlim 1.1\
+        maxSpeed 0.1\
+        maxAccel 0.1\
+        maxDecel 0.1\
+        stepsPerX 22000\
+        absEnc 1\
+        absEncHome 10000\
+        bias_bits 24\
+        bias_bias 10000\
+        cntsPerX -3500]
+      setHomeandRange -motor mf2 -home 0 -lowrange 0 -uprange 1
+      mf2 speed 0.02
+      mf2 precision 0.005
+      mf2 part monochromator
+      mf2 long_name mf2
+   }
+}
+
 
 # Slit 1, right
 Motor ss1r $motor_driver_type [params \

site_ansto/instrument/hipd/config/motors/tilt_configuration.tcl

@@ -1,7 +1,8 @@
 # This must be loaded by motor_configuration.tcl
 
 set sphi_Home 7938520
-set schi_Home 7586052
+#set schi_Home 7586052
+set schi_Home 9932404 
 set sy_Home 7790194
 set sx_Home 7556649