From d8117b6b8b69addd7da65021e65cbf7834fe9aff Mon Sep 17 00:00:00 2001 From: Ferdi Franceschini Date: Thu, 4 Oct 2007 08:33:28 +1000 Subject: [PATCH] histogram_memory::setmode is obsolete. So it's gone. r2175 | ffr | 2007-10-04 08:33:28 +1000 (Thu, 04 Oct 2007) | 3 lines --- .../sans/config/hmm/hmm_configuration.tcl | 58 ------------------- .../instrument/sans/quokka_configuration.tcl | 7 +-- 2 files changed, 2 insertions(+), 63 deletions(-) diff --git a/site_ansto/instrument/sans/config/hmm/hmm_configuration.tcl b/site_ansto/instrument/sans/config/hmm/hmm_configuration.tcl index 55d5d229..41d56419 100644 --- a/site_ansto/instrument/sans/config/hmm/hmm_configuration.tcl +++ b/site_ansto/instrument/sans/config/hmm/hmm_configuration.tcl @@ -37,64 +37,6 @@ if {$sim_mode == "true"} { hmm configure hmDataPath ../HMData; } } -# 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} { - hmm_mode $mode; - set sim_mode [SplitReply [hmm_simulation]]; - - switch $mode { - pulser { - if {$sim_mode == "true"} { - hmm configure oat_nyc_eff 1024; - 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 [SplitReply [hmm_user_configpath]]/anstohm_full_MESYTEC_PULSER.xml" - } - calibration { - if {$sim_mode == "true"} { - hmm configure oat_nyc_eff 1024; - 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 [SplitReply [hmm_user_configpath]]/anstohm_full_nofolding.xml" - } - normal - - default { - if {$sim_mode == "true"} { - hmm configure oat_nyc_eff 512; - 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 - ::histogram_memory::configure_server Filler_defaults - } - } -} proc ::histogram_memory::initialize {} { ::histogram_memory::_initialize diff --git a/site_ansto/instrument/sans/quokka_configuration.tcl b/site_ansto/instrument/sans/quokka_configuration.tcl index b66eaad4..a6b6c3ec 100644 --- a/site_ansto/instrument/sans/quokka_configuration.tcl +++ b/site_ansto/instrument/sans/quokka_configuration.tcl @@ -1,5 +1,5 @@ -# $Revision: 1.4 $ -# $Date: 2007-08-20 22:54:45 $ +# $Revision: 1.5 $ +# $Date: 2007-10-03 22:33:28 $ # Author: Ferdi Franceschini (ffr@ansto.gov.au) # Last revision by: $Author: ffr $ @@ -34,9 +34,6 @@ 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::initialize MakeStateMon hmscan