Checked files modified by the merge with:

cvs diff -u -rRELEASE-1_2-MERGEPOINT -rHEAD <filepath>
and found no modifications on the trunk between the release 1.2 mergepoint and cvs HEAD

r1946 | ffr | 2007-05-08 15:01:16 +1000 (Tue, 08 May 2007) | 4 lines

site_ansto/instrument/config/scan/scan_common_1.tcl

@@ -51,6 +51,7 @@ variable scanVariable scan_var scanVarStart 0 scanVarStep 1
     variable scanVarStart;
     variable scanVarStep;
     variable scanVariable;
+    variable scan_pt_start_time
 
     nxcreatefile nexus_hmscan.dic;
     nxclosefile;
@@ -64,12 +65,11 @@ variable scanVariable scan_var scanVarStart 0 scanVarStep 1
     hmscan_var_name $scanVariable
     hmscan_var_start $scanVarStart
     hmscan_var_step $scanVarStep
+    set scan_pt_start_time [sicstime]
     ::histogram_memory::prepare 
   }
 
   proc hmm_count {sobj uobj point mode preset} {
-    variable scan_pt_start_time
-    set scan_pt_start_time [sicstime]
     hmscan_point_current  $point;
     hmscan_mode $mode;
     hmscan_preset $preset;
@@ -126,9 +126,6 @@ variable scanVariable scan_var scanVarStart 0 scanVarStep 1
   proc donothing {args} {}
 
   proc bm_count {sobj uobj point mode preset} {
-    variable scan_pt_start_time
-
-    set scan_pt_start_time [sicstime]
     bmonscan_point_current $point
     bmonscan_mode $mode;
     bmonscan_preset $preset;
@@ -144,6 +141,7 @@ variable scanVariable scan_var scanVarStart 0 scanVarStep 1
     variable scanVariable;
     variable bmoncounts_array;
     variable bmoncounts_axis;
+    variable scan_pt_start_time 
 
     set bmoncounts_array [list]
 #TODO Parameterise varindex in some way
@@ -161,6 +159,7 @@ variable scanVariable scan_var scanVarStart 0 scanVarStep 1
     bmonscan_var_name $scanVariable
     bmonscan_var_start $scanVarStart
     bmonscan_var_step $scanVarStep
+    set scan_pt_start_time [sicstime]
     #stdscan prepare $sobj $uobj;
   }