diff --git a/site_ansto/instrument/dingo/dingo_configuration.tcl b/site_ansto/instrument/dingo/dingo_configuration.tcl index 144390ee..06204ef7 100644 --- a/site_ansto/instrument/dingo/dingo_configuration.tcl +++ b/site_ansto/instrument/dingo/dingo_configuration.tcl @@ -24,25 +24,25 @@ fileeval $cfPath(motors)/motor_configuration.tcl fileeval $cfPath(plc)/plc.tcl #fileeval $cfPath(counter)/counter.tcl #fileeval $cfPath(hmm)/hmm_configuration.tcl -fileeval $cfPath(environment)/sct_agilent_33220A.tcl -fileeval $cfPath(environment)/sct_isotech_ps.tcl +fileeval $cfPath(environment)/agilent_33220A_sct.tcl +fileeval $cfPath(environment)/isotech_ps_sct.tcl fileeval $cfPath(environment)/sct_keithley_2700.tcl -fileeval $cfPath(environment)/sct_keithley_m2700.tcl -fileeval $cfPath(environment)/temperature/sct_lakeshore_218.tcl +fileeval $cfPath(environment)/keithley_m2700_sct.tcl +fileeval $cfPath(environment)/temperature/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/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/ls340_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)/sct_protek_common.tcl -fileeval $cfPath(environment)/sct_protekmm.tcl +fileeval $cfPath(environment)/protekmm_sct.tcl fileeval $cfPath(environment)/temperature/west400.tcl -fileeval $cfPath(environment)/temperature/sct_west4100.tcl +fileeval $cfPath(environment)/temperature/west4100_sct.tcl fileeval $cfPath(nexus)/nxscripts.tcl fileeval $cfPath(scan)/scan.tcl fileeval $cfPath(commands)/commands.tcl diff --git a/site_ansto/instrument/hipd/wombat_configuration.tcl b/site_ansto/instrument/hipd/wombat_configuration.tcl index 5a06208e..33244c39 100644 --- a/site_ansto/instrument/hipd/wombat_configuration.tcl +++ b/site_ansto/instrument/hipd/wombat_configuration.tcl @@ -40,7 +40,7 @@ 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/sct_oxford_mercury.tcl +fileeval $cfPath(environment)/temperature/oxford_mercury_sct.tcl fileeval $cfPath(environment)/sct_protek_common.tcl fileeval $cfPath(environment)/protekmm_sct.tcl fileeval $cfPath(environment)/temperature/julabo_lh45_gen_sct.tcl @@ -52,7 +52,7 @@ fileeval $cfPath(environment)/magneticField/sct_oxford_labview.tcl fileeval $cfPath(environment)/magneticField/oxford12tlv_sct.tcl fileeval $cfPath(environment)/he3/sct_he3.tcl fileeval $cfPath(environment)/magneticField/sct_green_magnet.tcl -fileeval $cfPath(environment)/magneticField/sct_green_magnet_labview.tcl +fileeval $cfPath(environment)/magneticField/green_magnet_labview_sct.tcl fileeval $cfPath(hmm)/hmm_configuration.tcl fileeval $cfPath(nexus)/nxscripts.tcl fileeval $cfPath(scan)/scan.tcl diff --git a/site_ansto/instrument/hrpd/config/INSTCFCOMMON.TXT b/site_ansto/instrument/hrpd/config/INSTCFCOMMON.TXT index a5cf70a9..ea581e0f 100644 --- a/site_ansto/instrument/hrpd/config/INSTCFCOMMON.TXT +++ b/site_ansto/instrument/hrpd/config/INSTCFCOMMON.TXT @@ -16,7 +16,7 @@ config/hmm/hmm_object.tcl config/hmm/hmm_cylindrical_detector_configuration.tcl config/hmm/anstohm_linked.xml config/robots/sct_pickandplace.tcl -config/robots/sct_epson_pandp.tcl +config/robots/epson_pandp_sct.tcl config/scan/scan_common_1.hdd config/scan/scan_common_1.tcl config/nexus/nxscripts_common_1.tcl diff --git a/site_ansto/instrument/hrpd/echidna_configuration.tcl b/site_ansto/instrument/hrpd/echidna_configuration.tcl index 2aeaca4f..2718e273 100644 --- a/site_ansto/instrument/hrpd/echidna_configuration.tcl +++ b/site_ansto/instrument/hrpd/echidna_configuration.tcl @@ -25,33 +25,33 @@ source $cfPath(hipadaba)/hipadaba_configuration.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)/temperature/sct_lakeshore_218.tcl +fileeval $cfPath(environment)/keithley_m2700_sct.tcl +fileeval $cfPath(environment)/temperature/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)/temperature/sct_lakeshore_m370.tcl -fileeval $cfPath(environment)/temperature/sct_oxford_mercury.tcl +fileeval $cfPath(environment)/temperature/lakeshore_m370_sct.tcl +fileeval $cfPath(environment)/temperature/oxford_mercury_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/west400.tcl -fileeval $cfPath(environment)/temperature/sct_west4100.tcl -fileeval $cfPath(environment)/temperature/sct_west_6100.tcl +fileeval $cfPath(environment)/temperature/west4100_sct.tcl +fileeval $cfPath(environment)/temperature/west_6100_sct.tcl fileeval $cfPath(environment)/temperature/sct_watlow_pm.tcl fileeval $cfPath(environment)/magneticField/sct_oxford_labview.tcl -fileeval $cfPath(environment)/magneticField/sct_oxford12tlv.tcl +fileeval $cfPath(environment)/magneticField/oxford12tlv_sct.tcl fileeval $cfPath(environment)/he3/sct_he3.tcl fileeval $cfPath(environment)/magneticField/sct_green_magnet.tcl -fileeval $cfPath(environment)/magneticField/sct_green_magnet_labview.tcl +fileeval $cfPath(environment)/magneticField/green_magnet_labview_sct.tcl fileeval $cfPath(hmm)/hmm_configuration.tcl fileeval $cfPath(nexus)/nxscripts.tcl fileeval $cfPath(scan)/scan.tcl @@ -61,7 +61,7 @@ fileeval $cfPath(commands)/commands.tcl fileeval $cfPath(anticollider)/anticollider.tcl #fileeval $cfPath(environment)/robby_configuration.tcl fileeval $cfPath(robots)/sct_pickandplace.tcl -fileeval $cfPath(robots)/sct_epson_pandp.tcl +fileeval $cfPath(robots)/epson_pandp_sct.tcl source gumxml.tcl diff --git a/site_ansto/instrument/pelican/pelican_configuration.tcl b/site_ansto/instrument/pelican/pelican_configuration.tcl index a6ccaf0b..48e8aa06 100644 --- a/site_ansto/instrument/pelican/pelican_configuration.tcl +++ b/site_ansto/instrument/pelican/pelican_configuration.tcl @@ -42,7 +42,7 @@ 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/sct_oxford_mercury.tcl +fileeval $cfPath(environment)/temperature/oxford_mercury_sct.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/reflectometer/platypus_configuration.tcl b/site_ansto/instrument/reflectometer/platypus_configuration.tcl index 2161fd62..84a72595 100644 --- a/site_ansto/instrument/reflectometer/platypus_configuration.tcl +++ b/site_ansto/instrument/reflectometer/platypus_configuration.tcl @@ -26,20 +26,20 @@ fileeval $cfPath(parameters)/parameters.tcl fileeval $cfPath(plc)/plc.tcl fileeval $cfPath(counter)/counter.tcl fileeval $cfPath(environment)/sct_syr.tcl -fileeval $cfPath(environment)/sct_syringe_pump.tcl -fileeval $cfPath(environment)/sct_knauer_pump.tcl +fileeval $cfPath(environment)/syringe_pump_sct.tcl +fileeval $cfPath(environment)/knauer_pump_sct.tcl fileeval $cfPath(environment)/sct_mvp.tcl -fileeval $cfPath(environment)/sct_mvp_valve.tcl +fileeval $cfPath(environment)/mvp_valve_sct.tcl fileeval $cfPath(environment)/sct_protek_common.tcl fileeval $cfPath(environment)/protekmm_sct.tcl fileeval $cfPath(environment)/omron_hldc_sct.tcl fileeval $cfPath(environment)/magneticField/sct_bruker_BEC1.tcl -fileeval $cfPath(environment)/magneticField/sct_bruker.tcl +fileeval $cfPath(environment)/magneticField/bruker_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/sct_julabo_lh45_gen.tcl +fileeval $cfPath(environment)/temperature/ls340_sct.tcl +fileeval $cfPath(environment)/temperature/julabo_lh45_gen_sct.tcl fileeval $cfPath(hmm)/hmm_configuration.tcl fileeval $cfPath(nexus)/nxscripts.tcl fileeval $cfPath(hmm)/detector.tcl diff --git a/site_ansto/instrument/rsd/kowari_configuration.tcl b/site_ansto/instrument/rsd/kowari_configuration.tcl index a399e11e..b21ec5a8 100644 --- a/site_ansto/instrument/rsd/kowari_configuration.tcl +++ b/site_ansto/instrument/rsd/kowari_configuration.tcl @@ -23,27 +23,27 @@ source $cfPath(hipadaba)/hipadaba_configuration.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_isotech_ps.tcl +fileeval $cfPath(environment)/agilent_33220A_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)/temperature/sct_lakeshore_218.tcl +fileeval $cfPath(environment)/keithley_m2700_sct.tcl +fileeval $cfPath(environment)/temperature/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)/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/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)/sct_protek_common.tcl -fileeval $cfPath(environment)/sct_protekmm.tcl +fileeval $cfPath(environment)/protekmm_sct.tcl fileeval $cfPath(environment)/magneticField/sct_oxford_labview.tcl fileeval $cfPath(environment)/magneticField/oxford12tlv_sct.tcl fileeval $cfPath(hmm)/hmm_configuration.tcl diff --git a/site_ansto/instrument/sans/quokka_configuration.tcl b/site_ansto/instrument/sans/quokka_configuration.tcl index d558d904..021594e5 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)/temperature/sct_lakeshore_218.tcl +fileeval $cfPath(environment)/keithley_m2700_sct.tcl +fileeval $cfPath(environment)/temperature/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)/temperature/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)/temperature/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/taipan_configuration.tcl b/site_ansto/instrument/tas/taipan_configuration.tcl index 68b2b2aa..dcf34fb3 100644 --- a/site_ansto/instrument/tas/taipan_configuration.tcl +++ b/site_ansto/instrument/tas/taipan_configuration.tcl @@ -36,21 +36,21 @@ namespace eval anticollider { proc ::anticollider::init {} {} } #fileeval $cfPath(tasmad)/taspub_sics/tasp.tcl #fileeval $cfPath(tasmad)/taspub_sics/tasscript.tcl -fileeval $cfPath(environment)/sct_agilent_33220A.tcl +fileeval $cfPath(environment)/agilent_33220A_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_eurotherm_2000.tcl fileeval $cfPath(environment)/temperature/sct_julabo_lh45.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)/temperature/sct_oxford_itc.tcl -fileeval $cfPath(environment)/temperature/sct_oxford_mercury.tcl +fileeval $cfPath(environment)/temperature/oxford_mercury_sct.tcl fileeval $cfPath(environment)/temperature/west400.tcl fileeval $cfPath(environment)/magneticField/oxford_labview.tcl -fileeval $cfPath(environment)/magneticField/sct_oxford12tlv.tcl +fileeval $cfPath(environment)/magneticField/oxford12tlv_sct.tcl fileeval $cfPath(environment)/he3/sct_he3.tcl fileeval config/load_setup.tcl fileeval log.tcl