From 5b683ecbe047de0c030a87991553e79193a37b68 Mon Sep 17 00:00:00 2001
From: Ferdi Franceschini <ffr@ansto.gov.au>
Date: Thu, 10 May 2007 13:28:27 +1000
Subject: [PATCH] Fixed botched merge. The merge effectively created  duplicate
 setmode procs.

r1953 | ffr | 2007-05-10 13:28:27 +1000 (Thu, 10 May 2007) | 3 lines
---
 .../hrpd/config/hmm/hmm_configuration.tcl     | 63 +++++--------------
 1 file changed, 17 insertions(+), 46 deletions(-)

diff --git a/site_ansto/instrument/hrpd/config/hmm/hmm_configuration.tcl b/site_ansto/instrument/hrpd/config/hmm/hmm_configuration.tcl
index 92ce29d4..9900657c 100644
--- a/site_ansto/instrument/hrpd/config/hmm/hmm_configuration.tcl
+++ b/site_ansto/instrument/hrpd/config/hmm/hmm_configuration.tcl
@@ -14,49 +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.
-proc ::histogram_memory::setmode {mode} {
-  global cfPath;
-  hmm_mode $mode
-  switch $mode {
-    pulser {
-      _hmm_hor_channel_name tube_pair_number
-      _hmm_hor_axis tube_pair_number
-      _hmm_hor_axis_alias dcolindex
-      _hmm_vert_axis vertical_channel_number
-      _hmm_vert_axis_alias drowindex
-      hmm configure hmconfigscript "returnconfigfile $cfPath(hmm)/anstohm_full_MESYTEC_PULSER.xml"
-    }
-    calibration {
-      _hmm_hor_channel_name tube_pair_number
-      _hmm_hor_axis tube_pair_number
-      _hmm_hor_axis_alias dcolindex
-      _hmm_vert_axis vertical_channel_number
-      _hmm_vert_axis_alias drowindex
-      hmm configure hmconfigscript "returnconfigfile $cfPath(hmm)/anstohm_full_nofolding.xml"
-    }
-    normal -
-      default {
-        _hmm_hor_channel_name horizontal_channel_number
-        _hmm_hor_axis polar_angle
-        _hmm_hor_axis_alias dtheta
-        _hmm_vert_axis vertical_channel_number
-        _hmm_vert_axis_alias drowindex
-        hmm configure hmconfigscript "returnconfigfile $cfPath(hmm)/anstohm_full_folding.xml"
-      }
-  }
-}
-
 if {$sim_mode == "true"} {
   proc ::histogram_memory::hmm_initialize {} {
     hmm configure hmaddress http://das1-[SplitReply [instrument]]:8080;
@@ -76,8 +33,9 @@ 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} {
+proc ::histogram_memory::setmode {mode} {
   global cfPath;
+  hmm_mode $mode;
   set sim_mode [SplitReply [hmm_simulation]];
 
   switch $mode {
@@ -87,6 +45,11 @@ proc setmode {mode} {
         hmm configure oat_nxc_eff 64;
         hmm configure oat_ntc_eff 1;
       }
+      _hmm_hor_channel_name tube_pair_number
+      _hmm_hor_axis tube_pair_number
+      _hmm_hor_axis_alias dcolindex
+      _hmm_vert_axis vertical_channel_number
+      _hmm_vert_axis_alias drowindex
       hmm configure hmconfigscript "returnconfigfile $cfPath(hmm)/anstohm_full_MESYTEC_PULSER.xml"
     }
     calibration {
@@ -95,6 +58,11 @@ proc setmode {mode} {
         hmm configure oat_nxc_eff 64;
         hmm configure oat_ntc_eff 1;
       }
+      _hmm_hor_channel_name tube_pair_number
+      _hmm_hor_axis tube_pair_number
+      _hmm_hor_axis_alias dcolindex
+      _hmm_vert_axis vertical_channel_number
+      _hmm_vert_axis_alias drowindex
       hmm configure hmconfigscript "returnconfigfile $cfPath(hmm)/anstohm_full_nofolding.xml"
     }
     normal -
@@ -104,9 +72,12 @@ proc setmode {mode} {
           hmm configure oat_nxc_eff 128;
           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 vertical_channel_number
+        _hmm_vert_axis_alias drowindex
         hmm configure hmconfigscript "returnconfigfile $cfPath(hmm)/anstohm_full_folding.xml"
       }
   }
 }
-
-