Merged Release 1.2

r1897 | ffr | 2007-04-20 11:53:31 +1000 (Fri, 20 Apr 2007) | 2 lines

site_ansto/instrument/hrpd/config/INSTCFCOMMON.TXT

@@ -1,3 +1,4 @@
+config/plc/plc_common_1.tcl
 config/counter/counter_common_1.tcl
 config/hipadaba/common_hipadaba_configuration.tcl
 config/hmm/hmm_configuration_common_1.tcl

site_ansto/instrument/hrpd/config/hipadaba/hpaths.tcl

@@ -13,14 +13,14 @@ aperture slits ]
 # Configurable virtual motors
 # obj name path master_obj
 set cvirtmotor_hpath [list \
-ss1vg ss1vg  slits/first top\
-ss1vo ss1vo  slits/first top\
-ss1hg ss1hg  slits/first right\
-ss1ho ss1ho  slits/first right\
-ss2vg ss2vg  slits/second top\
-ss2vo ss2vo  slits/second top\
-ss2hg ss2hg  slits/second right\
-ss2ho ss2ho  slits/second right\
+ss1vg ss1vg  slits/first [list top bottom left right]\
+ss1vo ss1vo  slits/first [list top bottom left right]\
+ss1hg ss1hg  slits/first [list top bottom left right]\
+ss1ho ss1ho  slits/first [list top bottom left right]\
+ss2vg ss2vg  slits/second [list top bottom left right]\
+ss2vo ss2vo  slits/second [list top bottom left right]\
+ss2hg ss2hg  slits/second [list top bottom left right]\
+ss2ho ss2ho  slits/second [list top bottom left right]\
 sth sth  sample [SplitReply [stth long_name]]\
 mth mth  monochromator [SplitReply [mtth long_name]]]
 

site_ansto/instrument/hrpd/config/hmm/hmm_configuration.tcl

@@ -14,6 +14,32 @@ 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 setmode {mode} {
+  global cfPath;
+switch $mode {
+  pulser {
+    hmm configure hmconfigscript "returnconfigfile $cfPath(hmm)/anstohm_full_MESYTEC_PULSER.xml"
+  }
+  calibration {
+    hmm configure hmconfigscript "returnconfigfile $cfPath(hmm)/anstohm_full_nofolding.xml"
+  }
+  normal -
+  default {
+    hmm configure hmconfigscript "returnconfigfile $cfPath(hmm)/anstohm_full_folding.xml"
+  }
+}
+}
 
 if {$sim_mode == "true"} {
   proc ::histogram_memory::hmm_initialize {} {

site_ansto/instrument/hrpd/config/motors/motor_configuration.tcl

@@ -1,5 +1,5 @@
-# $Revision: 1.14 $
-# $Date: 2007-04-06 09:32:57 $
+# $Revision: 1.15 $
+# $Date: 2007-04-20 01:53:31 $
 # Author: Ferdi Franceschini (ffr@ansto.gov.au)
 # Last revision by: $Author: ffr $
 
@@ -91,7 +91,7 @@ set ss2d_HiRange [expr $vSlitHome + $vSlitLoRange]
 
 # set movecount high to reduce the frequency of
 # hnotify messages to a reasonable level
-set move_count 100
+set move_count 10
 
 ############################
 # Motor Controller 1

site_ansto/instrument/hrpd/config/plc/plc.tcl

@@ -0,0 +1,5 @@
+MakeMultiChan plc_chan 137.157.204.65 30002
+MakeSafetyPLC plc plc_chan 0
+
+source $cfPath(plc)/plc_common_1.tcl
+

site_ansto/instrument/hrpd/echidna_configuration.tcl

@@ -1,7 +1,7 @@
-# $Revision: 1.21 $
-# $Date: 2007-04-17 23:32:34 $
+# $Revision: 1.22 $
+# $Date: 2007-04-20 01:53:31 $
 # Author: Ferdi Franceschini (ffr@ansto.gov.au)
-# Last revision by: $Author: dcl $
+# Last revision by: $Author: ffr $
 
 # Required by server_config.tcl 
 VarMake Instrument Text Internal 
@@ -25,6 +25,7 @@ fileeval $cfPath(motors)/motor_configuration.tcl
 
 ########
 
+fileeval $cfPath(plc)/plc.tcl
 fileeval $cfPath(counter)/counter.tcl
 fileeval $cfPath(hmm)/hmm_configuration.tcl
 fileeval $cfPath(nexus)/nxscripts.tcl
@@ -72,5 +73,3 @@ detector_description lock
 
 fileeval extraconfig.tcl
 
-MakeMultiChan plc_chan 137.157.204.65 30002
-MakeSafetyPLC plc plc_chan 0