From eddabe79c4f529b30620a750c70125ce35b65a51 Mon Sep 17 00:00:00 2001 From: Douglas Clowes Date: Wed, 19 Sep 2012 13:51:37 +1000 Subject: [PATCH] merge back changes from instrument r3740 | dcl | 2012-09-19 13:51:37 +1000 (Wed, 19 Sep 2012) | 1 line --- site_ansto/instrument/hipd/config/INSTCFCOMMON.TXT | 3 +++ site_ansto/instrument/hipd/wombat_configuration.tcl | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/site_ansto/instrument/hipd/config/INSTCFCOMMON.TXT b/site_ansto/instrument/hipd/config/INSTCFCOMMON.TXT index 852883ad..a009ef39 100644 --- a/site_ansto/instrument/hipd/config/INSTCFCOMMON.TXT +++ b/site_ansto/instrument/hipd/config/INSTCFCOMMON.TXT @@ -5,6 +5,9 @@ config/counter/counter_common_1.tcl config/environment/temperature/sct_oxford_itc.tcl config/environment/temperature/sct_eurotherm_2000.tcl config/environment/temperature/sct_lakeshore_336.tcl +config/environment/temperature/sct_lakeshore_340.tcl +config/environment/temperature/sct_julabo_lh45.tcl +config/environment/temperature/sct_qlink.tcl config/environment/temperature/west400.tcl config/environment/magneticField/sct_oxford_labview.tcl config/environment/magneticField/sct_green_magnet.tcl diff --git a/site_ansto/instrument/hipd/wombat_configuration.tcl b/site_ansto/instrument/hipd/wombat_configuration.tcl index 3c0b236c..0027aa8a 100644 --- a/site_ansto/instrument/hipd/wombat_configuration.tcl +++ b/site_ansto/instrument/hipd/wombat_configuration.tcl @@ -30,7 +30,7 @@ fileeval $cfPath(environment)/temperature/sct_lakeshore_340.tcl fileeval $cfPath(environment)/temperature/sct_julabo_lh45.tcl fileeval $cfPath(environment)/temperature/sct_qlink.tcl fileeval $cfPath(environment)/temperature/west400.tcl -fileeval $cfPath(environment)/magneticField/oxford_labview.tcl +fileeval $cfPath(environment)/magneticField/sct_oxford_labview.tcl fileeval $cfPath(environment)/magneticField/sct_green_magnet.tcl fileeval $cfPath(hmm)/hmm_configuration.tcl fileeval $cfPath(nexus)/nxscripts.tcl