Merging release 2.0 branch with CVS trunk

r2601 | ffr | 2008-05-30 10:26:57 +1000 (Fri, 30 May 2008) | 2 lines

site_ansto/instrument/sans/quokka_configuration.tcl

@@ -1,5 +1,5 @@
-# $Revision: 1.6 $
-# $Date: 2007-10-23 02:42:52 $
+# $Revision: 1.7 $
+# $Date: 2008-05-30 00:26:56 $
 # Author: Ferdi Franceschini (ffr@ansto.gov.au)
 # Last revision by: $Author: ffr $
 
@@ -17,26 +17,38 @@ source server_config.tcl
 ########################################
 # INSTRUMENT SPECIFIC CONFIGURATION
 
+source $cfPath(hipadaba)/hipadaba_configuration.tcl
+fileeval $cfPath(nexus)/nxscripts.tcl
+fileeval $cfPath(parameters)/parameters.tcl
 fileeval $cfPath(velsel)/velsel.tcl
 fileeval $cfPath(motors)/motor_configuration.tcl
-
-########
-# Parameters set above the restore command will be clobbered by
-# the values in the status.tcl file
-restore
-
 fileeval $cfPath(plc)/plc.tcl
 fileeval $cfPath(optics)/optics.tcl
 fileeval $cfPath(counter)/counter.tcl
 fileeval $cfPath(hmm)/hmm_configuration.tcl
-fileeval $cfPath(nexus)/nxscripts.tcl
+fileeval $cfPath(hmm)/detector.tcl
 fileeval $cfPath(scan)/scan.tcl
-source $cfPath(hipadaba)/hipadaba_configuration.tcl
+fileeval $cfPath(commands)/commands.tcl
+fileeval $cfPath(anticollider)/anticollider.tcl
 source gumxml.tcl
 
+
+########
+# Parameters set above the restore command will be clobbered by
+# the values in the status.tcl file
+# BIG WARNING: DON'T PUT 'restore' IN A CATCH BLOCK BECAUSE IT RETURNS
+# AN ERROR IF THERE IS NO ../log/status.tcl FILE.
+restore
+
 ::histogram_memory::initialize
 
 MakeStateMon hmscan
-fileeval extraconfig.tcl
+if [file exists extraconfig.tcl] {
+  fileeval extraconfig.tcl
+} else {
+  clientput "extraconfig.tcl not found. continueing"
+}
+
+::anticollider::init
 server_set_sobj_attributes
 buildHDB instrument_dictionary