diff --git a/site_ansto/instrument/config/environment/magneticField/sct_oxford_labview.tcl b/site_ansto/instrument/config/environment/magneticField/sct_oxford_labview.tcl index b952cdba..34b7be6d 100644 --- a/site_ansto/instrument/config/environment/magneticField/sct_oxford_labview.tcl +++ b/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" diff --git a/site_ansto/instrument/config/environment/temperature/sct_oxford_mercury.tcl b/site_ansto/instrument/config/environment/temperature/sct_oxford_mercury.tcl index 7a93a4c6..52f9dc0f 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_oxford_mercury.tcl +++ b/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 } } diff --git a/site_ansto/instrument/hrpd/config/motors/motor_configuration.tcl b/site_ansto/instrument/hrpd/config/motors/motor_configuration.tcl index fb7a9521..18831471 100644 --- a/site_ansto/instrument/hrpd/config/motors/motor_configuration.tcl +++ b/site_ansto/instrument/hrpd/config/motors/motor_configuration.tcl @@ -228,7 +228,7 @@ Motor mom $motor_driver_type [params \ axis E\ units degrees\ hardlowerlim 43\ - hardupperlim 140\ + hardupperlim 160\ maxSpeed 1\ maxAccel 1\ maxDecel 1\ @@ -406,7 +406,7 @@ stth accel 0.01 stth decel 0.01 stth motOffDelay 1000 stth Settle 200 -stth blockage_ratio 1.5 +stth blockage_ratio 5.0 stth backlash_offset -0.1 stth creep_offset 0.0005 stth creep_precision 0.00002 diff --git a/site_ansto/instrument/hrpd/echidna_configuration.tcl b/site_ansto/instrument/hrpd/echidna_configuration.tcl index 145f7e13..53e296b6 100644 --- a/site_ansto/instrument/hrpd/echidna_configuration.tcl +++ b/site_ansto/instrument/hrpd/echidna_configuration.tcl @@ -34,6 +34,7 @@ fileeval $cfPath(environment)/sct_keithley_2700.tcl fileeval $cfPath(environment)/temperature/sct_lakeshore_336.tcl fileeval $cfPath(environment)/temperature/sct_lakeshore_340.tcl fileeval $cfPath(environment)/temperature/sct_oxford_mercury.tcl +fileeval $cfPath(environment)/temperature/sct_mercury_scpi.tcl fileeval $cfPath(environment)/temperature/west400.tcl fileeval $cfPath(environment)/temperature/sct_watlow_pm.tcl fileeval $cfPath(hmm)/hmm_configuration.tcl @@ -52,14 +53,19 @@ source gumxml.tcl # Current driver for Lakeshore temperature controllers # ########################################################## # driverName shortName IP-address port LineTerminator Tolerance1 Tolerance2 optional_Verbose -# add_sct_ls340 tc2 ca5-[instname] 4002 "\r" 0.5 1.0 -# add_sct_ls336 tc3 137.157.201.24 7777 "\r\n" 5.0 5.0 -# add_sct_ls336 tc1 137.157.201.23 7777 "\r\n" 5.0 5.0 - +# add_sct_ls340 tc1 ca5-[instname] 4001 "\r" 0.5 1.0 +# add_sct_ls336 tc1 137.157.201.21 7777 "\r\n" 5.0 5.0 +# add_sct_ls336 tc2 137.157.201.23 7777 "\r\n" 5.0 5.0 +# add_sct_ls336 tc3 10.157.205.30 7777 "\r\n" 5.0 5.0 +# add_sct_ls336 tc4 10.157.205.31 7777 "\r\n" 5.0 5.0 #::environment::temperature::add_west400 137.157.201.14 +# ::environment::temperature::add_west400 10.157.205.24 #::robot::add_robby # add_robot robby 137.157.201.26 6000 #add_robot rosie 137.157.201.26 6000 +#add_oxford_mercury tc1 10.157.205.5 7020 2.0 +#add_oxmag magnetic 10.157.205.3 55001 +# server_init ########################################### # WARNING: Do not add any code below server_init, if you do SICS may fail to initialise properly.