Updated kowari for new hdb and nexus code.

r2100 | ffr | 2007-07-22 15:58:52 +1000 (Sun, 22 Jul 2007) | 2 lines

site_ansto/instrument/rsd/config/INSTCFCOMMON.TXT

@@ -1,7 +1,10 @@
 config/plc/plc_common_1.tcl
 config/counter/counter_common_1.tcl
-config/hipadaba/common_hipadaba_configuration.tcl
+config/hipadaba/hipadaba_configuration_common.tcl
+config/hipadaba/common_instrument_dictionary.tcl
+config/hipadaba/instdict_specification.tcl
 config/hmm/hmm_configuration_common_1.tcl
+config/hmm/anstohm_linked.xml
 config/scan/scan_common_1.hdd
 config/scan/scan_common_1.tcl
 config/nexus/nxscripts_common_1.tcl

site_ansto/instrument/rsd/config/counter/counter.tcl

@@ -0,0 +1,17 @@
+set sim_mode [SplitReply [counter_simulation]]
+if {$sim_mode == "true"} {
+  MakeCounter bm SIM 0.0;
+} else {
+# Make and configure an ANSTO beam monitor counter.
+# This must be sourced before the hmm_configuration.tcl until we separate the scan setup from the hmm setup
+  MakeCounter bm anstomonitor [ params host "das1-[SplitReply [instrument]]" port "30000" ]
+}
+
+source $cfPath(counter)/counter_common_1.tcl
+unset sim_mode
+
+## TODO Put all the counter macros in the counter namespace
+namespace eval counter {
+  proc set_sobj_attributes {} {
+  }
+}

site_ansto/instrument/rsd/config/hipadaba/hipadaba_configuration.tcl

@@ -1 +1 @@
-source $cfPath(hipadaba)/common_hipadaba_configuration.tcl
+source $cfPath(hipadaba)/hipadaba_configuration_common.tcl

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

@@ -0,0 +1,84 @@
+set sim_mode [SplitReply [hmm_simulation]]
+if {$sim_mode == "true"} {
+  MakeHM hmm SIM;
+  namespace eval histogram_memory {
+    proc hmc {_start _preset _mode _pause} {
+      bm mode $_mode;
+      bm preset $_preset;
+      hmm countblock;
+    }
+  }
+} else {
+  MakeHM hmm anstohttp;
+  MakeHMControl_ANSTO hmc bm hmm;
+}
+
+source $cfPath(hmm)/hmm_configuration_common_1.tcl
+if {$sim_mode == "true"} {
+  proc ::histogram_memory::hmm_initialize {} {
+    hmm configure hmaddress http://das1-[SplitReply [instrument]]:8080;
+    hmm configure username spy;
+    hmm configure password 007;
+    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
+        OAT_TABLE X {-210.5 -209.5} Y {-110.5 -109.5} T {0 20000} NTC 5
+        ::histogram_memory::configure_server  Filler_defaults FASTCOMTEC
+      }
+  }
+}
+

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

@@ -1,5 +1,5 @@
-# $Revision: 1.10 $
+# $Revision: 1.11 $
-# $Date: 2007-07-05 01:56:58 $
+# $Date: 2007-07-22 05:58:52 $
 # Author: Ferdi Franceschini (ffr@ansto.gov.au)
 # Last revision by: $Author: ffr $
 
@@ -552,4 +552,6 @@ sth drivescript sthSet
 
 #--------------------------------------------------------
 
+proc motor_set_sobj_attributes {} {
+}
 # END MOTOR CONFIGURATION

site_ansto/instrument/rsd/config/nexus/nxscripts.tcl

@@ -0,0 +1 @@
+source $cfPath(nexus)/nxscripts_common_1.tcl

site_ansto/instrument/rsd/config/plc/plc.tcl

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

site_ansto/instrument/rsd/config/scan/scan.tcl

@@ -0,0 +1 @@
+source $cfPath(scan)/scan_common_1.tcl

site_ansto/instrument/rsd/kowari_configuration.tcl

@@ -1,10 +1,11 @@
-# $Revision: 1.5 $
+# $Revision: 1.6 $
-# $Date: 2007-05-07 05:30:02 $
+# $Date: 2007-07-22 05:58:51 $
 # Author: Ferdi Franceschini (ffr@ansto.gov.au)
 # Last revision by: $Author: ffr $
 
 # Required by server_config.tcl 
 VarMake Instrument Text Internal 
+sicslist setatt Instrument privilege internal
 Instrument kowari 
 Instrument lock
 
@@ -16,12 +17,10 @@ source server_config.tcl
 
 ########################################
 # INSTRUMENT SPECIFIC CONFIGURATION
-set hmm_mode normal
+#set hmm_mode normal
 
 fileeval $cfPath(motors)/motor_configuration.tcl
 
-########
-
 fileeval $cfPath(plc)/plc.tcl
 fileeval $cfPath(counter)/counter.tcl
 fileeval $cfPath(hmm)/hmm_configuration.tcl
@@ -30,7 +29,12 @@ fileeval $cfPath(scan)/scan.tcl
 source $cfPath(hipadaba)/hipadaba_configuration.tcl
 source gumxml.tcl
 
-MakeStateMon hmscan 
+#::histogram_memory::setmode pulser
+#::histogram_memory::setmode calibration
+::histogram_memory::setmode normal
+#::histogram_memory::hmm_initialize
+::histogram_memory::hmm_setup transparent 0 3 oat_nyc_eff  oat_nxc_eff oat_ntc_eff
+hmm_start 0
 
 VarMake detector_active_height_mm Float User
 detector_active_height_mm 200.0
@@ -54,5 +58,22 @@ detector_type lock
 
 detector_description This detects Kowaris
 detector_description lock
+MakeStateMon hmscan 
 
+proc instrument_set_sobj_attributes {} {
+
+    motor_set_sobj_attributes 
+    ::utility::set_motor_attributes
+    ::utility::set_histomem_attributes
+    ::utility::set_sobj_attributes
+    ::counter::set_sobj_attributes 
+    ::nexus::set_sobj_attributes 
+    ::histogram_memory::set_sobj_attributes 
+## TODO move the following to the new ansto gumxml.tcl
+    sicslist setatt getgumtreexml privilege internal
+}
+
+instrument_set_sobj_attributes 
+buildHDB instrument_dictionary
+#buildHDB [instname]_dictionary
 fileeval extraconfig.tcl