sct_julabo_lh45.tcl

Create object when in simulation mode

nxscripts_common_1.tcl
Set units attributes on script context objects data

sans aperture_configuration.tcl
Update rotary attenuator lookup table. Set parameters when motors positions are
within tolerance of the lookup table positions.

sans, parameters.tcl sct_velsel.tcl
Set units and update parameter names to be consistent

quokka_configuration.tcl
Add convenience command to load environment controllers.

server_config.tcl
Make sure that controllers are properly generated when loading them from the ext
raconfig.tcl.

r2881 | ffr | 2010-01-29 16:50:51 +1100 (Fri, 29 Jan 2010) | 20 lines

site_ansto/instrument/server_config.tcl

@@ -221,7 +221,7 @@ proc server_set_sobj_attributes {} {
 }
 
 proc server_init {} {
-  if [ catch {
+  set catch_status [ catch {
     ::source::isc_initialize
     ::counter::isc_initialize
     ::histogram_memory::isc_initialize
@@ -245,20 +245,12 @@ proc server_init {} {
     sicslist setatt sics_suid nxsave true
     sicslist setatt sics_suid long_name sics_suid 
 
+    if [file exists ../extraconfig.tcl] {
+      fileeval ../extraconfig.tcl
+    }
     server_set_sobj_attributes
+    buildHDB instrument_dictionary
 
-  } message ] {
-    return -code error $message
-  } else {
-
-      if [ catch {
-        if [file exists ../extraconfig.tcl] {
-          fileeval ../extraconfig.tcl
-        }
-        buildHDB instrument_dictionary
-      } message ] {
-        return -code error $message
-      }
-      return $message
-  }
+  } message ]
+  handle_exception $catch_status $message
 }