From 5d593ff615badcdfd93553de5d7689aec6cb004a Mon Sep 17 00:00:00 2001
From: Ferdi Franceschini <ffr@ansto.gov.au>
Date: Sat, 24 Mar 2007 19:21:21 +1100
Subject: [PATCH] Bring into line with changes in the hmm common configuration
 file.

r1718 | ffr | 2007-03-24 19:21:21 +1100 (Sat, 24 Mar 2007) | 2 lines
---
 site_ansto/instrument/config/scan/scan_common_1.tcl | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/site_ansto/instrument/config/scan/scan_common_1.tcl b/site_ansto/instrument/config/scan/scan_common_1.tcl
index 93ccd1da..b8c025d2 100644
--- a/site_ansto/instrument/config/scan/scan_common_1.tcl
+++ b/site_ansto/instrument/config/scan/scan_common_1.tcl
@@ -64,7 +64,7 @@ variable scanVariable scan_var scanVarStart 0 scanVarStep 1
     hmscan_var_name $scanVariable
     hmscan_var_start $scanVarStart
     hmscan_var_step $scanVarStep
-    ::histogram_memory::hs_prepare $sobj $uobj
+    ::histogram_memory::prepare 
   }
 
   proc hmm_count {sobj uobj point mode preset} {
@@ -75,11 +75,11 @@ variable scanVariable scan_var scanVarStart 0 scanVarStep 1
     hmscan_preset $preset;
     set scanvar [SplitReply [hmscan_var_name]]
     hmscan_var_value [SplitReply [$scanvar]]
-    ::histogram_memory::hs_count_bm_controlled $sobj $uobj $point $mode $preset; 
+    ::histogram_memory::count_bm_controlled $mode $preset; 
   }
 
   proc hmm_scan_finish {sobj uobj} {
-    ::histogram_memory::hs_finish $sobj $uobj;
+    ::histogram_memory::finish;
     nxreopenfile;
     nxclosefile;
   }
@@ -296,11 +296,7 @@ bmonscan function finish ::scancommand::bm_scan_finish
 #
 scan2 configure script
 
-#hmscan function count  ::histogram_memory::hs_count_bm_controlled
-#hmscan function collect  ::histogram_memory::hs_collect
-#hmscan function finish  ::histogram_memory::hs_finish
-#
-#scan2 function prepare hs_prepare
+#scan2 function prepare ::histogram_memory::prepare
 scan2 function count  ::histogram_memory::hs_count_hs_controlled
 #scan2 function collect  ::histogram_memory::hs_collect
 scan2 function finish  ::histogram_memory::hs_finish