From 374151be2605afc5129e3fca59f966a01fdadaba Mon Sep 17 00:00:00 2001
From: Ferdi Franceschini <ffr@ansto.gov.au>
Date: Sun, 1 Apr 2007 14:53:39 +1000
Subject: [PATCH] Fixed mixups between sics variables and tcl variables, and
 nxdict aliases with nexus dataset names.

r1772 | ffr | 2007-04-01 14:53:39 +1000 (Sun, 01 Apr 2007) | 2 lines
---
 .../instrument/config/nexus/nxscripts_common_1.tcl    | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/site_ansto/instrument/config/nexus/nxscripts_common_1.tcl b/site_ansto/instrument/config/nexus/nxscripts_common_1.tcl
index 42e84157..d88a632e 100644
--- a/site_ansto/instrument/config/nexus/nxscripts_common_1.tcl
+++ b/site_ansto/instrument/config/nexus/nxscripts_common_1.tcl
@@ -7,7 +7,7 @@
 
 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.17 $}]
+set tmpstr [string map {"$" ""} {$Revision: 1.18 $}]
 set nx_content_revision_num [lindex $tmpstr [expr [llength $tmpstr] - 1]]
 
 MakeNXScript
@@ -103,8 +103,8 @@ proc hmm_save {nxobj entryname point} {
     $nxobj putslab $dictalias(hmm) [list $point 0 0] [list 1 $dim0 $dim1 ] hmm [SplitReply [hmm_start]] $histo_length [SplitReply [hmm_bank]]
     #TODO replace scandata with generic name
     $nxobj makelink scandata hmcounts
-    $nxobj makelink scanhoraxis x_pixel_offset
-    $nxobj makelink scanvertaxis y_pixel_offset
+    $nxobj makelink scanhoraxis dhaxis
+    $nxobj makelink scanvertaxis dvaxis
 }
 
 proc hmm_addnxscanentry {nxobj entryname point scanVariable scanVarPos scanVarStep start_time} {
@@ -158,12 +158,13 @@ proc putmonitor {nxobj point} {
 
 proc put_det_haxis_arr {nxobj dim0} {
   set det_radius_mm [SplitReply [detector_radius_mm]]
+  set det_angle_rad [SplitReply [detector_angle_rad]]
   set angsep [expr $det_angle_rad / ($dim0-1)]
 
   for {set i 0} {$i < $dim0} {incr i} {
-    set x_arr($i) [expr ($dim0 - 1 - $i)*$angsep*$detector_radius_mm]
+    set x_arr($i) [expr ($dim0 - 1 - $i)*$angsep*$det_radius_mm]
   }
-  $nxobj putarray x_pixel_offset x_arr $dim0;
+  $nxobj putarray dhaxis x_arr $dim0;
 }
 
 proc put_det_vaxis_arr {nxobj dim1} {