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/hipd/config/nexus/nxscripts.tcl

@@ -1,23 +1,17 @@
 source $cfPath(nexus)/nxscripts_common_1.tcl
-proc put2Dpolar_angle {nxobj point dim0 dim1} {
+# The polar angle should be calculated on the 
+# horizontal spatial bin boundaries.
+
+proc put_polar_angle {nxobj point dim0 dim1} {
   global det_height
-  set det_radius_mm [SplitReply [detector_radius_mm]]
   set det_angle_rad [SplitReply [detector_angle_rad]]
   set det_active_ht_mm [SplitReply [detector_active_height_mm]]
   set det_rot_rad [ expr [SplitReply [stth]]/[SplitReply [deg_per_rad]] ]
-  set row_zero [ SplitReply [detector_zero_row]]
-  set row_offset [ SplitReply [detector_ROI_row_offset]]
-  set col_zero [ SplitReply [detector_zero_col]]
-  set col_offset [ SplitReply [detector_ROI_col_offset]]
+  set det_zero_col [ SplitReply [detector_zero_col]]
+  set det_last_hor_pixel [SplitReply [detector_last_hor_pixel]]
+  set col_zero [expr ($dim1 -1.0)*$det_zero_col/$det_last_hor_pixel]
 
-  set folding 1;
-  # For 1D use poladim = 1 and rows = 1
-  # For 2D use poladim = 2 and rows = $dim0
-  set poladim 2; 
-  set rows $dim0;
 
-  set angsep [expr $det_angle_rad / ($dim1-1)]
-    $nxobj updatedictvar padim0 $rows
-    $nxobj updatedictvar padim1 $dim1 
-  $nxobj putpolararray dtheta [list $point 0 0] [list 1 $rows $dim1] $folding $poladim $det_radius_mm $angsep $det_active_ht_mm $det_rot_rad $row_zero $row_offset $col_zero $col_offset $dim0 $dim1
+  set angsep [expr $det_angle_rad / ($dim1-1.0)]
+  $nxobj putpolararray dtheta [list $point 0] [list 1 $dim1] $angsep $det_active_ht_mm $det_rot_rad $col_zero $dim0 $dim1
 }

site_ansto/instrument/hipd/script_validator/config/hmm/hmm_configuration.tcl

@@ -18,6 +18,32 @@ proc ::histogram_memory::hmmdictitemval {histomem dictitem} {
 proc ::histogram_memory::hmm_initialize {} {
 }
 
-::histogram_memory::hmm_initialize
-::histogram_memory::hmm_setup transparent 7000000 3 stitch_nyc  stitch_nxc oat_ntc_eff
-hmm_start 0
+proc ::histogram_memory::setmode {mode} {
+  global cfPath;
+  hmm_mode $mode
+  switch $mode {
+    global cfPath;
+    pulser {
+      _hmm_hor_axis polar_angle
+      _hmm_hor_axis_alias dtheta
+      _hmm_vert_axis y_pixel_offset
+      _hmm_vert_axis_alias dvaxis
+      hmm configure hmconfigscript "returnconfigfile $cfPath(hmm)/anstohm_full_pulser.xml"
+    }
+    calibration {
+      _hmm_hor_axis polar_angle
+      _hmm_hor_axis_alias dtheta
+      _hmm_vert_axis y_pixel_offset
+      _hmm_vert_axis_alias dvaxis
+      hmm configure hmconfigscript "returnconfigfile $cfPath(hmm)/anstohm_full_calibration.xml"
+    }
+    normal -
+      default {
+        _hmm_hor_axis polar_angle
+        _hmm_hor_axis_alias dtheta
+        _hmm_vert_axis y_pixel_offset
+        _hmm_vert_axis_alias dvaxis
+        hmm configure hmconfigscript "returnconfigfile $cfPath(hmm)/anstohm_full_small.xml"
+      }
+  }
+}

site_ansto/instrument/hipd/wombat_configuration.tcl

@@ -1,5 +1,5 @@
-# $Revision: 1.15 $
-# $Date: 2007-04-20 01:53:31 $
+# $Revision: 1.16 $
+# $Date: 2007-05-08 05:01:16 $
 # Author: Ferdi Franceschini (ffr@ansto.gov.au)
 # Last revision by: $Author: ffr $
 
@@ -17,13 +17,12 @@ source server_config.tcl
 ########################################
 # INSTRUMENT SPECIFIC CONFIGURATION
 
-#set hmm_mode pulser
-#set hmm_mode calibration
-set hmm_mode normal
-
 fileeval $cfPath(motors)/motor_configuration.tcl
 
 ########
+# Parameters set above the restore command will be clobbered by
+# the values in the status.tcl file
+restore
 
 fileeval $cfPath(plc)/plc.tcl
 fileeval $cfPath(counter)/counter.tcl
@@ -32,9 +31,18 @@ fileeval $cfPath(nexus)/nxscripts.tcl
 fileeval $cfPath(scan)/scan.tcl
 source $cfPath(hipadaba)/hipadaba_configuration.tcl
 source gumxml.tcl
+#::histogram_memory::setmode pulser
+#::histogram_memory::setmode calibration
+::histogram_memory::setmode normal 
+::histogram_memory::hmm_initialize
+::histogram_memory::hmm_setup transparent 7000000 3 stitch_nyc  stitch_nxc oat_ntc_eff
+hmm_start 0
 
 MakeStateMon hmscan
 
+VarMake detector_layout Text Mugger
+detector_layout cylinder
+
 VarMake detector_radius_mm Int User
 detector_radius_mm 700.0
 VarMake detector_angle_deg Float User
@@ -52,12 +60,18 @@ VarMake crystal_wavelength_A Float User
 
 VarMake bmon_distance Float User
 
-## Column number at beam centre
+## Number of last pixel on vertical axis
+VarMake detector_last_vert_pixel Float User
+detector_last_vert_pixel 511
+## Number of last pixel on horizontal axis
+VarMake detector_last_hor_pixel Float User
+detector_last_hor_pixel [expr 480 * 8 - 1]
+## Row number at beam centre
 VarMake detector_zero_row Float User
 detector_zero_row 255.5
-## Row number at beam centre for a detector rotation of 0 degrees
+## Column number at beam centre for a detector rotation of 0 degrees
 VarMake detector_zero_col Float User
-detector_zero_col [expr 480 * 8 - 1]
+detector_zero_col [SplitReply [detector_last_hor_pixel]]
 ## Row offset for region of interest
 VarMake detector_ROI_row_offset Float User
 detector_ROI_row_offset 0