linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'RELEASE-3_1' into RELEASE-3_2

Browse Source
This commit is contained in:
Ferdi Franceschini
2014-07-17 11:55:26 +10:00
parent 0cc126572d bffd3ae130
commit 17c212ee2e
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
site_ansto/instrument/config/environment/temperature/sct_lakeshore_340.tcl
View File

@ -1757,7 +1757,7 @@ proc createNode {scobj_hpath sct_controller cmdGroup varName readable writable p
# @return nothing (well, the sct object) # @return nothing (well, the sct object)
proc mk_sct_lakeshore_340 {sct_controller klasse tempobj CID CTYPE tol1 tol2 verbose} { proc mk_sct_lakeshore_340 {sct_controller klasse tempobj CID CTYPE tol1 tol2 verbose} {
if {[ catch { if {[ catch {
set LSmodel "ls340" set LSmodel "340"
set ::scobj::ls340::ls340_driveTolerance1 $tol1 set ::scobj::ls340::ls340_driveTolerance1 $tol1
set ::scobj::ls340::ls340_driveTolerance2 $tol2 set ::scobj::ls340::ls340_driveTolerance2 $tol2
set ::scobj::ls340::ls340_LSmodel $LSmodel set ::scobj::ls340::ls340_LSmodel $LSmodel

1
site_ansto/instrument/config/hmm/hmm_configuration_common_1.tcl
View File

@ -1248,6 +1248,7 @@ proc ::histogram_memory::upload_config {filler_defaults} {
::histogram_memory::synch_tables ::histogram_memory::synch_tables
::histogram_memory::filler_defaults $filler_defaults ::histogram_memory::filler_defaults $filler_defaults
hmm astop hmm astop
wait 5
hmm configure init 1 hmm configure init 1
hmm init hmm init
# Restore the init level to 0 # Restore the init level to 0