Modified the simulated hmm configurations so that they now source the common config and override the hmc control, the histogram::initialize and the histogram::hmmdititemval procs.

r1753 | ffr | 2007-03-31 11:27:52 +1000 (Sat, 31 Mar 2007) | 2 lines
This commit is contained in:
Ferdi Franceschini
2007-03-31 11:27:52 +10:00
committed by Douglas Clowes
parent 53e7a69cb0
commit 7526a7b93d
3 changed files with 39 additions and 70 deletions

View File

@@ -1,5 +1,5 @@
# $Revision: 1.5 $
# $Date: 2007-03-30 07:51:35 $
# $Revision: 1.6 $
# $Date: 2007-03-31 01:27:52 $
# Author: Mark Lesha (mle@ansto.gov.au)
# Last revision by: $Author: ffr $
@@ -7,11 +7,7 @@
# System: Histogram Server (sample)
#------------------------------------------------------------------------
MakeHM hmm anstohttp
hmm configure hmaddress http://das1-[SplitReply [instrument]]:8080
hmm configure username spy
hmm configure password 007
hmm configure hmDataPath ../HMData
#ffr MakeHM hmm anstohttp, move to inst specific config
namespace eval histogram_memory {
VarMake hmm_dim0 Int User
@@ -68,6 +64,11 @@ hmm configure hmconfigscript "returnconfigfile $cfPath(hmm)/anstohm_full.xml"
#
# Making sure the histogram server is stopped, so we can load configuration.
proc hmm_initialize {} {
hmm configure hmaddress http://das1-[SplitReply [instrument]]:8080
hmm configure username spy
hmm configure password 007
hmm configure hmDataPath ../HMData
hmm configure init 0
hmm init
hmm stop
@@ -126,7 +127,7 @@ proc hmm_setup {mode bankNum rankNum nyc nxc ntc} {
# instead of just stopping it, so we can generate multiple datasets
# during a scan, or overlap data acquired at different scan stations.
# It can also terminate either on the counter or any of the histogram objects.
MakeHMControl_ANSTO hmc bm hmm
#ffr MakeHMControl_ANSTO hmc bm hmm, move to inst specific config
##############################################
# Creating scans and creating/attaching