merge back changes from instrument

r3740 | dcl | 2012-09-19 13:51:37 +1000 (Wed, 19 Sep 2012) | 1 line
This commit is contained in:
Douglas Clowes
2012-09-19 13:51:37 +10:00
parent a59f088761
commit eddabe79c4
2 changed files with 4 additions and 1 deletions

View File

@@ -5,6 +5,9 @@ config/counter/counter_common_1.tcl
config/environment/temperature/sct_oxford_itc.tcl config/environment/temperature/sct_oxford_itc.tcl
config/environment/temperature/sct_eurotherm_2000.tcl config/environment/temperature/sct_eurotherm_2000.tcl
config/environment/temperature/sct_lakeshore_336.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/temperature/west400.tcl
config/environment/magneticField/sct_oxford_labview.tcl config/environment/magneticField/sct_oxford_labview.tcl
config/environment/magneticField/sct_green_magnet.tcl config/environment/magneticField/sct_green_magnet.tcl

View File

@@ -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_julabo_lh45.tcl
fileeval $cfPath(environment)/temperature/sct_qlink.tcl fileeval $cfPath(environment)/temperature/sct_qlink.tcl
fileeval $cfPath(environment)/temperature/west400.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(environment)/magneticField/sct_green_magnet.tcl
fileeval $cfPath(hmm)/hmm_configuration.tcl fileeval $cfPath(hmm)/hmm_configuration.tcl
fileeval $cfPath(nexus)/nxscripts.tcl fileeval $cfPath(nexus)/nxscripts.tcl