From 22c701b816677f5d771630c0574db0375eac7a90 Mon Sep 17 00:00:00 2001 From: Ferdi Franceschini Date: Thu, 17 Jul 2014 08:55:19 +1000 Subject: [PATCH 1/2] Fix LS340 tc driveable by setting the right value for the model number. --- .../config/environment/temperature/sct_lakeshore_340.tcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site_ansto/instrument/config/environment/temperature/sct_lakeshore_340.tcl b/site_ansto/instrument/config/environment/temperature/sct_lakeshore_340.tcl index 6965a276..dcfb0196 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_lakeshore_340.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_lakeshore_340.tcl @@ -1757,7 +1757,7 @@ proc createNode {scobj_hpath sct_controller cmdGroup varName readable writable p # @return nothing (well, the sct object) proc mk_sct_lakeshore_340 {sct_controller klasse tempobj CID CTYPE tol1 tol2 verbose} { if {[ catch { - set LSmodel "ls340" + set LSmodel "340" set ::scobj::ls340::ls340_driveTolerance1 $tol1 set ::scobj::ls340::ls340_driveTolerance2 $tol2 set ::scobj::ls340::ls340_LSmodel $LSmodel From bffd3ae130909d80f1f14bf2f6abc6b8bb1ac251 Mon Sep 17 00:00:00 2001 From: Ferdi Franceschini Date: Thu, 17 Jul 2014 11:01:18 +1000 Subject: [PATCH 2/2] Workaround for SICS-596 'histmem loadconf' fails while histogram is running. The hmm init was being issued before the histogram had actually stopped. --- site_ansto/instrument/config/hmm/hmm_configuration_common_1.tcl | 1 + 1 file changed, 1 insertion(+) diff --git a/site_ansto/instrument/config/hmm/hmm_configuration_common_1.tcl b/site_ansto/instrument/config/hmm/hmm_configuration_common_1.tcl index 5436781f..cbe97274 100644 --- a/site_ansto/instrument/config/hmm/hmm_configuration_common_1.tcl +++ b/site_ansto/instrument/config/hmm/hmm_configuration_common_1.tcl @@ -1248,6 +1248,7 @@ proc ::histogram_memory::upload_config {filler_defaults} { ::histogram_memory::synch_tables ::histogram_memory::filler_defaults $filler_defaults hmm astop + wait 5 hmm configure init 1 hmm init # Restore the init level to 0