lakeshore340_common.tcl

Now supports creation of multiple lakeshore controller objects.

hmm_configuration_common_1.tcl
SICS-275 histmem command now rejects invalid frame source arguments

hipd/config/environment/temperature/lakeshore340.tcl
Now supports creation of multiple lakeshore controller objects.

wombat_configuration.tcl
Added example which creates two lakeshore controllers.

rsd/config/motors/motor_configuration.tcl
SICS-276 Disable debug mode on sz motor.

r2694 | ffr | 2008-09-18 12:20:09 +1000 (Thu, 18 Sep 2008) | 15 lines

site_ansto/instrument/config/hmm/hmm_configuration_common_1.tcl

@@ -1,5 +1,5 @@
-# $Revision: 1.38 $
-# $Date: 2008-08-29 12:22:53 $
+# $Revision: 1.39 $
+# $Date: 2008-09-18 02:20:09 $
 # Author: Ferdi Franceschini
 # Based on the examples in the hs_test.tcl sample configuration by Mark Lesha.
 # http://gumtree.ansto.gov.au:9080/nbicms/bragg-systems/histogram-server/hs_test.tcl/view
@@ -18,6 +18,7 @@ namespace eval histogram_memory {
   # Common config variables
   variable histmem_simulation
   variable ic_count_methods
+  variable ic_fsrce_values
   variable preset_mult
   variable monitor_controlled
   variable oscmd_controlled
@@ -32,10 +33,12 @@ namespace eval histogram_memory {
   proc init_hmm_objs {} {
     variable histmem_simulation
     variable ic_count_methods
+    variable ic_fsrce_values
     variable default_frame_source_when_there_is_no_frame_signal
     variable default_frame_source_always_internal
 
     if [ catch {
+      set ic_fsrce_values [ list INTERNAL EXTERNAL ]
       set ic_count_methods [concat [list time unlimited period count frame] $::counter::isc_beam_monitor_list ]
       if {$histmem_simulation == "true"} {
         MakeHM hmm SIM
@@ -1471,7 +1474,12 @@ proc ::histogram_memory::get_frame_source {} {
 # @param srce EXTERNAL or INTERNAL
 # @param always_internal true or false (optional) (default false)
 proc ::histogram_memory::set_frame_source {srce} {
-  if [ catch {
+  variable ic_fsrce_values
+
+  if [ catch { 
+    if {[lsearch $ic_fsrce_values $srce] == -1} {
+      error "ERROR: $srce is invalid, valid values are \"$ic_fsrce_values\""
+    }
     if [::histogram_memory::frame_source_always_internal] {
       clientput "WARNING: The frame source is set to always_internal" value
       clientput "Use ::histogram_memory::frame_source_always_internal <true/false> to change this." value