diff --git a/site_ansto/instrument/kookaburra/kookaburra_configuration.tcl b/site_ansto/instrument/kookaburra/kookaburra_configuration.tcl index 40d330f1..b719b85e 100644 --- a/site_ansto/instrument/kookaburra/kookaburra_configuration.tcl +++ b/site_ansto/instrument/kookaburra/kookaburra_configuration.tcl @@ -23,7 +23,28 @@ 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)/sct_agilent_33220A.tcl +fileeval $cfPath(environment)/sct_isotech_ps.tcl +fileeval $cfPath(environment)/temperature/sct_eurotherm_2000.tcl +fileeval $cfPath(environment)/temperature/sct_eurotherm_m2000.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)/temperature/sct_lakeshore_336.tcl +fileeval $cfPath(environment)/temperature/sct_ls336.tcl +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)/sct_protek_common.tcl +fileeval $cfPath(environment)/sct_protekmm.tcl +fileeval $cfPath(environment)/temperature/sct_julabo_lh45_gen.tcl fileeval $cfPath(counter)/sct_bm.tcl fileeval $cfPath(hmm)/hmm_configuration.tcl fileeval $cfPath(nexus)/nxscripts.tcl diff --git a/site_ansto/instrument/kookaburra/util/sics_config.ini b/site_ansto/instrument/kookaburra/util/sics_config.ini index c943ffc4..8d16baf6 100644 --- a/site_ansto/instrument/kookaburra/util/sics_config.ini +++ b/site_ansto/instrument/kookaburra/util/sics_config.ini @@ -162,28 +162,6 @@ terminator = \r\n tol1 = 1.0 tol2 = 1.0 -[ls336_05] -asyncqueue = sct -desc = "Lakeshore 336 temperature controller" -driver = "ls336" -imptype = temperature -ip = 137.157.201.21 -port = 7777 -terminator = \r\n -tol1 = 1.0 -tol2 = 1.0 - -[ls336_06] -asyncqueue = sct -desc = "Lakeshore 336 temperature controller" -driver = "ls336" -imptype = temperature -ip = 137.157.201.21 -port = 7777 -terminator = \r\n -tol1 = 1.0 -tol2 = 1.0 - [ls336_12] asyncqueue = sct desc = "Lakeshore 336 temperature controller" @@ -195,48 +173,6 @@ terminator = \r\n tol1 = 1.0 tol2 = 1.0 -[ls340_01] -asyncqueue = sct -desc = "Lakeshore 340 temperature controller" -driver = "ls340" -imptype = temperature -ip = 137.157.201.86 -port = 4001 -terminator = \r\n -tol1 = 1.0 -tol2 = 1.0 - -[ls340_02] -asyncqueue = sct -desc = "Lakeshore 340 temperature controller" -driver = "ls340" -imptype = temperature -ip = 137.157.201.86 -port = 4002 -terminator = \r\n -tol1 = 1.0 -tol2 = 1.0 - -[ls340_09] -desc = "Lakeshore 340 temperature controller" -driver = "ls340" -imptype = temperature -ip = 137.157.202.79 -port = 4002 -terminator = \r\n -tol1 = 1.0 -tol2 = 1.0 - -[ls340_11] -desc = "Lakeshore 340 temperature controller" -driver = "ls340" -imptype = temperature -ip = 137.157.201.86 -port = 4001 -terminator = \r\n -tol1 = 1.0 -tol2 = 1.0 - [mercury_scpi_01] desc = "Oxford Mercury temperature controller in Mercury mode" driver = "mercury_scpi"