From 3e33a7b8b2ccafd501befa9cfacff0153da2f07f Mon Sep 17 00:00:00 2001
From: Ferdi Franceschini <ffr@ansto.gov.au>
Date: Mon, 6 May 2013 20:13:36 +1000
Subject: [PATCH] Merged in-situ modifications from ics1-taipan.

---
 .../instrument/tas/config/INSTCFCOMMON.TXT    |  2 ++
 .../instrument/tas/taipan_configuration.tcl   | 31 +++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/site_ansto/instrument/tas/config/INSTCFCOMMON.TXT b/site_ansto/instrument/tas/config/INSTCFCOMMON.TXT
index 7a2eb6b7..ba8cc12f 100644
--- a/site_ansto/instrument/tas/config/INSTCFCOMMON.TXT
+++ b/site_ansto/instrument/tas/config/INSTCFCOMMON.TXT
@@ -2,12 +2,14 @@ config/source/source_common.tcl
 config/anticollider/anticollider_common.tcl
 config/plc/plc_common_1.tcl
 config/counter/counter_common_1.tcl
+config/environment/he3/sct_he3.tcl
 config/environment/temperature/sct_eurotherm_2000.tcl
 config/environment/temperature/sct_julabo_lh45.tcl
 config/environment/temperature/sct_lakeshore_336.tcl
 config/environment/temperature/sct_lakeshore_340.tcl
 config/environment/temperature/sct_lakeshore_370.tcl
 config/environment/temperature/sct_oxford_itc.tcl
+config/environment/temperature/sct_oxford_mercury.tcl
 config/environment/temperature/west400.tcl
 config/hipadaba/hipadaba_configuration_common.tcl
 config/hipadaba/common_instrument_dictionary.tcl
diff --git a/site_ansto/instrument/tas/taipan_configuration.tcl b/site_ansto/instrument/tas/taipan_configuration.tcl
index 5f4a3ef1..7ad80a1f 100644
--- a/site_ansto/instrument/tas/taipan_configuration.tcl
+++ b/site_ansto/instrument/tas/taipan_configuration.tcl
@@ -42,8 +42,11 @@ fileeval $cfPath(environment)/temperature/sct_lakeshore_336.tcl
 fileeval $cfPath(environment)/temperature/sct_lakeshore_340.tcl
 fileeval $cfPath(environment)/temperature/sct_lakeshore_370.tcl
 fileeval $cfPath(environment)/temperature/sct_oxford_itc.tcl
+fileeval $cfPath(environment)/temperature/sct_oxford_mercury.tcl
 fileeval $cfPath(environment)/temperature/west400.tcl
+fileeval $cfPath(environment)/he3/sct_he3.tcl
 fileeval $cfPath(environment)/magneticField/oxford_labview.tcl
+fileeval config/load_setup.tcl
 fileeval log.tcl
 publish logbook spy
 source gumxml.tcl
@@ -62,10 +65,38 @@ puts "done tasub"
 
 MakeDiffScan
 
+load_setup ../taipan_setup.txt
 server_init
 ###########################################
 # WARNING: Do not add any code below server_init, if you do SICS may fail to initialise properly.
 
+# Provide tasmot notifications to GumTree when real motors move
+hchain /sample/ei /instrument/crystal/m2
+hchain /sample/en /instrument/crystal/m2
+hchain /sample/ki /instrument/crystal/m2
+hchain /sample/qh /instrument/crystal/m2
+hchain /sample/qk /instrument/crystal/m2
+hchain /sample/ql /instrument/crystal/m2
+hchain /sample/qm /instrument/crystal/m2
+
+hchain /sample/qh /sample/s1
+hchain /sample/qk /sample/s1
+hchain /sample/ql /sample/s1
+hchain /sample/qm /sample/s1
+
+hchain /sample/qh /sample/s2
+hchain /sample/qk /sample/s2
+hchain /sample/ql /sample/s2
+hchain /sample/qm /sample/s2
+
+hchain /sample/ef /instrument/detector/a2
+hchain /sample/en /instrument/detector/a2
+hchain /sample/kf /instrument/detector/a2
+hchain /sample/qh /instrument/detector/a2
+hchain /sample/qk /instrument/detector/a2
+hchain /sample/ql /instrument/detector/a2
+hchain /sample/qm /instrument/detector/a2
+
 # fix all motors 
 if {0} {
     foreach m [sicslist type motor] {