From 0266abbd94e557fddc1d86b82119da09f67358ee Mon Sep 17 00:00:00 2001
From: Douglas Clowes <dcl@ansto.gov.au>
Date: Mon, 16 Dec 2013 13:36:35 +1100
Subject: [PATCH] Change the temperature factor from 10.0 to 20.0 This refelcts
 the firmware update to the RVA ROM removing the factor of 2.0 for the
 temperature reading and setting

---
 .../environment/temperature/sct_rvasm2.tcl       | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/site_ansto/instrument/config/environment/temperature/sct_rvasm2.tcl b/site_ansto/instrument/config/environment/temperature/sct_rvasm2.tcl
index 323aba35..5c5021a1 100644
--- a/site_ansto/instrument/config/environment/temperature/sct_rvasm2.tcl
+++ b/site_ansto/instrument/config/environment/temperature/sct_rvasm2.tcl
@@ -62,7 +62,7 @@ debug_log "rdValue [sct] [sct result]"
       hsetprop $tc_root/setpoint driving 1
     }
     # ANSTO special temperature
-    set temp [expr {10.0 * [sct target]}]
+    set temp [expr {20.0 * [sct target]}]
     set cmd "STT[format %04X [expr {int($temp)}]]"
     debug_log "sct send $cmd"
     sct send "$cmd"
@@ -103,7 +103,7 @@ debug_log "rdValue [sct] [sct result]"
           debug_log "scan [string range $data 3 6] %4x data"
           set rslt [scan [string range $data 3 6] %4x data]
           # ANSTO special temp
-          set data [format "%.1f" [expr {0.1 * $data}]]
+          set data [format "%.1f" [expr {$data / 20.0}]]
           debug_log "scan result rslt=$rslt, data=$data, oldval=[sct oldval]"
           if {"$data" ne "[sct oldval]"} {
             debug_log "$data != [sct oldval] => [expr {"$data" != "[sct oldval]"}]"
@@ -436,7 +436,7 @@ debug_log "rdVisc [sct] [sct result]"
                 close $f
                 set f [open "[sct datafile].csv" "a"]
                 set my_time [expr {[sct test_time] + int($the_t / 45.0)}]
-                set my_temp [expr {0.1 * $the_c}]
+                set my_temp [expr {$the_c / 20.0}]
                 if {$the_v > 0x7FFFFF} {
                   set my_visc [expr {$the_v -  0x1000000}]
                 } else {
@@ -547,12 +547,12 @@ debug_log "setPoint $cmd $par"
             set the_valu [lindex $parts 2]
             set the_ramp [lindex $parts 3]
             if {$the_type == "I"} {
-              set the_valu [expr {round($the_valu * 10.0)}] 
-              set the_ramp [expr {round($the_ramp * 10.0)}] 
+              set the_valu [expr {round($the_valu * 20.0)}] 
+              set the_ramp [expr {round($the_ramp * 20.0)}] 
             } elseif {$the_type == "S"} {
             } elseif {$the_type == "T"} {
-              set the_valu [expr {round($the_valu * 10.0)}] 
-              set the_ramp [expr {round($the_ramp * 10.0 /45 * 32768)}] 
+              set the_valu [expr {round($the_valu * 20.0)}] 
+              set the_ramp [expr {round($the_ramp * 20.0 /45 * 32768)}] 
             } else {
               sct geterror "Profile error: $line"
               sct print "Profile error: $line"
@@ -580,7 +580,7 @@ debug_log "setPoint $cmd $par"
           }
           set rslt [scan $line "LT%2x%1s%6x%4x%4x" the_line the_type the_time the_valu the_ramp]
           if {"$the_type" == "I"} {
-            set dec_temp [format "%.1f" [expr {0.1 * $the_valu}]]
+            set dec_temp [format "%.1f" [expr {$the_valu / 20.0}]]
           }
           set dec_time [expr {$the_time / 45.0}]
           lappend lines $line