Merge from Echidna

site_ansto/instrument/config/environment/magneticField/sct_oxford_labview.tcl

@@ -23,6 +23,7 @@
 # @param basePath, The object path, this is where we keep our state variables.
 
 proc debug_log {args} {
+return
     set d1 [clock format [clock seconds] -format %d%h%Y]
     set fd [open "../log/magnetic$d1.log" a]
     puts $fd "[clock format [clock seconds] -format "%D %T"] $args"

site_ansto/instrument/config/environment/temperature/sct_oxford_mercury.tcl

@@ -63,7 +63,6 @@ namespace eval ::scobj::[set vendor]_[set device] {
       set fd [open "[set [namespace current]::log_file]" "a"]
       set line "[clock format [clock seconds] -format "%T"] $arg_string"
       puts $fd "$line"
-      #puts "debug_log $line"
       close $fd
     }
   }