From 86b99280d425313bd6802f4cfbf8da31ed74beb2 Mon Sep 17 00:00:00 2001
From: Ferdi Franceschini <ffr@ansto.gov.au>
Date: Tue, 8 May 2007 14:59:26 +1000
Subject: [PATCH] Merged the simulation mode setup from the trunk with the
 modified setmode command from the branch.

r1945 | ffr | 2007-05-08 14:59:26 +1000 (Tue, 08 May 2007) | 2 lines
---
 .../hipd/config/hmm/hmm_configuration.tcl     | 59 +++++++++----------
 1 file changed, 27 insertions(+), 32 deletions(-)

diff --git a/site_ansto/instrument/hipd/config/hmm/hmm_configuration.tcl b/site_ansto/instrument/hipd/config/hmm/hmm_configuration.tcl
index 12be0edf..5724ae3c 100644
--- a/site_ansto/instrument/hipd/config/hmm/hmm_configuration.tcl
+++ b/site_ansto/instrument/hipd/config/hmm/hmm_configuration.tcl
@@ -14,19 +14,6 @@ if {$sim_mode == "true"} {
 }
 
 source $cfPath(hmm)/hmm_configuration_common_1.tcl 
-# Configure to upload a complete configuration to the histogram server.
-# In this case it's the main config file plus the FAT, BAT and OAT files
-# in the same direcory as the SICS executable (for this example).
-# Alternatives:
-# - A partial config could be uploaded instead - e.g. just the main config file,
-# in that case the main config file points to a set of FAT, BAT OAT files
-# located on the server.
-# - The histogram server could configure itself from a config file set
-# kept on the local file system (not automated presently, manual control only)
-# - Or, no configuration at all could be uploaded, the
-# histogram server can configure itself using its default config files.
-hmm configure hmconfigscript "returnconfigfile $cfPath(hmm)/anstohm_full.xml"
-
 if {$sim_mode == "true"} {
   proc ::histogram_memory::hmm_initialize {} {
     hmm configure hmaddress http://das1-[SplitReply [instrument]]:8080;
@@ -46,10 +33,10 @@ if {$sim_mode == "true"} {
 # kept on the local file system (not automated presently, manual control only)
 # - Or, no configuration at all could be uploaded, the
 # histogram server can configure itself using its default config files.
-proc setmode {mode} {
-  global cfPath;
-  set sim_mode [SplitReply [hmm_simulation]];
-
+proc ::histogram_memory::setmode {mode} {
+    global cfPath;
+    hmm_mode $mode;
+    set sim_mode [SplitReply [hmm_simulation]];
   switch $mode {
     pulser {
       if {$sim_mode == "true"} {
@@ -57,7 +44,12 @@ proc setmode {mode} {
         hmm configure stitch_nxc [expr 480*8 - 1];
         hmm configure oat_ntc_eff 1;
       }
-      hmm configure hmconfigscript "returnconfigfile $cfPath(hmm)/anstohm_full_pulser.xml"
+      _hmm_hor_channel_name horizontal_channel_number;
+      _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 {
       if {$sim_mode == "true"} {
@@ -65,23 +57,26 @@ proc setmode {mode} {
         hmm configure stitch_nxc [expr 480*8 - 1];
         hmm configure oat_ntc_eff 1;
       }
-      hmm configure hmconfigscript "returnconfigfile $cfPath(hmm)/anstohm_full_calibration.xml"
+      _hmm_hor_channel_name horizontal_channel_number;
+      _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 {
-      if {$sim_mode == "true"} {
-        hmm configure stitch_nyc 512;
-        hmm configure stitch_nxc [expr 480*8 - 1];
-        hmm configure oat_ntc_eff 1;
-      }
-        #hmm configure hmconfigscript "returnconfigfile $cfPath(hmm)/anstohm_full_normal.xml"
-        hmm configure hmconfigscript "returnconfigfile $cfPath(hmm)/anstohm_full_small.xml"
+        if {$sim_mode == "true"} {
+          hmm configure stitch_nyc 512;
+          hmm configure stitch_nxc [expr 480*8 - 1];
+          hmm configure oat_ntc_eff 1;
+        }
+        _hmm_hor_channel_name horizontal_channel_number;
+        _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";
       }
   }
 }
-
-
-setmode $hmm_mode
-::histogram_memory::hmm_initialize
-::histogram_memory::hmm_setup transparent 7000000 3 stitch_nyc  stitch_nxc oat_ntc_eff
-hmm_start 0