From b558f9d696913d1b9a0dca9917911a8ee53db570 Mon Sep 17 00:00:00 2001 From: Douglas Clowes Date: Mon, 24 Feb 2014 14:17:06 +1100 Subject: [PATCH] Add files to Echidna manifest and configuration to reflect changes out there --- site_ansto/instrument/hrpd/config/INSTCFCOMMON.TXT | 7 ++++++- site_ansto/instrument/hrpd/echidna_configuration.tcl | 5 +++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/site_ansto/instrument/hrpd/config/INSTCFCOMMON.TXT b/site_ansto/instrument/hrpd/config/INSTCFCOMMON.TXT index 9cc6cf7b..7592c1df 100644 --- a/site_ansto/instrument/hrpd/config/INSTCFCOMMON.TXT +++ b/site_ansto/instrument/hrpd/config/INSTCFCOMMON.TXT @@ -3,9 +3,14 @@ config/anticollider/anticollider_common.tcl config/plc/plc_common_1.tcl config/counter/counter_common_1.tcl config/environment/sct_keithley_2700.tcl -config/environment/temperature/sct_lakeshore_340.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_oxford_mercury.tcl +config/environment/temperature/sct_watlow_pm.tcl config/environment/temperature/west400.tcl +config/environment/magneticField/sct_oxford_labview.tcl +config/environment/magneticField/sct_green_magnet.tcl config/hipadaba/hipadaba_configuration_common.tcl config/hipadaba/common_instrument_dictionary.tcl config/hipadaba/instdict_specification.tcl diff --git a/site_ansto/instrument/hrpd/echidna_configuration.tcl b/site_ansto/instrument/hrpd/echidna_configuration.tcl index 0101042a..4fadaefd 100644 --- a/site_ansto/instrument/hrpd/echidna_configuration.tcl +++ b/site_ansto/instrument/hrpd/echidna_configuration.tcl @@ -26,10 +26,15 @@ fileeval $cfPath(motors)/positmotor_configuration.tcl fileeval $cfPath(plc)/plc.tcl fileeval $cfPath(counter)/counter.tcl #TODO Provide method for choosing environment controller +fileeval $cfPath(environment)/temperature/sct_eurotherm_2000.tcl +fileeval $cfPath(environment)/sct_keithley_2700.tcl +fileeval $cfPath(environment)/magneticField/sct_green_magnet.tcl fileeval $cfPath(environment)/sct_keithley_2700.tcl fileeval $cfPath(environment)/temperature/sct_lakeshore_336.tcl fileeval $cfPath(environment)/temperature/sct_lakeshore_340.tcl +fileeval $cfPath(environment)/temperature/sct_oxford_mercury.tcl fileeval $cfPath(environment)/temperature/west400.tcl +fileeval $cfPath(environment)/temperature/sct_watlow_pm.tcl fileeval $cfPath(hmm)/hmm_configuration.tcl fileeval $cfPath(nexus)/nxscripts.tcl fileeval $cfPath(scan)/scan.tcl