From 2d96d3de69c40f2d64d1376be08f8851dd233b09 Mon Sep 17 00:00:00 2001
From: Ferdi Franceschini <ffr@ansto.gov.au>
Date: Sat, 23 Nov 2013 19:51:28 +1100
Subject: [PATCH] Updated histmem configuration from ics1-kookaburra.

---
 .../config/hmm/hmm_configuration.tcl          | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/site_ansto/instrument/kookaburra/config/hmm/hmm_configuration.tcl b/site_ansto/instrument/kookaburra/config/hmm/hmm_configuration.tcl
index 26bb534f..5a13e190 100644
--- a/site_ansto/instrument/kookaburra/config/hmm/hmm_configuration.tcl
+++ b/site_ansto/instrument/kookaburra/config/hmm/hmm_configuration.tcl
@@ -8,10 +8,10 @@ set sim_mode [SplitReply [hmm_simulation]]
 proc ::histogram_memory::init_OAT_TABLE {} {
   if [ catch {
 
-    OAT_TABLE X -setdata MAX_CHAN 8
+    OAT_TABLE X -setdata MAX_CHAN 16
     OAT_TABLE Y -setdata MAX_CHAN 1024
     OAT_TABLE X -setdata BMIN -0.5
-    OAT_TABLE X -setdata BMAX  7.5
+    OAT_TABLE X -setdata BMAX  15.5
     OAT_TABLE Y -setdata BMIN -0.5
     OAT_TABLE Y -setdata BMAX  1023.5
 
@@ -21,7 +21,7 @@ proc ::histogram_memory::init_OAT_TABLE {} {
     hmm configure fat_frame_frequency $freq
     hmm configure fat_frame_source INTERNAL
 
-    OAT_TABLE -set X { 7.5 6.5 } NXC 8 Y { -0.5 0.5 } NYC 1024 T { 0 200000 } NTC 1 
+    OAT_TABLE -set X { -0.5 0.5 } NXC 16 Y { -0.5 0.5 } NYC 1024 T { 0 200000 } NTC 1 
   } message ] {
     if {$::errorCode=="NONE"} {return $message}
     return -code error $message
@@ -31,13 +31,13 @@ proc ::histogram_memory::init_OAT_TABLE {} {
 proc CAT_TABLE {args} {
 return {
                 <CAT>
-                        <WIX APPLY="ENABLE" MIN_RAW="0" MAX_RAW="7" TABLE_SIZE="8">
+                        <WIX APPLY="ENABLE" MIN_RAW="0" MAX_RAW="15" TABLE_SIZE="16">
                                 <link_numeric_file filename="../../kookaburra_wix.dat" default_filename="../HMconfig/Default/kookaburra_wix.dat" />
                         </WIX>
-                        <OFFSET_Y_PER_X APPLY="ENABLE" MIN_RAW="0" MAX_RAW="7" TABLE_SIZE="8" BASE_VAL="0">
+                        <OFFSET_Y_PER_X APPLY="ENABLE" MIN_RAW="0" MAX_RAW="15" TABLE_SIZE="16" BASE_VAL="0">
                                 <link_numeric_file filename="../../kookaburra_offset_y_per_x.dat" default_filename="../HMconfig/Default/kookaburra_offset_y_per_x.dat" />
                         </OFFSET_Y_PER_X>
-                        <MAGNIFY APPLY="ENABLE" MIN_RAW="0" MAX_RAW="7" TABLE_SIZE="8" DIRECTION="X" MAX_IN="1023" MAX_OUT="1023" RANGE="UNSIGNED">
+                        <MAGNIFY APPLY="ENABLE" MIN_RAW="0" MAX_RAW="15" TABLE_SIZE="16" DIRECTION="X" MAX_IN="1023" MAX_OUT="1023" RANGE="UNSIGNED">
                                 <link_numeric_file filename="../../kookaburra_magnify.dat" default_filename="../HMconfig/Default/kookaburra_magnify.dat" />
                         </MAGNIFY>
                 </CAT>
@@ -46,20 +46,20 @@ return {
 
 proc ::histogram_memory::init_CAT_TABLE {} {
   CAT_TABLE -set MESYTEC_MPSD8_CHANNEL_GAINS {
-    1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00
+    1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00
   }
   CAT_TABLE -set MESYTEC_MPSD8_THRESHOLDS { 10 }
   CAT_TABLE -set MESYTEC_TUBE_PAIR_RESISTANCE_RATIOS {
-    1. 1. 1. 1. 1. 1. 1. 1.
+    1. 1. 1. 1. 1. 1. 1. 1. 1. 1. 1. 1. 1. 1. 1. 1.
   }
   CAT_TABLE -set MESYTEC_TUBE_MAGNIFICATIONS {
-    1. 1. 1. 1. 1. 1. 1. 1.
+    1. 1. 1. 1. 1. 1. 1. 1. 1. 1. 1. 1. 1. 1. 1. 1.
   }
   CAT_TABLE -set MESYTEC_TUBE_OFFSETS {
-    0. 0. 0. 0. 0. 0. 0. 0. 
+    0. 0. 0. 0. 0. 0. 0. 0. 0. 0. 0. 0. 0. 0. 0. 0.
   }
   CAT_TABLE -set MESYTEC_TUBE_HISTOGRAM_WEIGHTS {
-    1 1 1 1 1 1 1 1
+    1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
   }
 }
 
@@ -81,7 +81,7 @@ proc ::histogram_memory::isc_initialize {} {
     if {$::sim_mode == "true"} {
         hmm configure oat_ntc_eff 1
         hmm configure $INST_NYC 1024
-        hmm configure $INST_NXC 8
+        hmm configure $INST_NXC 16
     }
     BAT_TABLE -init
 #   CAT_TABLE -init
@@ -92,7 +92,7 @@ proc ::histogram_memory::isc_initialize {} {
     ::histogram_memory::set_graphtype "two_theta" "boundaries"
 
 # MJL TODO detector geometry for Kookaburra TBD.  Figures need revision during commissioning
-    # Width = 25mm spacing * 8 tubes = 5000mm (??? degree coverage) 
+    # Width = 25mm spacing * 16 tubes = 5000mm (??? degree coverage) 
     # Height = 1015mm (tube length)
     # Radius = 2400mm
     detector_active_height_mm 1015
@@ -114,6 +114,7 @@ proc ::histogram_memory::isc_initialize {} {
     set ::histogram_memory::histmem_axes(HOR) /instrument/detector/x_pixel_angular_offset
     set ::histogram_memory::histmem_axes(VER) /instrument/detector/y_pixel_offset
   } message ] {
+    clientput ERROR:([info level 0]) $message
     if {$::errorCode=="NONE"} {return $message}
     return -code error $message
   }