From 82475e1dec567f1c6890b27d187f5f7c37e59f41 Mon Sep 17 00:00:00 2001
From: Ferdi Franceschini <ffr@ansto.gov.au>
Date: Thu, 10 Dec 2009 18:29:23 +1100
Subject: [PATCH] Cleanup and add "histmem loadconf" feedback

r2843 | ffr | 2009-12-10 18:29:23 +1100 (Thu, 10 Dec 2009) | 2 lines
---
 .../instrument/config/hmm/hmm_configuration_common_1.tcl    | 6 +++---
 site_ansto/instrument/config/nexus/nxscripts_common_1.tcl   | 3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)

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 38f78c06..f453010a 100644
--- a/site_ansto/instrument/config/hmm/hmm_configuration_common_1.tcl
+++ b/site_ansto/instrument/config/hmm/hmm_configuration_common_1.tcl
@@ -1,5 +1,5 @@
-# $Revision: 1.47 $
-# $Date: 2009-11-24 22:56:46 $
+# $Revision: 1.48 $
+# $Date: 2009-12-10 07:29:23 $
 # Author: Ferdi Franceschini
 # Based on the examples in the hs_test.tcl sample configuration by Mark Lesha.
 # http://gumtree.ansto.gov.au:9080/nbicms/bragg-systems/histogram-server/hs_test.tcl/view
@@ -1278,9 +1278,9 @@ proc ::histogram_memory::upload_config {filler_defaults} {
 #     set nch  [number_of_channels $axis]
 #     OAT_TABLE $axis -setdata BOUNDARIES [calc_boundaries $bins $nch]
 #   }
+    clientput "histmem configuration uploaded"
   } message ] {
     if {$::errorCode=="NONE"} {
-      clientput "histmem configuration uploaded"
       return $message
     } else {
       return -code error "([info level 0]) $message"
diff --git a/site_ansto/instrument/config/nexus/nxscripts_common_1.tcl b/site_ansto/instrument/config/nexus/nxscripts_common_1.tcl
index 59eff2f2..68ddb04c 100644
--- a/site_ansto/instrument/config/nexus/nxscripts_common_1.tcl
+++ b/site_ansto/instrument/config/nexus/nxscripts_common_1.tcl
@@ -918,7 +918,6 @@ proc ::nexus::histmem::save {hm nxalias hpath data_type filestatus args} {
       } elseif { $max_period > 0} {
         $HMOBJ configure read_data_period_number $point
       }
-      broadcast nxscript putslab $nxalias [join [list $point $hmmslabstart ]] [join [list 1 $hmmslabend]] $HMOBJ 0 $datsize 1
       nxscript putslab $nxalias [join [list $point $hmmslabstart ]] [join [list 1 $hmmslabend]] $HMOBJ 0 $datsize 1
 #####
       if {$filestatus == "newfile"} {
@@ -1337,7 +1336,7 @@ foreach expt $::nexus::exports {
 
 set tmpstr [string map {"$" ""} {$Name: not supported by cvs2svn $}]
 set nx_content_release_tag [lindex $tmpstr [expr [llength $tmpstr] - 1]]
-set tmpstr [string map {"$" ""} {$Revision: 1.50 $}]
+set tmpstr [string map {"$" ""} {$Revision: 1.51 $}]
 set nx_content_revision_num [lindex $tmpstr [expr [llength $tmpstr] - 1]]
 
 #namespace eval data {