From 739ab393a506c00e52d8b07845f2a49f40fc500a Mon Sep 17 00:00:00 2001 From: Ferdi Franceschini Date: Tue, 15 Jul 2014 15:20:20 +1000 Subject: [PATCH] Add an Autolab setup to the Wombat config and fix the mercury configuration. --- site_ansto/instrument/hipd/util/sics_config.ini | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/site_ansto/instrument/hipd/util/sics_config.ini b/site_ansto/instrument/hipd/util/sics_config.ini index 1fc5f2ab..1bccb114 100644 --- a/site_ansto/instrument/hipd/util/sics_config.ini +++ b/site_ansto/instrument/hipd/util/sics_config.ini @@ -1,6 +1,9 @@ [12tmagnet_setup] cascade = B1:12tmagnet_oxford,sample_stage:12tmagnet_sample_insert,T1:mercury_scpi_01 enabled = False +[Autolab_setup] +cascade = sample_stage:normal_sample_stage,I1:protek_01,V2:protek_02 +enabled = False [CF1] cascade = T1:CF1_ls340,sample_stage:normal_sample_stage enabled = False @@ -245,15 +248,18 @@ desc = "Oxford Mercury temperature controller in Mercury mode" driver = "mercury_scpi" imptype = temperature ip = 10.157.205.5 +permlink = LT port = 7020 terminator = \r\n tol = 1.0 +valve_tol = 2 [mercury_scpi_02] desc = "Oxford Mercury temperature controller in Mercury mode" driver = "mercury_scpi" imptype = temperature ip = 10.157.205.47 +permlink = LT port = 7020 terminator = \r\n tol = 1.0