From 51026a09af998534881e6d6aa8b4e35ff5217f6d Mon Sep 17 00:00:00 2001 From: Douglas Clowes Date: Thu, 20 Nov 2014 16:06:32 +1100 Subject: [PATCH] Pull various config files closer into alignment --- site_ansto/instrument/hipd/wombat_configuration.tcl | 8 ++------ site_ansto/instrument/hrpd/echidna_configuration.tcl | 8 ++------ site_ansto/instrument/pelican/pelican_configuration.tcl | 8 ++------ site_ansto/instrument/tas/taipan_configuration.tcl | 5 ----- 4 files changed, 6 insertions(+), 23 deletions(-) diff --git a/site_ansto/instrument/hipd/wombat_configuration.tcl b/site_ansto/instrument/hipd/wombat_configuration.tcl index b76b9bf7..13bd920b 100644 --- a/site_ansto/instrument/hipd/wombat_configuration.tcl +++ b/site_ansto/instrument/hipd/wombat_configuration.tcl @@ -40,12 +40,8 @@ fileeval $cfPath(environment)/temperature/sct_lakeshore_340.tcl fileeval $cfPath(environment)/temperature/ls340_sct.tcl fileeval $cfPath(environment)/temperature/sct_lakeshore_370.tcl fileeval $cfPath(environment)/temperature/lakeshore_m370_sct.tcl -fileeval $cfPath(environment)/temperature/mercury_base_sct.tcl -fileeval $cfPath(environment)/temperature/mercury_level_sct.tcl -fileeval $cfPath(environment)/temperature/mercury_pres_sct.tcl -fileeval $cfPath(environment)/temperature/mercury_scpi_sct.tcl -fileeval $cfPath(environment)/temperature/mercury_temp_sct.tcl -fileeval $cfPath(environment)/temperature/mercury_valve_sct.tcl +fileeval $cfPath(environment)/temperature/sct_oxford_itc.tcl +fileeval $cfPath(environment)/temperature/sct_oxford_mercury.tcl fileeval $cfPath(environment)/sct_protek_common.tcl fileeval $cfPath(environment)/protekmm_sct.tcl fileeval $cfPath(environment)/temperature/julabo_lh45_gen_sct.tcl diff --git a/site_ansto/instrument/hrpd/echidna_configuration.tcl b/site_ansto/instrument/hrpd/echidna_configuration.tcl index e677dde9..c5fb83ba 100644 --- a/site_ansto/instrument/hrpd/echidna_configuration.tcl +++ b/site_ansto/instrument/hrpd/echidna_configuration.tcl @@ -40,12 +40,8 @@ fileeval $cfPath(environment)/temperature/sct_lakeshore_340.tcl fileeval $cfPath(environment)/temperature/sct_ls340.tcl fileeval $cfPath(environment)/temperature/sct_lakeshore_370.tcl fileeval $cfPath(environment)/temperature/sct_lakeshore_m370.tcl -fileeval $cfPath(environment)/temperature/sct_mercury_base.tcl -fileeval $cfPath(environment)/temperature/sct_mercury_level.tcl -fileeval $cfPath(environment)/temperature/sct_mercury_pres.tcl -fileeval $cfPath(environment)/temperature/sct_mercury_scpi.tcl -fileeval $cfPath(environment)/temperature/sct_mercury_temp.tcl -fileeval $cfPath(environment)/temperature/sct_mercury_valve.tcl +fileeval $cfPath(environment)/temperature/sct_oxford_itc.tcl +fileeval $cfPath(environment)/temperature/sct_oxford_mercury.tcl fileeval $cfPath(environment)/sct_protek_common.tcl fileeval $cfPath(environment)/sct_protekmm.tcl fileeval $cfPath(environment)/temperature/west400.tcl diff --git a/site_ansto/instrument/pelican/pelican_configuration.tcl b/site_ansto/instrument/pelican/pelican_configuration.tcl index 3d528d0c..0f7487b1 100644 --- a/site_ansto/instrument/pelican/pelican_configuration.tcl +++ b/site_ansto/instrument/pelican/pelican_configuration.tcl @@ -42,12 +42,8 @@ fileeval $cfPath(environment)/temperature/sct_lakeshore_340.tcl fileeval $cfPath(environment)/temperature/ls340_sct.tcl fileeval $cfPath(environment)/temperature/sct_lakeshore_370.tcl fileeval $cfPath(environment)/temperature/lakeshore_m370_sct.tcl -fileeval $cfPath(environment)/temperature/mercury_base_sct.tcl -fileeval $cfPath(environment)/temperature/mercury_level_sct.tcl -fileeval $cfPath(environment)/temperature/mercury_pres_sct.tcl -fileeval $cfPath(environment)/temperature/mercury_scpi_sct.tcl -fileeval $cfPath(environment)/temperature/mercury_temp_sct.tcl -fileeval $cfPath(environment)/temperature/mercury_valve_sct.tcl +fileeval $cfPath(environment)/temperature/sct_oxford_itc.tcl +fileeval $cfPath(environment)/temperature/sct_oxford_mercury.tcl fileeval $cfPath(environment)/sct_protek_common.tcl fileeval $cfPath(environment)/protekmm_sct.tcl fileeval $cfPath(environment)/temperature/julabo_lh45_gen_sct.tcl diff --git a/site_ansto/instrument/tas/taipan_configuration.tcl b/site_ansto/instrument/tas/taipan_configuration.tcl index db303e04..870ca4e1 100644 --- a/site_ansto/instrument/tas/taipan_configuration.tcl +++ b/site_ansto/instrument/tas/taipan_configuration.tcl @@ -48,11 +48,6 @@ fileeval $cfPath(environment)/temperature/sct_ls340.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/mercury_base_sct.tcl -fileeval $cfPath(environment)/temperature/mercury_temp_sct.tcl -fileeval $cfPath(environment)/temperature/mercury_pres_sct.tcl -fileeval $cfPath(environment)/temperature/mercury_level_sct.tcl -fileeval $cfPath(environment)/temperature/mercury_valve_sct.tcl fileeval $cfPath(environment)/temperature/west400.tcl fileeval $cfPath(environment)/he3/sct_he3.tcl fileeval $cfPath(environment)/magneticField/oxford_labview.tcl