From 972e3232cda39443ef130419499fbb5053f28792 Mon Sep 17 00:00:00 2001 From: Douglas Clowes Date: Wed, 23 Jul 2014 17:30:44 +1000 Subject: [PATCH] Change the names in all of the files --- .../instrument/bilby/bilby_configuration.tcl | 2 +- .../instrument/bilby/config/INSTCFCOMMON.TXT | 2 +- .../config/chopper/astrium_chopper_sct.tcl | 4 +- .../config/motors/motor_configuration.tcl | 4 +- .../bilby/config/motors/shutters_sct.tcl | 4 +- .../bilby/config/motors/tank_sct.tcl | 4 +- .../config/environment/agilent_33220A_sct.tcl | 4 +- .../config/environment/hiden_xcs_sct.tcl | 4 +- .../config/environment/huber_pilot_sct.tcl | 4 +- .../config/environment/isotech_ps_sct.tcl | 4 +- .../config/environment/keithley_m2700_sct.tcl | 4 +- .../environment/magneticField/tsi_smc_sct.tcl | 4 +- .../config/environment/nhq_200_sct.tcl | 4 +- .../config/environment/omron_hldc_sct.tcl | 4 +- .../config/environment/protekmm_sct.tcl | 4 +- .../temperature/eurotherm_m2000_sct.tcl | 4 +- .../temperature/julabo_lh45_gen_sct.tcl | 4 +- .../temperature/lakeshore_218_sct.tcl | 4 +- .../temperature/lakeshore_m370_sct.tcl | 4 +- .../environment/temperature/ls336_sct.tcl | 4 +- .../environment/temperature/ls340_sct.tcl | 4 +- .../temperature/mercury_base_sct.tcl | 4 +- .../temperature/mercury_level_sct.tcl | 4 +- .../temperature/mercury_pres_sct.tcl | 4 +- .../temperature/mercury_scpi_sct.tcl | 4 +- .../temperature/mercury_temp_sct.tcl | 4 +- .../temperature/mercury_valve_sct.tcl | 4 +- .../environment/temperature/nprvasm2_sct.tcl | 4 +- .../temperature/pfeiffer_hg_sct.tcl | 4 +- .../temperature/watlow_mpm_sct.tcl | 4 +- .../temperature/watlow_mrm_sct.tcl | 4 +- .../temperature/watlow_mst4_sct.tcl | 4 +- .../environment/temperature/west4100_sct.tcl | 4 +- .../config/source/reactor_status_sct.tcl | 4 +- .../instrument/config/source/source.tcl | 2 +- .../instrument/dingo/config/INSTCFCOMMON.TXT | 2 +- .../instrument/hipd/config/INSTCFCOMMON.TXT | 2 +- .../instrument/hipd/wombat_configuration.tcl | 26 ++++++------ .../instrument/hrpd/config/INSTCFCOMMON.TXT | 2 +- .../instrument/hrpd/echidna_configuration.tcl | 2 +- .../kookaburra/config/INSTCFCOMMON.TXT | 2 +- .../kookaburra/kookaburra_configuration.tcl | 2 +- .../lyrebird/config/INSTCFCOMMON.TXT | 2 +- .../pelican/config/INSTCFCOMMON.TXT | 2 +- .../pelican/pelican_configuration.tcl | 2 +- .../reflectometer/config/INSTCFCOMMON.TXT | 2 +- .../reflectometer/platypus_configuration.tcl | 2 +- .../instrument/rsd/config/INSTCFCOMMON.TXT | 2 +- .../instrument/sans/config/INSTCFCOMMON.TXT | 2 +- .../instrument/sans/quokka_configuration.tcl | 40 +++++++++---------- .../instrument/tas/config/INSTCFCOMMON.TXT | 2 +- .../instrument/tas/taipan_configuration.tcl | 10 ++--- 52 files changed, 119 insertions(+), 119 deletions(-) diff --git a/site_ansto/instrument/bilby/bilby_configuration.tcl b/site_ansto/instrument/bilby/bilby_configuration.tcl index 795358f4..22553f05 100644 --- a/site_ansto/instrument/bilby/bilby_configuration.tcl +++ b/site_ansto/instrument/bilby/bilby_configuration.tcl @@ -24,7 +24,7 @@ fileeval $cfPath(velsel)/velsel.tcl fileeval $cfPath(parameters)/parameters.tcl fileeval $cfPath(plc)/plc.tcl fileeval $cfPath(chopper)/chopper.tcl -fileeval $cfPath(chopper)/sct_astrium_chopper.tcl +fileeval $cfPath(chopper)/astrium_chopper_sct.tcl fileeval $cfPath(optics)/optics.tcl fileeval $cfPath(counter)/counter.tcl fileeval $cfPath(environment)/temperature/sct_lakeshore_340.tcl diff --git a/site_ansto/instrument/bilby/config/INSTCFCOMMON.TXT b/site_ansto/instrument/bilby/config/INSTCFCOMMON.TXT index 35af79de..a1104828 100644 --- a/site_ansto/instrument/bilby/config/INSTCFCOMMON.TXT +++ b/site_ansto/instrument/bilby/config/INSTCFCOMMON.TXT @@ -1,4 +1,4 @@ -config/source/sct_reactor_status.tcl +config/source/reactor_status_sct.tcl config/source/source.tcl config/anticollider/anticollider_common.tcl config/plc/plc_common_1.tcl diff --git a/site_ansto/instrument/bilby/config/chopper/astrium_chopper_sct.tcl b/site_ansto/instrument/bilby/config/chopper/astrium_chopper_sct.tcl index 775c0a43..8544b9c5 100644 --- a/site_ansto/instrument/bilby/config/chopper/astrium_chopper_sct.tcl +++ b/site_ansto/instrument/bilby/config/chopper/astrium_chopper_sct.tcl @@ -561,8 +561,8 @@ proc add_astrium_chopper {name IP port} { handle_exception ${catch_status} ${catch_message} } -clientput "file evaluation of sct_astrium_chopper.tcl" -::scobj::astrium_chopper::sics_log 9 "file evaluation of sct_astrium_chopper.tcl" +clientput "file evaluation of astrium_chopper_sct.tcl" +::scobj::astrium_chopper::sics_log 9 "file evaluation of astrium_chopper_sct.tcl" proc ::scobj::astrium_chopper::read_config {} { set catch_status [ catch { diff --git a/site_ansto/instrument/bilby/config/motors/motor_configuration.tcl b/site_ansto/instrument/bilby/config/motors/motor_configuration.tcl index e07a12e9..a026c437 100644 --- a/site_ansto/instrument/bilby/config/motors/motor_configuration.tcl +++ b/site_ansto/instrument/bilby/config/motors/motor_configuration.tcl @@ -1,7 +1,7 @@ # @file Loads the generated_motor_configuration.tcl file which is created by util/genmotconf.tcl from CSV files. fileeval config/motors/generated_motor_configuration.tcl -fileeval config/motors/sct_shutters.tcl -fileeval config/motors/sct_tank.tcl +fileeval config/motors/shutters_sct.tcl +fileeval config/motors/tank_sct.tcl add_shutters shutters aqadapter mc4 add_tank tank aqadapter mc8 # Motors which should not be driven should be set as "fixed" here. diff --git a/site_ansto/instrument/bilby/config/motors/shutters_sct.tcl b/site_ansto/instrument/bilby/config/motors/shutters_sct.tcl index 64fe832b..afaebfc2 100644 --- a/site_ansto/instrument/bilby/config/motors/shutters_sct.tcl +++ b/site_ansto/instrument/bilby/config/motors/shutters_sct.tcl @@ -299,8 +299,8 @@ proc add_shutters {name IP port} { handle_exception ${catch_status} ${catch_message} } -clientput "file evaluation of sct_shutters.tcl" -::scobj::shutters::sics_log 9 "file evaluation of sct_shutters.tcl" +clientput "file evaluation of shutters_sct.tcl" +::scobj::shutters::sics_log 9 "file evaluation of shutters_sct.tcl" proc ::scobj::shutters::read_config {} { set catch_status [ catch { diff --git a/site_ansto/instrument/bilby/config/motors/tank_sct.tcl b/site_ansto/instrument/bilby/config/motors/tank_sct.tcl index 08f2bd51..8a7fe69a 100644 --- a/site_ansto/instrument/bilby/config/motors/tank_sct.tcl +++ b/site_ansto/instrument/bilby/config/motors/tank_sct.tcl @@ -334,8 +334,8 @@ proc add_tank {name IP port} { handle_exception ${catch_status} ${catch_message} } -clientput "file evaluation of sct_tank.tcl" -::scobj::tank::sics_log 9 "file evaluation of sct_tank.tcl" +clientput "file evaluation of tank_sct.tcl" +::scobj::tank::sics_log 9 "file evaluation of tank_sct.tcl" proc ::scobj::tank::read_config {} { set catch_status [ catch { diff --git a/site_ansto/instrument/config/environment/agilent_33220A_sct.tcl b/site_ansto/instrument/config/environment/agilent_33220A_sct.tcl index e0668a36..4936c550 100644 --- a/site_ansto/instrument/config/environment/agilent_33220A_sct.tcl +++ b/site_ansto/instrument/config/environment/agilent_33220A_sct.tcl @@ -74,8 +74,8 @@ proc add_agilent_33220A {name IP port} { handle_exception ${catch_status} ${catch_message} } -clientput "file evaluation of sct_agilent_33220A.tcl" -::scobj::agilent_33220A::sics_log 9 "file evaluation of sct_agilent_33220A.tcl" +clientput "file evaluation of agilent_33220A_sct.tcl" +::scobj::agilent_33220A::sics_log 9 "file evaluation of agilent_33220A_sct.tcl" proc ::scobj::agilent_33220A::read_config {} { set catch_status [ catch { diff --git a/site_ansto/instrument/config/environment/hiden_xcs_sct.tcl b/site_ansto/instrument/config/environment/hiden_xcs_sct.tcl index 3dca8897..858af454 100644 --- a/site_ansto/instrument/config/environment/hiden_xcs_sct.tcl +++ b/site_ansto/instrument/config/environment/hiden_xcs_sct.tcl @@ -1150,8 +1150,8 @@ proc add_hiden_xcs {name IP port id} { handle_exception ${catch_status} ${catch_message} } -clientput "file evaluation of sct_hiden_xcs.tcl" -::scobj::hiden_xcs::sics_log 9 "file evaluation of sct_hiden_xcs.tcl" +clientput "file evaluation of hiden_xcs_sct.tcl" +::scobj::hiden_xcs::sics_log 9 "file evaluation of hiden_xcs_sct.tcl" proc ::scobj::hiden_xcs::read_config {} { set catch_status [ catch { diff --git a/site_ansto/instrument/config/environment/huber_pilot_sct.tcl b/site_ansto/instrument/config/environment/huber_pilot_sct.tcl index 52e6f55f..91d74aa2 100644 --- a/site_ansto/instrument/config/environment/huber_pilot_sct.tcl +++ b/site_ansto/instrument/config/environment/huber_pilot_sct.tcl @@ -454,8 +454,8 @@ proc add_huber_pilot {name IP port} { handle_exception ${catch_status} ${catch_message} } -clientput "file evaluation of sct_huber_pilot.tcl" -::scobj::huber_pilot::sics_log 9 "file evaluation of sct_huber_pilot.tcl" +clientput "file evaluation of huber_pilot_sct.tcl" +::scobj::huber_pilot::sics_log 9 "file evaluation of huber_pilot_sct.tcl" proc ::scobj::huber_pilot::read_config {} { set catch_status [ catch { diff --git a/site_ansto/instrument/config/environment/isotech_ps_sct.tcl b/site_ansto/instrument/config/environment/isotech_ps_sct.tcl index fe4088f6..ff6a49e6 100644 --- a/site_ansto/instrument/config/environment/isotech_ps_sct.tcl +++ b/site_ansto/instrument/config/environment/isotech_ps_sct.tcl @@ -339,8 +339,8 @@ proc add_isotech_ps {name IP port} { handle_exception ${catch_status} ${catch_message} } -clientput "file evaluation of sct_isotech_ps.tcl" -::scobj::isotech_ps::sics_log 9 "file evaluation of sct_isotech_ps.tcl" +clientput "file evaluation of isotech_ps_sct.tcl" +::scobj::isotech_ps::sics_log 9 "file evaluation of isotech_ps_sct.tcl" proc ::scobj::isotech_ps::read_config {} { set catch_status [ catch { diff --git a/site_ansto/instrument/config/environment/keithley_m2700_sct.tcl b/site_ansto/instrument/config/environment/keithley_m2700_sct.tcl index 6f278a2a..f6be76f3 100644 --- a/site_ansto/instrument/config/environment/keithley_m2700_sct.tcl +++ b/site_ansto/instrument/config/environment/keithley_m2700_sct.tcl @@ -74,8 +74,8 @@ proc add_keithley_m2700 {name IP port id datype tol} { handle_exception ${catch_status} ${catch_message} } -clientput "file evaluation of sct_keithley_m2700.tcl" -::scobj::keithley_m2700::sics_log 9 "file evaluation of sct_keithley_m2700.tcl" +clientput "file evaluation of keithley_m2700_sct.tcl" +::scobj::keithley_m2700::sics_log 9 "file evaluation of keithley_m2700_sct.tcl" proc ::scobj::keithley_m2700::read_config {} { set catch_status [ catch { diff --git a/site_ansto/instrument/config/environment/magneticField/tsi_smc_sct.tcl b/site_ansto/instrument/config/environment/magneticField/tsi_smc_sct.tcl index 1cab0f7e..6c4b024f 100644 --- a/site_ansto/instrument/config/environment/magneticField/tsi_smc_sct.tcl +++ b/site_ansto/instrument/config/environment/magneticField/tsi_smc_sct.tcl @@ -518,8 +518,8 @@ proc add_tsi_smc {name IP port {id 1}} { handle_exception ${catch_status} ${catch_message} } -clientput "file evaluation of sct_tsi_smc.tcl" -::scobj::tsi_smc::sics_log 9 "file evaluation of sct_tsi_smc.tcl" +clientput "file evaluation of tsi_smc_sct.tcl" +::scobj::tsi_smc::sics_log 9 "file evaluation of tsi_smc_sct.tcl" proc ::scobj::tsi_smc::read_config {} { set catch_status [ catch { diff --git a/site_ansto/instrument/config/environment/nhq_200_sct.tcl b/site_ansto/instrument/config/environment/nhq_200_sct.tcl index fe1ce39e..7d161357 100644 --- a/site_ansto/instrument/config/environment/nhq_200_sct.tcl +++ b/site_ansto/instrument/config/environment/nhq_200_sct.tcl @@ -701,8 +701,8 @@ proc add_nhq_200 {name IP port} { handle_exception ${catch_status} ${catch_message} } -clientput "file evaluation of sct_nhq_200.tcl" -::scobj::nhq_200::sics_log 9 "file evaluation of sct_nhq_200.tcl" +clientput "file evaluation of nhq_200_sct.tcl" +::scobj::nhq_200::sics_log 9 "file evaluation of nhq_200_sct.tcl" proc ::scobj::nhq_200::read_config {} { set catch_status [ catch { diff --git a/site_ansto/instrument/config/environment/omron_hldc_sct.tcl b/site_ansto/instrument/config/environment/omron_hldc_sct.tcl index 50254576..6f5dc80a 100644 --- a/site_ansto/instrument/config/environment/omron_hldc_sct.tcl +++ b/site_ansto/instrument/config/environment/omron_hldc_sct.tcl @@ -266,8 +266,8 @@ proc add_omron_hldc {name IP port} { handle_exception ${catch_status} ${catch_message} } -clientput "file evaluation of sct_omron_hldc.tcl" -::scobj::omron_hldc::sics_log 9 "file evaluation of sct_omron_hldc.tcl" +clientput "file evaluation of omron_hldc_sct.tcl" +::scobj::omron_hldc::sics_log 9 "file evaluation of omron_hldc_sct.tcl" proc ::scobj::omron_hldc::read_config {} { set catch_status [ catch { diff --git a/site_ansto/instrument/config/environment/protekmm_sct.tcl b/site_ansto/instrument/config/environment/protekmm_sct.tcl index 9c8581cb..08de6742 100644 --- a/site_ansto/instrument/config/environment/protekmm_sct.tcl +++ b/site_ansto/instrument/config/environment/protekmm_sct.tcl @@ -74,8 +74,8 @@ proc add_protekmm {name IP port id datype} { handle_exception ${catch_status} ${catch_message} } -clientput "file evaluation of sct_protekmm.tcl" -::scobj::protekmm::sics_log 9 "file evaluation of sct_protekmm.tcl" +clientput "file evaluation of protekmm_sct.tcl" +::scobj::protekmm::sics_log 9 "file evaluation of protekmm_sct.tcl" proc ::scobj::protekmm::read_config {} { set catch_status [ catch { diff --git a/site_ansto/instrument/config/environment/temperature/eurotherm_m2000_sct.tcl b/site_ansto/instrument/config/environment/temperature/eurotherm_m2000_sct.tcl index c443fa26..f7c14efb 100644 --- a/site_ansto/instrument/config/environment/temperature/eurotherm_m2000_sct.tcl +++ b/site_ansto/instrument/config/environment/temperature/eurotherm_m2000_sct.tcl @@ -74,8 +74,8 @@ proc add_eurotherm_m2000 {name IP port id datype dev_id tol} { handle_exception ${catch_status} ${catch_message} } -clientput "file evaluation of sct_eurotherm_m2000.tcl" -::scobj::eurotherm_m2000::sics_log 9 "file evaluation of sct_eurotherm_m2000.tcl" +clientput "file evaluation of eurotherm_m2000_sct.tcl" +::scobj::eurotherm_m2000::sics_log 9 "file evaluation of eurotherm_m2000_sct.tcl" proc ::scobj::eurotherm_m2000::read_config {} { set catch_status [ catch { diff --git a/site_ansto/instrument/config/environment/temperature/julabo_lh45_gen_sct.tcl b/site_ansto/instrument/config/environment/temperature/julabo_lh45_gen_sct.tcl index 6fe8aa75..69d34d38 100644 --- a/site_ansto/instrument/config/environment/temperature/julabo_lh45_gen_sct.tcl +++ b/site_ansto/instrument/config/environment/temperature/julabo_lh45_gen_sct.tcl @@ -637,8 +637,8 @@ proc add_julabo_lh45_gen {name IP port {id 1} {ctrl_sensor "bath"} {tol 5.0}} { handle_exception ${catch_status} ${catch_message} } -clientput "file evaluation of sct_julabo_lh45_gen.tcl" -::scobj::julabo_lh45_gen::sics_log 9 "file evaluation of sct_julabo_lh45_gen.tcl" +clientput "file evaluation of julabo_lh45_gen_sct.tcl" +::scobj::julabo_lh45_gen::sics_log 9 "file evaluation of julabo_lh45_gen_sct.tcl" proc ::scobj::julabo_lh45_gen::read_config {} { set catch_status [ catch { diff --git a/site_ansto/instrument/config/environment/temperature/lakeshore_218_sct.tcl b/site_ansto/instrument/config/environment/temperature/lakeshore_218_sct.tcl index 88a5c78a..bc375748 100644 --- a/site_ansto/instrument/config/environment/temperature/lakeshore_218_sct.tcl +++ b/site_ansto/instrument/config/environment/temperature/lakeshore_218_sct.tcl @@ -332,8 +332,8 @@ proc add_lakeshore_218 {name IP port} { handle_exception ${catch_status} ${catch_message} } -clientput "file evaluation of sct_lakeshore_218.tcl" -::scobj::lakeshore_218::sics_log 9 "file evaluation of sct_lakeshore_218.tcl" +clientput "file evaluation of lakeshore_218_sct.tcl" +::scobj::lakeshore_218::sics_log 9 "file evaluation of lakeshore_218_sct.tcl" proc ::scobj::lakeshore_218::read_config {} { set catch_status [ catch { diff --git a/site_ansto/instrument/config/environment/temperature/lakeshore_m370_sct.tcl b/site_ansto/instrument/config/environment/temperature/lakeshore_m370_sct.tcl index 85f56563..ad1951ea 100644 --- a/site_ansto/instrument/config/environment/temperature/lakeshore_m370_sct.tcl +++ b/site_ansto/instrument/config/environment/temperature/lakeshore_m370_sct.tcl @@ -74,8 +74,8 @@ proc add_lakeshore_m370 {name IP port tol} { handle_exception ${catch_status} ${catch_message} } -clientput "file evaluation of sct_lakeshore_m370.tcl" -::scobj::lakeshore_m370::sics_log 9 "file evaluation of sct_lakeshore_m370.tcl" +clientput "file evaluation of lakeshore_m370_sct.tcl" +::scobj::lakeshore_m370::sics_log 9 "file evaluation of lakeshore_m370_sct.tcl" proc ::scobj::lakeshore_m370::read_config {} { set catch_status [ catch { diff --git a/site_ansto/instrument/config/environment/temperature/ls336_sct.tcl b/site_ansto/instrument/config/environment/temperature/ls336_sct.tcl index 8d4dc858..ce1f6923 100644 --- a/site_ansto/instrument/config/environment/temperature/ls336_sct.tcl +++ b/site_ansto/instrument/config/environment/temperature/ls336_sct.tcl @@ -74,8 +74,8 @@ proc add_ls336 {name IP port id datype {tol1 1.0} {tol2 1.0}} { handle_exception ${catch_status} ${catch_message} } -clientput "file evaluation of sct_ls336.tcl" -::scobj::ls336::sics_log 9 "file evaluation of sct_ls336.tcl" +clientput "file evaluation of ls336_sct.tcl" +::scobj::ls336::sics_log 9 "file evaluation of ls336_sct.tcl" proc ::scobj::ls336::read_config {} { set catch_status [ catch { diff --git a/site_ansto/instrument/config/environment/temperature/ls340_sct.tcl b/site_ansto/instrument/config/environment/temperature/ls340_sct.tcl index bf33673a..cebc7620 100644 --- a/site_ansto/instrument/config/environment/temperature/ls340_sct.tcl +++ b/site_ansto/instrument/config/environment/temperature/ls340_sct.tcl @@ -74,8 +74,8 @@ proc add_ls340 {name IP port id datype {tol1 1.0} {tol2 1.0}} { handle_exception ${catch_status} ${catch_message} } -clientput "file evaluation of sct_ls340.tcl" -::scobj::ls340::sics_log 9 "file evaluation of sct_ls340.tcl" +clientput "file evaluation of ls340_sct.tcl" +::scobj::ls340::sics_log 9 "file evaluation of ls340_sct.tcl" proc ::scobj::ls340::read_config {} { set catch_status [ catch { diff --git a/site_ansto/instrument/config/environment/temperature/mercury_base_sct.tcl b/site_ansto/instrument/config/environment/temperature/mercury_base_sct.tcl index 4d9e5e7a..5584bf31 100644 --- a/site_ansto/instrument/config/environment/temperature/mercury_base_sct.tcl +++ b/site_ansto/instrument/config/environment/temperature/mercury_base_sct.tcl @@ -544,8 +544,8 @@ proc add_mercury_base {name IP port {id 99} {tol 1}} { handle_exception ${catch_status} ${catch_message} } -clientput "file evaluation of sct_mercury_base.tcl" -::scobj::mercury_base::sics_log 9 "file evaluation of sct_mercury_base.tcl" +clientput "file evaluation of mercury_base_sct.tcl" +::scobj::mercury_base::sics_log 9 "file evaluation of mercury_base_sct.tcl" proc ::scobj::mercury_base::read_config {} { set catch_status [ catch { diff --git a/site_ansto/instrument/config/environment/temperature/mercury_level_sct.tcl b/site_ansto/instrument/config/environment/temperature/mercury_level_sct.tcl index f4f8dcd9..64e6d174 100644 --- a/site_ansto/instrument/config/environment/temperature/mercury_level_sct.tcl +++ b/site_ansto/instrument/config/environment/temperature/mercury_level_sct.tcl @@ -219,8 +219,8 @@ proc add_mercury_level {name IP port {id 99}} { handle_exception ${catch_status} ${catch_message} } -clientput "file evaluation of sct_mercury_level.tcl" -::scobj::mercury_level::sics_log 9 "file evaluation of sct_mercury_level.tcl" +clientput "file evaluation of mercury_level_sct.tcl" +::scobj::mercury_level::sics_log 9 "file evaluation of mercury_level_sct.tcl" proc ::scobj::mercury_level::read_config {} { set catch_status [ catch { diff --git a/site_ansto/instrument/config/environment/temperature/mercury_pres_sct.tcl b/site_ansto/instrument/config/environment/temperature/mercury_pres_sct.tcl index 1d4d1211..2ab67732 100644 --- a/site_ansto/instrument/config/environment/temperature/mercury_pres_sct.tcl +++ b/site_ansto/instrument/config/environment/temperature/mercury_pres_sct.tcl @@ -385,8 +385,8 @@ proc add_mercury_pres {name IP port {id 99} {tol 1}} { handle_exception ${catch_status} ${catch_message} } -clientput "file evaluation of sct_mercury_pres.tcl" -::scobj::mercury_pres::sics_log 9 "file evaluation of sct_mercury_pres.tcl" +clientput "file evaluation of mercury_pres_sct.tcl" +::scobj::mercury_pres::sics_log 9 "file evaluation of mercury_pres_sct.tcl" proc ::scobj::mercury_pres::read_config {} { set catch_status [ catch { diff --git a/site_ansto/instrument/config/environment/temperature/mercury_scpi_sct.tcl b/site_ansto/instrument/config/environment/temperature/mercury_scpi_sct.tcl index ca49ac1e..db1977c7 100644 --- a/site_ansto/instrument/config/environment/temperature/mercury_scpi_sct.tcl +++ b/site_ansto/instrument/config/environment/temperature/mercury_scpi_sct.tcl @@ -740,8 +740,8 @@ proc add_mercury_scpi {name IP port {id 99} {permlink LT} {tol 1} {valve_tol 2}} handle_exception ${catch_status} ${catch_message} } -clientput "file evaluation of sct_mercury_scpi.tcl" -::scobj::mercury_scpi::sics_log 9 "file evaluation of sct_mercury_scpi.tcl" +clientput "file evaluation of mercury_scpi_sct.tcl" +::scobj::mercury_scpi::sics_log 9 "file evaluation of mercury_scpi_sct.tcl" proc ::scobj::mercury_scpi::read_config {} { set catch_status [ catch { diff --git a/site_ansto/instrument/config/environment/temperature/mercury_temp_sct.tcl b/site_ansto/instrument/config/environment/temperature/mercury_temp_sct.tcl index 923e653d..afd7385b 100644 --- a/site_ansto/instrument/config/environment/temperature/mercury_temp_sct.tcl +++ b/site_ansto/instrument/config/environment/temperature/mercury_temp_sct.tcl @@ -390,8 +390,8 @@ proc add_mercury_temp {name IP port {id 99} {tol 1}} { handle_exception ${catch_status} ${catch_message} } -clientput "file evaluation of sct_mercury_temp.tcl" -::scobj::mercury_temp::sics_log 9 "file evaluation of sct_mercury_temp.tcl" +clientput "file evaluation of mercury_temp_sct.tcl" +::scobj::mercury_temp::sics_log 9 "file evaluation of mercury_temp_sct.tcl" proc ::scobj::mercury_temp::read_config {} { set catch_status [ catch { diff --git a/site_ansto/instrument/config/environment/temperature/mercury_valve_sct.tcl b/site_ansto/instrument/config/environment/temperature/mercury_valve_sct.tcl index 73944488..364c9900 100644 --- a/site_ansto/instrument/config/environment/temperature/mercury_valve_sct.tcl +++ b/site_ansto/instrument/config/environment/temperature/mercury_valve_sct.tcl @@ -339,8 +339,8 @@ proc add_mercury_valve {name IP port {id 99} {valve_tol 2}} { handle_exception ${catch_status} ${catch_message} } -clientput "file evaluation of sct_mercury_valve.tcl" -::scobj::mercury_valve::sics_log 9 "file evaluation of sct_mercury_valve.tcl" +clientput "file evaluation of mercury_valve_sct.tcl" +::scobj::mercury_valve::sics_log 9 "file evaluation of mercury_valve_sct.tcl" proc ::scobj::mercury_valve::read_config {} { set catch_status [ catch { diff --git a/site_ansto/instrument/config/environment/temperature/nprvasm2_sct.tcl b/site_ansto/instrument/config/environment/temperature/nprvasm2_sct.tcl index a5d27553..f7b1b21f 100644 --- a/site_ansto/instrument/config/environment/temperature/nprvasm2_sct.tcl +++ b/site_ansto/instrument/config/environment/temperature/nprvasm2_sct.tcl @@ -74,8 +74,8 @@ proc add_nprvasm2 {name IP port {tol 1.0}} { handle_exception ${catch_status} ${catch_message} } -clientput "file evaluation of sct_nprvasm2.tcl" -::scobj::nprvasm2::sics_log 9 "file evaluation of sct_nprvasm2.tcl" +clientput "file evaluation of nprvasm2_sct.tcl" +::scobj::nprvasm2::sics_log 9 "file evaluation of nprvasm2_sct.tcl" proc ::scobj::nprvasm2::read_config {} { set catch_status [ catch { diff --git a/site_ansto/instrument/config/environment/temperature/pfeiffer_hg_sct.tcl b/site_ansto/instrument/config/environment/temperature/pfeiffer_hg_sct.tcl index 623d8fa5..153ba758 100644 --- a/site_ansto/instrument/config/environment/temperature/pfeiffer_hg_sct.tcl +++ b/site_ansto/instrument/config/environment/temperature/pfeiffer_hg_sct.tcl @@ -489,8 +489,8 @@ proc add_pfeiffer_hg {name IP port} { handle_exception ${catch_status} ${catch_message} } -clientput "file evaluation of sct_pfeiffer_hg.tcl" -::scobj::pfeiffer_hg::sics_log 9 "file evaluation of sct_pfeiffer_hg.tcl" +clientput "file evaluation of pfeiffer_hg_sct.tcl" +::scobj::pfeiffer_hg::sics_log 9 "file evaluation of pfeiffer_hg_sct.tcl" proc ::scobj::pfeiffer_hg::read_config {} { set catch_status [ catch { diff --git a/site_ansto/instrument/config/environment/temperature/watlow_mpm_sct.tcl b/site_ansto/instrument/config/environment/temperature/watlow_mpm_sct.tcl index 132762fd..e70c9da2 100644 --- a/site_ansto/instrument/config/environment/temperature/watlow_mpm_sct.tcl +++ b/site_ansto/instrument/config/environment/temperature/watlow_mpm_sct.tcl @@ -74,8 +74,8 @@ proc add_watlow_mpm {name IP port id datype dev_id tol} { handle_exception ${catch_status} ${catch_message} } -clientput "file evaluation of sct_watlow_mpm.tcl" -::scobj::watlow_mpm::sics_log 9 "file evaluation of sct_watlow_mpm.tcl" +clientput "file evaluation of watlow_mpm_sct.tcl" +::scobj::watlow_mpm::sics_log 9 "file evaluation of watlow_mpm_sct.tcl" proc ::scobj::watlow_mpm::read_config {} { set catch_status [ catch { diff --git a/site_ansto/instrument/config/environment/temperature/watlow_mrm_sct.tcl b/site_ansto/instrument/config/environment/temperature/watlow_mrm_sct.tcl index 03ecb75c..a4c548b0 100644 --- a/site_ansto/instrument/config/environment/temperature/watlow_mrm_sct.tcl +++ b/site_ansto/instrument/config/environment/temperature/watlow_mrm_sct.tcl @@ -74,8 +74,8 @@ proc add_watlow_mrm {name IP port id datype dev_id tol} { handle_exception ${catch_status} ${catch_message} } -clientput "file evaluation of sct_watlow_mrm.tcl" -::scobj::watlow_mrm::sics_log 9 "file evaluation of sct_watlow_mrm.tcl" +clientput "file evaluation of watlow_mrm_sct.tcl" +::scobj::watlow_mrm::sics_log 9 "file evaluation of watlow_mrm_sct.tcl" proc ::scobj::watlow_mrm::read_config {} { set catch_status [ catch { diff --git a/site_ansto/instrument/config/environment/temperature/watlow_mst4_sct.tcl b/site_ansto/instrument/config/environment/temperature/watlow_mst4_sct.tcl index cfabdd2a..a1e57a31 100644 --- a/site_ansto/instrument/config/environment/temperature/watlow_mst4_sct.tcl +++ b/site_ansto/instrument/config/environment/temperature/watlow_mst4_sct.tcl @@ -74,8 +74,8 @@ proc add_watlow_mst4 {name IP port id datype dev_id tol} { handle_exception ${catch_status} ${catch_message} } -clientput "file evaluation of sct_watlow_mst4.tcl" -::scobj::watlow_mst4::sics_log 9 "file evaluation of sct_watlow_mst4.tcl" +clientput "file evaluation of watlow_mst4_sct.tcl" +::scobj::watlow_mst4::sics_log 9 "file evaluation of watlow_mst4_sct.tcl" proc ::scobj::watlow_mst4::read_config {} { set catch_status [ catch { diff --git a/site_ansto/instrument/config/environment/temperature/west4100_sct.tcl b/site_ansto/instrument/config/environment/temperature/west4100_sct.tcl index e65bc7a5..fdd2be3d 100644 --- a/site_ansto/instrument/config/environment/temperature/west4100_sct.tcl +++ b/site_ansto/instrument/config/environment/temperature/west4100_sct.tcl @@ -74,8 +74,8 @@ proc add_west4100 {name IP port dev_id} { handle_exception ${catch_status} ${catch_message} } -clientput "file evaluation of sct_west4100.tcl" -::scobj::west4100::sics_log 9 "file evaluation of sct_west4100.tcl" +clientput "file evaluation of west4100_sct.tcl" +::scobj::west4100::sics_log 9 "file evaluation of west4100_sct.tcl" proc ::scobj::west4100::read_config {} { set catch_status [ catch { diff --git a/site_ansto/instrument/config/source/reactor_status_sct.tcl b/site_ansto/instrument/config/source/reactor_status_sct.tcl index 62b4a7c4..0162b3fa 100644 --- a/site_ansto/instrument/config/source/reactor_status_sct.tcl +++ b/site_ansto/instrument/config/source/reactor_status_sct.tcl @@ -338,8 +338,8 @@ proc add_reactor_status {name IP port} { handle_exception ${catch_status} ${catch_message} } -clientput "file evaluation of sct_reactor_status.tcl" -::scobj::reactor_status::sics_log 9 "file evaluation of sct_reactor_status.tcl" +clientput "file evaluation of reactor_status_sct.tcl" +::scobj::reactor_status::sics_log 9 "file evaluation of reactor_status_sct.tcl" proc ::scobj::reactor_status::read_config {} { set catch_status [ catch { diff --git a/site_ansto/instrument/config/source/source.tcl b/site_ansto/instrument/config/source/source.tcl index 3aca40ae..9e10ab08 100644 --- a/site_ansto/instrument/config/source/source.tcl +++ b/site_ansto/instrument/config/source/source.tcl @@ -1,4 +1,4 @@ -fileeval $cfPath(source)/sct_reactor_status.tcl +fileeval $cfPath(source)/reactor_status_sct.tcl if {[SplitReply [opal_simulation]]=="false"} { MakeAsyncQueue aqreactor OPALSTAT neutron.ansto.gov.au 80 diff --git a/site_ansto/instrument/dingo/config/INSTCFCOMMON.TXT b/site_ansto/instrument/dingo/config/INSTCFCOMMON.TXT index 3e405f6f..7d186c93 100644 --- a/site_ansto/instrument/dingo/config/INSTCFCOMMON.TXT +++ b/site_ansto/instrument/dingo/config/INSTCFCOMMON.TXT @@ -1,4 +1,4 @@ -config/source/sct_reactor_status.tcl +config/source/reactor_status_sct.tcl config/environment/ config/source/source.tcl config/anticollider/anticollider_common.tcl diff --git a/site_ansto/instrument/hipd/config/INSTCFCOMMON.TXT b/site_ansto/instrument/hipd/config/INSTCFCOMMON.TXT index 3f54d2b1..e6b5b86c 100644 --- a/site_ansto/instrument/hipd/config/INSTCFCOMMON.TXT +++ b/site_ansto/instrument/hipd/config/INSTCFCOMMON.TXT @@ -1,4 +1,4 @@ -config/source/sct_reactor_status.tcl +config/source/reactor_status_sct.tcl config/source/source.tcl config/anticollider/anticollider_common.tcl config/plc/plc_common_1.tcl diff --git a/site_ansto/instrument/hipd/wombat_configuration.tcl b/site_ansto/instrument/hipd/wombat_configuration.tcl index 87529b6f..98d1e1d9 100644 --- a/site_ansto/instrument/hipd/wombat_configuration.tcl +++ b/site_ansto/instrument/hipd/wombat_configuration.tcl @@ -25,28 +25,28 @@ fileeval $cfPath(source)/source.tcl fileeval $cfPath(motors)/positmotor_configuration.tcl fileeval $cfPath(plc)/plc.tcl fileeval $cfPath(counter)/counter.tcl -fileeval $cfPath(environment)/sct_agilent_33220A.tcl -fileeval $cfPath(environment)/sct_hiden_xcs.tcl -fileeval $cfPath(environment)/sct_huber_pilot.tcl -fileeval $cfPath(environment)/sct_isotech_ps.tcl +fileeval $cfPath(environment)/agilent_33220A_sct.tcl +fileeval $cfPath(environment)/hiden_xcs_sct.tcl +fileeval $cfPath(environment)/huber_pilot_sct.tcl +fileeval $cfPath(environment)/isotech_ps_sct.tcl fileeval $cfPath(environment)/temperature/sct_eurotherm_2000.tcl -fileeval $cfPath(environment)/temperature/sct_eurotherm_m2000.tcl +fileeval $cfPath(environment)/temperature/eurotherm_m2000_sct.tcl fileeval $cfPath(environment)/sct_keithley_2700.tcl -fileeval $cfPath(environment)/sct_keithley_m2700.tcl -fileeval $cfPath(environment)/sct_lakeshore_218.tcl +fileeval $cfPath(environment)/keithley_m2700_sct.tcl +fileeval $cfPath(environment)/lakeshore_218_sct.tcl fileeval $cfPath(environment)/temperature/sct_lakeshore_336.tcl -fileeval $cfPath(environment)/temperature/sct_ls336.tcl +fileeval $cfPath(environment)/temperature/ls336_sct.tcl fileeval $cfPath(environment)/temperature/sct_lakeshore_340.tcl -fileeval $cfPath(environment)/temperature/sct_ls340.tcl +fileeval $cfPath(environment)/temperature/ls340_sct.tcl fileeval $cfPath(environment)/temperature/sct_lakeshore_370.tcl -fileeval $cfPath(environment)/sct_lakeshore_m370.tcl -fileeval $cfPath(environment)/temperature/sct_mercury_scpi.tcl +fileeval $cfPath(environment)/lakeshore_m370_sct.tcl +fileeval $cfPath(environment)/temperature/mercury_scpi_sct.tcl fileeval $cfPath(environment)/sct_protek_common.tcl -fileeval $cfPath(environment)/sct_protekmm.tcl +fileeval $cfPath(environment)/protekmm_sct.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)/temperature/sct_west4100.tcl +fileeval $cfPath(environment)/temperature/west4100_sct.tcl fileeval $cfPath(environment)/temperature/sct_oxford_mercury.tcl fileeval $cfPath(environment)/magneticField/sct_oxford_labview.tcl fileeval $cfPath(environment)/he3/sct_he3.tcl diff --git a/site_ansto/instrument/hrpd/config/INSTCFCOMMON.TXT b/site_ansto/instrument/hrpd/config/INSTCFCOMMON.TXT index 65034522..0c5a2a5f 100644 --- a/site_ansto/instrument/hrpd/config/INSTCFCOMMON.TXT +++ b/site_ansto/instrument/hrpd/config/INSTCFCOMMON.TXT @@ -1,4 +1,4 @@ -config/source/sct_reactor_status.tcl +config/source/reactor_status_sct.tcl config/source/source.tcl config/anticollider/anticollider_common.tcl config/plc/plc_common_1.tcl diff --git a/site_ansto/instrument/hrpd/echidna_configuration.tcl b/site_ansto/instrument/hrpd/echidna_configuration.tcl index 53e296b6..9735a669 100644 --- a/site_ansto/instrument/hrpd/echidna_configuration.tcl +++ b/site_ansto/instrument/hrpd/echidna_configuration.tcl @@ -34,7 +34,7 @@ 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/sct_mercury_scpi.tcl +fileeval $cfPath(environment)/temperature/mercury_scpi_sct.tcl fileeval $cfPath(environment)/temperature/west400.tcl fileeval $cfPath(environment)/temperature/sct_watlow_pm.tcl fileeval $cfPath(hmm)/hmm_configuration.tcl diff --git a/site_ansto/instrument/kookaburra/config/INSTCFCOMMON.TXT b/site_ansto/instrument/kookaburra/config/INSTCFCOMMON.TXT index 212655af..6b54da5d 100644 --- a/site_ansto/instrument/kookaburra/config/INSTCFCOMMON.TXT +++ b/site_ansto/instrument/kookaburra/config/INSTCFCOMMON.TXT @@ -1,4 +1,4 @@ -config/source/sct_reactor_status.tcl +config/source/reactor_status_sct.tcl config/environment/ config/source/source.tcl config/anticollider/anticollider_common.tcl diff --git a/site_ansto/instrument/kookaburra/kookaburra_configuration.tcl b/site_ansto/instrument/kookaburra/kookaburra_configuration.tcl index 40d330f1..fe18bdd0 100644 --- a/site_ansto/instrument/kookaburra/kookaburra_configuration.tcl +++ b/site_ansto/instrument/kookaburra/kookaburra_configuration.tcl @@ -23,7 +23,7 @@ fileeval $cfPath(motors)/motor_configuration.tcl #fileeval $cfPath(motors)/extraconfig.tcl fileeval $cfPath(plc)/plc.tcl fileeval $cfPath(counter)/counter.tcl -#fileeval $cfPath(environment)/temperature/sct_lakeshore_218.tcl +#fileeval $cfPath(environment)/temperature/lakeshore_218_sct.tcl fileeval $cfPath(counter)/sct_bm.tcl fileeval $cfPath(hmm)/hmm_configuration.tcl fileeval $cfPath(nexus)/nxscripts.tcl diff --git a/site_ansto/instrument/lyrebird/config/INSTCFCOMMON.TXT b/site_ansto/instrument/lyrebird/config/INSTCFCOMMON.TXT index a469882a..439d3d45 100644 --- a/site_ansto/instrument/lyrebird/config/INSTCFCOMMON.TXT +++ b/site_ansto/instrument/lyrebird/config/INSTCFCOMMON.TXT @@ -1,4 +1,4 @@ -config/source/sct_reactor_status.tcl +config/source/reactor_status_sct.tcl config/environment/ config/source/source.tcl config/anticollider/anticollider_common.tcl diff --git a/site_ansto/instrument/pelican/config/INSTCFCOMMON.TXT b/site_ansto/instrument/pelican/config/INSTCFCOMMON.TXT index edacec40..7ebce2e7 100644 --- a/site_ansto/instrument/pelican/config/INSTCFCOMMON.TXT +++ b/site_ansto/instrument/pelican/config/INSTCFCOMMON.TXT @@ -1,4 +1,4 @@ -config/source/sct_reactor_status.tcl +config/source/reactor_status_sct.tcl config/source/source.tcl config/anticollider/anticollider_common.tcl config/plc/plc_common_1.tcl diff --git a/site_ansto/instrument/pelican/pelican_configuration.tcl b/site_ansto/instrument/pelican/pelican_configuration.tcl index 3232929b..fdb4a816 100644 --- a/site_ansto/instrument/pelican/pelican_configuration.tcl +++ b/site_ansto/instrument/pelican/pelican_configuration.tcl @@ -28,7 +28,7 @@ fileeval $cfPath(motors)/positmotor_configuration.tcl fileeval $cfPath(plc)/plc.tcl fileeval $cfPath(counter)/counter.tcl #fileeval $cfPath(beamline)/sct_power.tcl -fileeval $cfPath(environment)/temperature/sct_lakeshore_218.tcl +fileeval $cfPath(environment)/temperature/lakeshore_218_sct.tcl fileeval $cfPath(environment)/temperature/sct_lakeshore_336.tcl fileeval $cfPath(environment)/temperature/sct_lakeshore_340.tcl fileeval $cfPath(hmm)/hmm_configuration.tcl diff --git a/site_ansto/instrument/reflectometer/config/INSTCFCOMMON.TXT b/site_ansto/instrument/reflectometer/config/INSTCFCOMMON.TXT index c7964b10..4c5927fb 100644 --- a/site_ansto/instrument/reflectometer/config/INSTCFCOMMON.TXT +++ b/site_ansto/instrument/reflectometer/config/INSTCFCOMMON.TXT @@ -1,4 +1,4 @@ -config/source/sct_reactor_status.tcl +config/source/reactor_status_sct.tcl config/source/source.tcl config/anticollider/anticollider_common.tcl config/plc/plc_common_1.tcl diff --git a/site_ansto/instrument/reflectometer/platypus_configuration.tcl b/site_ansto/instrument/reflectometer/platypus_configuration.tcl index 94ffd7a8..9d88de2f 100644 --- a/site_ansto/instrument/reflectometer/platypus_configuration.tcl +++ b/site_ansto/instrument/reflectometer/platypus_configuration.tcl @@ -28,7 +28,7 @@ fileeval $cfPath(counter)/counter.tcl fileeval $cfPath(environment)/sct_syr.tcl fileeval $cfPath(environment)/sct_mvp.tcl fileeval $cfPath(environment)/sct_protek_common.tcl -fileeval $cfPath(environment)/sct_omron_hldc.tcl +fileeval $cfPath(environment)/omron_hldc_sct.tcl fileeval $cfPath(environment)/magneticField/sct_bruker_BEC1.tcl fileeval $cfPath(environment)/temperature/sct_lakeshore_336.tcl fileeval $cfPath(environment)/temperature/sct_lakeshore_340.tcl diff --git a/site_ansto/instrument/rsd/config/INSTCFCOMMON.TXT b/site_ansto/instrument/rsd/config/INSTCFCOMMON.TXT index 015212e6..36d45e2e 100644 --- a/site_ansto/instrument/rsd/config/INSTCFCOMMON.TXT +++ b/site_ansto/instrument/rsd/config/INSTCFCOMMON.TXT @@ -1,4 +1,4 @@ -config/source/sct_reactor_status.tcl +config/source/reactor_status_sct.tcl config/source/source.tcl config/anticollider/anticollider_common.tcl config/plc/plc_common_1.tcl diff --git a/site_ansto/instrument/sans/config/INSTCFCOMMON.TXT b/site_ansto/instrument/sans/config/INSTCFCOMMON.TXT index 35af79de..a1104828 100644 --- a/site_ansto/instrument/sans/config/INSTCFCOMMON.TXT +++ b/site_ansto/instrument/sans/config/INSTCFCOMMON.TXT @@ -1,4 +1,4 @@ -config/source/sct_reactor_status.tcl +config/source/reactor_status_sct.tcl config/source/source.tcl config/anticollider/anticollider_common.tcl config/plc/plc_common_1.tcl diff --git a/site_ansto/instrument/sans/quokka_configuration.tcl b/site_ansto/instrument/sans/quokka_configuration.tcl index 6bdce7e5..ebc64399 100644 --- a/site_ansto/instrument/sans/quokka_configuration.tcl +++ b/site_ansto/instrument/sans/quokka_configuration.tcl @@ -26,35 +26,35 @@ fileeval $cfPath(parameters)/parameters.tcl fileeval $cfPath(plc)/plc.tcl fileeval $cfPath(optics)/optics.tcl fileeval $cfPath(counter)/counter.tcl -fileeval $cfPath(environment)/sct_agilent_33220A.tcl -fileeval $cfPath(environment)/sct_hiden_xcs.tcl -fileeval $cfPath(environment)/sct_huber_pilot.tcl -fileeval $cfPath(environment)/sct_isotech_ps.tcl +fileeval $cfPath(environment)/agilent_33220A_sct.tcl +fileeval $cfPath(environment)/hiden_xcs_sct.tcl +fileeval $cfPath(environment)/huber_pilot_sct.tcl +fileeval $cfPath(environment)/isotech_ps_sct.tcl fileeval $cfPath(environment)/temperature/sct_eurotherm_2000.tcl -fileeval $cfPath(environment)/temperature/sct_eurotherm_m2000.tcl +fileeval $cfPath(environment)/temperature/eurotherm_m2000_sct.tcl fileeval $cfPath(environment)/sct_keithley_2700.tcl -fileeval $cfPath(environment)/sct_keithley_m2700.tcl -fileeval $cfPath(environment)/sct_lakeshore_218.tcl +fileeval $cfPath(environment)/keithley_m2700_sct.tcl +fileeval $cfPath(environment)/lakeshore_218_sct.tcl fileeval $cfPath(environment)/temperature/sct_lakeshore_336.tcl -fileeval $cfPath(environment)/temperature/sct_ls336.tcl +fileeval $cfPath(environment)/temperature/ls336_sct.tcl fileeval $cfPath(environment)/temperature/sct_lakeshore_340.tcl -fileeval $cfPath(environment)/temperature/sct_ls340.tcl +fileeval $cfPath(environment)/temperature/ls340_sct.tcl fileeval $cfPath(environment)/temperature/sct_lakeshore_370.tcl -fileeval $cfPath(environment)/sct_lakeshore_m370.tcl -fileeval $cfPath(environment)/temperature/sct_mercury_scpi.tcl -fileeval $cfPath(environment)/sct_nhq_200.tcl -fileeval $cfPath(environment)/sct_omron_hldc.tcl -fileeval $cfPath(environment)/temperature/sct_pfeiffer_hg.tcl +fileeval $cfPath(environment)/lakeshore_m370_sct.tcl +fileeval $cfPath(environment)/temperature/mercury_scpi_sct.tcl +fileeval $cfPath(environment)/nhq_200_sct.tcl +fileeval $cfPath(environment)/omron_hldc_sct.tcl +fileeval $cfPath(environment)/temperature/pfeiffer_hg_sct.tcl fileeval $cfPath(environment)/sct_protek_common.tcl -fileeval $cfPath(environment)/sct_protekmm.tcl +fileeval $cfPath(environment)/protekmm_sct.tcl fileeval $cfPath(environment)/temperature/sct_rvasm2.tcl -fileeval $cfPath(environment)/temperature/sct_nprvasm2.tcl +fileeval $cfPath(environment)/temperature/nprvasm2_sct.tcl fileeval $cfPath(environment)/temperature/sct_watlow_pm.tcl -fileeval $cfPath(environment)/temperature/sct_watlow_mpm.tcl +fileeval $cfPath(environment)/temperature/watlow_mpm_sct.tcl fileeval $cfPath(environment)/temperature/sct_watlow_rm.tcl -fileeval $cfPath(environment)/temperature/sct_watlow_mrm.tcl +fileeval $cfPath(environment)/temperature/watlow_mrm_sct.tcl fileeval $cfPath(environment)/temperature/sct_watlow_st4.tcl -fileeval $cfPath(environment)/temperature/sct_watlow_mst4.tcl +fileeval $cfPath(environment)/temperature/watlow_mst4_sct.tcl fileeval $cfPath(hmm)/hmm_configuration.tcl fileeval $cfPath(nexus)/nxscripts.tcl fileeval $cfPath(hmm)/detector.tcl @@ -63,7 +63,7 @@ fileeval $cfPath(commands)/commands.tcl fileeval $cfPath(anticollider)/anticollider.tcl fileeval $cfPath(environment)/temperature/sct_julabo_lh45.tcl fileeval $cfPath(environment)/temperature/sct_qlink.tcl -fileeval $cfPath(environment)/magneticField/sct_tsi_smc.tcl +fileeval $cfPath(environment)/magneticField/tsi_smc_sct.tcl fileeval $cfPath(environment)/temperature/sct_oxford_itc.tcl fileeval $cfPath(environment)/magneticField/oxford_labview.tcl fileeval $cfPath(environment)/magneticField/sct_bruker_BEC1.tcl diff --git a/site_ansto/instrument/tas/config/INSTCFCOMMON.TXT b/site_ansto/instrument/tas/config/INSTCFCOMMON.TXT index 2cdc8009..332bcee2 100644 --- a/site_ansto/instrument/tas/config/INSTCFCOMMON.TXT +++ b/site_ansto/instrument/tas/config/INSTCFCOMMON.TXT @@ -1,5 +1,5 @@ config/load_setup.tcl -config/source/sct_reactor_status.tcl +config/source/reactor_status_sct.tcl config/source/source.tcl config/anticollider/anticollider_common.tcl config/plc/plc_common_1.tcl diff --git a/site_ansto/instrument/tas/taipan_configuration.tcl b/site_ansto/instrument/tas/taipan_configuration.tcl index 2e910fc4..18809bd1 100644 --- a/site_ansto/instrument/tas/taipan_configuration.tcl +++ b/site_ansto/instrument/tas/taipan_configuration.tcl @@ -42,11 +42,11 @@ 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/sct_mercury_base.tcl -fileeval $cfPath(environment)/temperature/sct_mercury_temp.tcl -fileeval $cfPath(environment)/temperature/sct_mercury_pres.tcl -fileeval $cfPath(environment)/temperature/sct_mercury_level.tcl -fileeval $cfPath(environment)/temperature/sct_mercury_valve.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