Merged RELEASE-1_1 back into trunk.

r1836 | ffr | 2007-04-06 19:10:02 +1000 (Fri, 06 Apr 2007) | 2 lines

site_ansto/instrument/config/hmm/hmm_configuration_common_1.tcl

@@ -1,5 +1,5 @@
-# $Revision: 1.11 $
-# $Date: 2007-04-01 05:44:56 $
+# $Revision: 1.12 $
+# $Date: 2007-04-06 09:10:02 $
 # Author: Mark Lesha (mle@ansto.gov.au)
 # Last revision by: $Author: ffr $
 
@@ -41,19 +41,6 @@ proc returnconfigfile {filename} {
 	return $xml
 }
 
-# Configure to upload a complete configuration to the histogram server.
-# In this case it's the main config file plus the FAT, BAT and OAT files
-# in the same direcory as the SICS executable (for this example).
-# Alternatives:
-# - A partial config could be uploaded instead - e.g. just the main config file,
-# in that case the main config file points to a set of FAT, BAT OAT files
-# located on the server.
-# - The histogram server could configure itself from a config file set
-# kept on the local file system (not automated presently, manual control only)
-# - Or, no configuration at all could be uploaded, the
-# histogram server can configure itself using its default config files.
-hmm configure hmconfigscript "returnconfigfile $cfPath(hmm)/anstohm_full.xml"
-
 # Initialize the histogram server.
 # This call to hmm init (with init 1 configured) causes the histogram server
 # to be loaded with the specified configuration files.  Subsequent inits (with init 0 configured)
@@ -406,6 +393,7 @@ proc count_withbm {mode preset} {
     #TODO maybe add nxobj and point parameters.
     set point 0
     nxcreatefile nexus_hmscan.dic;
+    nxscript putattribute program_name run_mode hmmcount
     hmm_save nxscript entry1 $point;
     nxscript_data clear;
     nxscript_data putint 0 $point;