From d404bdbb06ff2a95be6b774f42303d35430fea9d Mon Sep 17 00:00:00 2001
From: Douglas Clowes <dcl@ansto.gov.au>
Date: Wed, 25 Jun 2014 16:41:54 +1000
Subject: [PATCH] Merge from Quokka sans sct_flipper, environment, motor_config

---
 .../sans/config/beamline/sct_flipper.tcl      |  6 ++++-
 .../sans/config/environment/environment.tcl   | 10 ++------
 .../config/motors/motor_configuration.tcl     | 23 ++++++++++++-------
 3 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/site_ansto/instrument/sans/config/beamline/sct_flipper.tcl b/site_ansto/instrument/sans/config/beamline/sct_flipper.tcl
index e9144e80..0a8f980e 100644
--- a/site_ansto/instrument/sans/config/beamline/sct_flipper.tcl
+++ b/site_ansto/instrument/sans/config/beamline/sct_flipper.tcl
@@ -146,6 +146,9 @@ proc ::scobj::rfgen::set_frequency {basePath} {
 ##
 # @brief Request a state report from the RF generator
 proc ::scobj::rfgen::rqStatFunc {} {
+  set basePath [sct]
+  hdelprop $basePath geterror
+
   sct send "L:[sct address]"
   return rdState
 }
@@ -161,6 +164,7 @@ proc ::scobj::rfgen::rdStatFunc {} {
   variable MAXVOLTAGE
 
   set basePath [sct]
+  hdelprop $basePath error_in_::scobj::rfgen::rdStatFunc
 
   set currSuperState [sct ramping]
   set updateFlipper 0
@@ -176,7 +180,7 @@ proc ::scobj::rfgen::rdStatFunc {} {
       lappend temp "$k $v"
       continue
     }
-    if {[string is integer $v]} {
+    if {[string is integer [string trimleft $v 0]]} {
       lappend temp "$k $v"
     } else {
       lappend temp "$k -1"
diff --git a/site_ansto/instrument/sans/config/environment/environment.tcl b/site_ansto/instrument/sans/config/environment/environment.tcl
index d7d80329..f2426a7d 100644
--- a/site_ansto/instrument/sans/config/environment/environment.tcl
+++ b/site_ansto/instrument/sans/config/environment/environment.tcl
@@ -50,7 +50,7 @@ switch [string tolower $envtemp] {
   }
   "11tmagnet" {
     puts "Configuring 11TMagnet"
-    add_sct_ls340 tc2 137.157.202.78 4001 "\r" 0.5 5.0
+    add_sct_ls340 tc2 137.157.202.79 4001 "\r" 0.5 5.0
     if { [SplitReply [environment_simulation]] == "false"} {
       ::utility::macro::getset float temperature {} {
         return [sicsmsgfmt [hval /sample/tc2/sensor/ctrlLp1_value]]
@@ -64,13 +64,7 @@ switch [string tolower $envtemp] {
     #add_ips120 ips120 137.157.202.78 4004 0.001
 
     # make sure to lodge "fileeval $cfPath(environment)/magneticField/sct_oxford_labview.tcl" before calling below
-    ::scobj::magnetic::mkMagnetic {
-      name "magnetic"
-      IP 137.157.202.80
-      PORT 22
-      tuning 0
-      interval 10
-    }
+    add_oxmag magnetic 10.157.205.44 55001
     hfactory /sics/tc2/sensor/start_sensorValueA plain user float
     hfactory /sics/tc2/sensor/end_sensorValueA plain user float
 #  ::scobj::hinitprops tc2 sensor/start_sensorValueA sensor/end_sensorValueA
diff --git a/site_ansto/instrument/sans/config/motors/motor_configuration.tcl b/site_ansto/instrument/sans/config/motors/motor_configuration.tcl
index 7a472cdc..846db865 100644
--- a/site_ansto/instrument/sans/config/motors/motor_configuration.tcl
+++ b/site_ansto/instrument/sans/config/motors/motor_configuration.tcl
@@ -65,7 +65,7 @@ set bs2_Home  9942
 set bs3_Home 30928
 set bs4_Home 22111
 set bs5_Home 14558
-set bs6_Home 27251
+set bs6_Home 16855
 
 set bs_cntsPerX  [expr 32768.0/360.0]
 set bs_stepsPerX [expr -25000.0*160.0/360.0]
@@ -875,9 +875,10 @@ bs1 long_name bs1
 bs1 softlowerlim 11
 bs1 softupperlim 95
 bs1 home 90
-bs1 precision 1.5
+bs1 precision 0.05
 bs1 creep_precision 0.05
 bs1 creep_offset 1
+bs1 blockage_fail 0
 
 Motor bs2 $motor_driver_type [params \
   asyncqueue mc4\
@@ -898,9 +899,10 @@ bs2 long_name bs2
 bs2 softlowerlim 7
 bs2 softupperlim 95
 bs2 home 90
-bs2 precision 1.5
+bs2 precision 0.05
 bs2 creep_precision 0.05
 bs2 creep_offset 1
+bs2 blockage_fail 0
 
 Motor bs3 $motor_driver_type [params \
   asyncqueue mc4\
@@ -921,9 +923,10 @@ bs3 long_name bs3
 bs3 softlowerlim 11
 bs3 softupperlim 95
 bs3 home 90
-bs3 precision 1.5
+bs3 precision 0.05
 bs3 creep_precision 0.05
 bs3 creep_offset 1
+bs3 blockage_fail 0
 
 Motor bs4 $motor_driver_type [params \
   asyncqueue mc4\
@@ -944,9 +947,10 @@ bs4 long_name bs4
 bs4 softlowerlim 7
 bs4 softupperlim 95
 bs4 home 90
-bs4 precision 1.5
+bs4 precision 0.05
 bs4 creep_precision 0.05
 bs4 creep_offset 1
+bs4 blockage_fail 0
 
 Motor bs5 $motor_driver_type [params \
   asyncqueue mc4\
@@ -967,10 +971,12 @@ bs5 long_name bs5
 bs5 softlowerlim 11
 bs5 softupperlim 95
 bs5 home 90
-bs5 precision 1.5
+bs5 precision 0.05
 bs5 creep_precision 0.05
 bs5 creep_offset 1
+bs5 blockage_fail 0
 
+set bs6_stepsPerX [expr -1.0 * $bs_stepsPerX]
 Motor bs6 $motor_driver_type [params \
   asyncqueue mc4\
   axis H\
@@ -980,7 +986,7 @@ Motor bs6 $motor_driver_type [params \
   maxSpeed 2\
   maxAccel 1\
   maxDecel 1\
-  stepsPerX $bs_stepsPerX\
+  stepsPerX $bs6_stepsPerX\
   absEnc 1\
   absEncHome $bs6_Home\
   cntsPerX $bs_cntsPerX]
@@ -990,9 +996,10 @@ bs6 long_name bs6
 bs6 softlowerlim 7
 bs6 softupperlim 95
 bs6 home 90
-bs6 precision 1.5
+bs6 precision 0.05
 bs6 creep_precision 0.05
 bs6 creep_offset 1
+bs6 blockage_fail 0
 
 # Polarizer Rotation
 #Motor pol $motor_driver_type [params \