From f629ea24edce9fc6dc070d79aebcd7049b519083 Mon Sep 17 00:00:00 2001 From: Douglas Clowes Date: Thu, 20 Nov 2014 15:56:30 +1100 Subject: [PATCH] Pull various config files closer into alignment --- .../instrument/hipd/util/sics_config.ini | 46 +++++++++++++------ .../instrument/hipd/wombat_configuration.tcl | 6 +-- .../instrument/hrpd/echidna_configuration.tcl | 6 +-- .../instrument/hrpd/util/sics_config.ini | 45 ++++++++++++------ .../pelican/pelican_configuration.tcl | 7 +-- .../instrument/pelican/util/sics_config.ini | 45 ++++++++++++------ .../instrument/tas/taipan_configuration.tcl | 7 +-- .../instrument/tas/util/sics_config.ini | 46 +++++++++++++------ 8 files changed, 128 insertions(+), 80 deletions(-) diff --git a/site_ansto/instrument/hipd/util/sics_config.ini b/site_ansto/instrument/hipd/util/sics_config.ini index 4f0cdd40..24c16a72 100644 --- a/site_ansto/instrument/hipd/util/sics_config.ini +++ b/site_ansto/instrument/hipd/util/sics_config.ini @@ -131,7 +131,6 @@ desc = "Function Generator" driver = agilent_33220A imptype = function_generator ip = 10.157.205.16 -name = pulser port = 5025 [eularian_cradle] @@ -254,27 +253,44 @@ ip = 10.157.205.42 port = 4001 tol = 1.0 -[mercury_scpi_01] -desc = "Oxford Mercury temperature controller in Mercury mode" -driver = "mercury_scpi" +[mercury_01] +assoc = 00000124 +cards = HHHVLTTP +desc = "Oxford Mercury temperature controller (12T)" +driver = "oxford_mercury" imptype = temperature ip = 10.157.205.5 -permlink = LT port = 7020 -terminator = \r\n -tol = 1.0 -valve_tol = 2 +ptol = 5 +terminator = \n +ttol = 1.0 +vtol = 5 -[mercury_scpi_02] -desc = "Oxford Mercury temperature controller in Mercury mode" -driver = "mercury_scpi" +[mercury_02] +assoc = 00000124 +cards = HHTVTTTP +desc = "Oxford Mercury temperature controller (CF10)" +driver = "oxford_mercury" +imptype = temperature +ip = 10.157.205.46 +port = 7020 +ptol = 5 +terminator = \n +ttol = 1.0 +vtol = 5 + +[mercury_03] +assoc = 00000123 +cards = HHHNNTTT +desc = "Oxford Mercury temperature controller ()" +driver = "oxford_mercury" imptype = temperature ip = 10.157.205.47 -permlink = LT port = 7020 -terminator = \r\n -tol = 1.0 -valve_tol = 2 +ptol = 5 +terminator = \n +ttol = 1.0 +vtol = 5 [normal_sample_stage] desc = "This is the default sample stage configuration with xy translation and phi and chi tilt stages" diff --git a/site_ansto/instrument/hipd/wombat_configuration.tcl b/site_ansto/instrument/hipd/wombat_configuration.tcl index 8657ccb0..3be209a3 100644 --- a/site_ansto/instrument/hipd/wombat_configuration.tcl +++ b/site_ansto/instrument/hipd/wombat_configuration.tcl @@ -40,11 +40,7 @@ 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_oxford_mercury.tcl fileeval $cfPath(environment)/temperature/sct_mercury_valve.tcl fileeval $cfPath(environment)/sct_protek_common.tcl fileeval $cfPath(environment)/sct_protekmm.tcl diff --git a/site_ansto/instrument/hrpd/echidna_configuration.tcl b/site_ansto/instrument/hrpd/echidna_configuration.tcl index e677dde9..0b9a48b7 100644 --- a/site_ansto/instrument/hrpd/echidna_configuration.tcl +++ b/site_ansto/instrument/hrpd/echidna_configuration.tcl @@ -40,11 +40,7 @@ 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_oxford_mercury.tcl fileeval $cfPath(environment)/temperature/sct_mercury_valve.tcl fileeval $cfPath(environment)/sct_protek_common.tcl fileeval $cfPath(environment)/sct_protekmm.tcl diff --git a/site_ansto/instrument/hrpd/util/sics_config.ini b/site_ansto/instrument/hrpd/util/sics_config.ini index 5cfd4c2a..2f652325 100644 --- a/site_ansto/instrument/hrpd/util/sics_config.ini +++ b/site_ansto/instrument/hrpd/util/sics_config.ini @@ -233,27 +233,44 @@ ip = 10.157.205.42 port = 4001 tol = 1.0 -[mercury_scpi_01] -desc = "Oxford Mercury temperature controller in Mercury mode" -driver = "mercury_scpi" +[mercury_01] +assoc = 00000124 +cards = HHHVLTTP +desc = "Oxford Mercury temperature controller (12T)" +driver = "oxford_mercury" imptype = temperature ip = 10.157.205.5 -permlink = LT port = 7020 -terminator = \r\n -tol = 1.0 -valve_tol = 2 +ptol = 5 +terminator = \n +ttol = 1.0 +vtol = 5 -[mercury_scpi_02] -desc = "Oxford Mercury temperature controller in Mercury mode" -driver = "mercury_scpi" +[mercury_02] +assoc = 00000124 +cards = HHTVTTTP +desc = "Oxford Mercury temperature controller (CF10)" +driver = "oxford_mercury" +imptype = temperature +ip = 10.157.205.46 +port = 7020 +ptol = 5 +terminator = \n +ttol = 1.0 +vtol = 5 + +[mercury_03] +assoc = 00000123 +cards = HHHNNTTT +desc = "Oxford Mercury temperature controller ()" +driver = "oxford_mercury" imptype = temperature ip = 10.157.205.47 -permlink = LT port = 7020 -terminator = \r\n -tol = 1.0 -valve_tol = 2 +ptol = 5 +terminator = \n +ttol = 1.0 +vtol = 5 [normal_sample_stage] desc = "This is the default sample stage configuration with xy translation and phi and chi tilt stages" diff --git a/site_ansto/instrument/pelican/pelican_configuration.tcl b/site_ansto/instrument/pelican/pelican_configuration.tcl index 7194c5d5..cd7857b9 100644 --- a/site_ansto/instrument/pelican/pelican_configuration.tcl +++ b/site_ansto/instrument/pelican/pelican_configuration.tcl @@ -42,12 +42,7 @@ 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_mercury.tcl fileeval $cfPath(environment)/sct_protek_common.tcl fileeval $cfPath(environment)/sct_protekmm.tcl fileeval $cfPath(environment)/temperature/sct_julabo_lh45_gen.tcl diff --git a/site_ansto/instrument/pelican/util/sics_config.ini b/site_ansto/instrument/pelican/util/sics_config.ini index e2576474..accb4617 100644 --- a/site_ansto/instrument/pelican/util/sics_config.ini +++ b/site_ansto/instrument/pelican/util/sics_config.ini @@ -250,27 +250,44 @@ terminator = \r\n tol1 = 1.0 tol2 = 1.0 -[mercury_scpi_01] -desc = "Oxford Mercury temperature controller with three temperature loops." -driver = "mercury_base" +[mercury_01] +assoc = 00000124 +cards = HHHVLTTP +desc = "Oxford Mercury temperature controller (12T)" +driver = "oxford_mercury" imptype = temperature ip = 10.157.205.5 -permlink = LT port = 7020 -terminator = \r\n -tol = 1.0 -valve_tol = 2 +ptol = 5 +terminator = \n +ttol = 1.0 +vtol = 5 -[mercury_scpi_02] -desc = "Oxford Mercury temperature controller with four temperature loops and needle valve control" -driver = "mercury_scpi" +[mercury_02] +assoc = 00000124 +cards = HHTVTTTP +desc = "Oxford Mercury temperature controller (CF10)" +driver = "oxford_mercury" +imptype = temperature +ip = 10.157.205.46 +port = 7020 +ptol = 5 +terminator = \n +ttol = 1.0 +vtol = 5 + +[mercury_03] +assoc = 00000123 +cards = HHHNNTTT +desc = "Oxford Mercury temperature controller ()" +driver = "oxford_mercury" imptype = temperature ip = 10.157.205.47 -permlink = LT port = 7020 -terminator = \r\n -tol = 1.0 -valve_tol = 2 +ptol = 5 +terminator = \n +ttol = 1.0 +vtol = 5 [normal_sample_stage] desc = "This is the default sample stage configuration" diff --git a/site_ansto/instrument/tas/taipan_configuration.tcl b/site_ansto/instrument/tas/taipan_configuration.tcl index 84bf3fc0..68b2b2aa 100644 --- a/site_ansto/instrument/tas/taipan_configuration.tcl +++ b/site_ansto/instrument/tas/taipan_configuration.tcl @@ -48,15 +48,10 @@ 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/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/west400.tcl -fileeval $cfPath(environment)/he3/sct_he3.tcl fileeval $cfPath(environment)/magneticField/oxford_labview.tcl fileeval $cfPath(environment)/magneticField/sct_oxford12tlv.tcl +fileeval $cfPath(environment)/he3/sct_he3.tcl fileeval config/load_setup.tcl fileeval log.tcl publish logbook spy diff --git a/site_ansto/instrument/tas/util/sics_config.ini b/site_ansto/instrument/tas/util/sics_config.ini index 4ca3248b..42de7fd6 100644 --- a/site_ansto/instrument/tas/util/sics_config.ini +++ b/site_ansto/instrument/tas/util/sics_config.ini @@ -124,7 +124,6 @@ desc = "Function Generator" driver = agilent_33220A imptype = function_generator ip = 10.157.205.16 -name = pulser port = 5025 [ls336_01] @@ -235,27 +234,44 @@ terminator = \r\n tol1 = 1.0 tol2 = 1.0 -[mercury_scpi_01] -desc = "Oxford Mercury temperature controller with three temperature loops." -driver = "mercury_base" +[mercury_01] +assoc = 00000124 +cards = HHHVLTTP +desc = "Oxford Mercury temperature controller (12T)" +driver = "oxford_mercury" imptype = temperature ip = 10.157.205.5 -permlink = LT port = 7020 -terminator = \r\n -tol = 1.0 -valve_tol = 2 +ptol = 5 +terminator = \n +ttol = 1.0 +vtol = 5 -[mercury_scpi_02] -desc = "Oxford Mercury temperature controller with four temperature loops and needle valve control" -driver = "mercury_scpi" +[mercury_02] +assoc = 00000124 +cards = HHTVTTTP +desc = "Oxford Mercury temperature controller (CF10)" +driver = "oxford_mercury" +imptype = temperature +ip = 10.157.205.46 +port = 7020 +ptol = 5 +terminator = \n +ttol = 1.0 +vtol = 5 + +[mercury_03] +assoc = 00000123 +cards = HHHNNTTT +desc = "Oxford Mercury temperature controller ()" +driver = "oxford_mercury" imptype = temperature ip = 10.157.205.47 -permlink = LT port = 7020 -terminator = \r\n -tol = 1.0 -valve_tol = 2 +ptol = 5 +terminator = \n +ttol = 1.0 +vtol = 5 [normal_sample_stage] desc = "This is the default sample stage configuration"