Merged changes from Quokka as at 2015-02-18

site_ansto/instrument/sans/config/environment/sct_antonparr_MCR500.tcl

@@ -33,8 +33,12 @@ proc ::scobj::antonparr_MCR500::mkDriver { speed_name torque_name tol settle } {
   set catch_status [ catch {
 
 # mkDriver hook code starts
+  if [::utility::obj_exists $speed_name] {
     add_rheo $speed_name $tol $settle
+  }
+  if [::utility::obj_exists $torque_name] {
     add_rheo $torque_name $tol $settle
+  }
 # mkDriver hook code ends
   } catch_message ]
   handle_exception ${catch_status} ${catch_message}

site_ansto/instrument/sans/config/environment/sct_rheometer.tcl

@@ -100,4 +100,5 @@ proc add_rheo {rhControl tol settle} {
   hfactory /sics/$rhControl/settletime plain user float
   hset     /sics/$rhControl/settletime $settle
   hsetprop /sics/$rhControl timecheck 0
+  hsetprop /sics/$rhControl callBack "rhCallBack /sics/$rhControl"
 }

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

@@ -718,7 +718,7 @@ Motor apx $motor_driver_type [params \
   axis E\
   units mm\
   hardlowerlim -260\
-  hardupperlim 5\
+  hardupperlim 45\
   maxSpeed 5\
   maxAccel 5\
   maxDecel 5\
@@ -730,7 +730,7 @@ apx part collimator
 apx long_name apx
 apx home 0
 apx softlowerlim -255
-apx softupperlim 5
+apx softupperlim 45
 apx speed 5
 
 # Sample aperture y