From 80ad9cff2adfab8f720e5a0dcbf3b0b89c20e6d2 Mon Sep 17 00:00:00 2001 From: Ferdi Franceschini Date: Fri, 17 Oct 2014 09:04:26 +1100 Subject: [PATCH] Load sics_config.ini wrapper code for Legacy drivers on Playtpus and update config. --- .../reflectometer/platypus_configuration.tcl | 8 +- .../reflectometer/util/sics_config.ini | 149 ++++++++---------- 2 files changed, 69 insertions(+), 88 deletions(-) diff --git a/site_ansto/instrument/reflectometer/platypus_configuration.tcl b/site_ansto/instrument/reflectometer/platypus_configuration.tcl index c5b25e7c..5234f5e1 100644 --- a/site_ansto/instrument/reflectometer/platypus_configuration.tcl +++ b/site_ansto/instrument/reflectometer/platypus_configuration.tcl @@ -26,14 +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)/sct_mvp.tcl +fileeval $cfPath(environment)/sct_mvp_valve.tcl fileeval $cfPath(environment)/sct_protek_common.tcl +fileeval $cfPath(environment)/sct_protekmm.tcl fileeval $cfPath(environment)/sct_omron_hldc.tcl fileeval $cfPath(environment)/magneticField/sct_bruker_BEC1.tcl +fileeval $cfPath(environment)/magneticField/sct_bruker.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_julabo_lh45.tcl +fileeval $cfPath(environment)/temperature/sct_ls340.tcl +fileeval $cfPath(environment)/temperature/sct_julabo_lh45_gen.tcl fileeval $cfPath(hmm)/hmm_configuration.tcl fileeval $cfPath(nexus)/nxscripts.tcl fileeval $cfPath(hmm)/detector.tcl diff --git a/site_ansto/instrument/reflectometer/util/sics_config.ini b/site_ansto/instrument/reflectometer/util/sics_config.ini index 752b7562..7ac26977 100644 --- a/site_ansto/instrument/reflectometer/util/sics_config.ini +++ b/site_ansto/instrument/reflectometer/util/sics_config.ini @@ -1,18 +1,21 @@ -[CF6] -cascade = T1:CF6_ls340,sample_stage:normal_sample_stage +[Bruker_CF6] +cascade = T1:CF6_ls340,B1:bruker_bec1,sample_stage:normal_sample_stage enabled = False [Default] cascade = sample_stage:normal_sample_stage enabled = True -[bruker_setup] -cascade = B1:bruker_bec1,sample_stage:normal_sample_stage +[Knauer and Syringe] +cascade = HPLC:knauer_01,Syringe:syringe,sample_stage:normal_sample_stage +enabled = False +[Knauer, Syringe and MVP] +cascade = HPLC:knauer_01,Syringe:syringe,MVP:mvp,sample_stage:normal_sample_stage enabled = False [B1] datype = B enabled = False id = 1 implementation = none -name = magnet1 +name = ma1 optype = magnetic_field [Function_Generator] datype = V @@ -21,6 +24,13 @@ id = 1 implementation = none name = pulser optype = function_generator +[HPLC] +datype = pump +enabled = False +id = 1 +implementation = none +name = hplc +optype = hplc [High_Voltage] datype = V enabled = False @@ -42,6 +52,13 @@ id = 2 implementation = none name = curr2 optype = multimeter +[MVP] +datype = valve +enabled = False +id = 1 +implementation = none +name = mvp +optype = valve [Power Supply] datype = V enabled = False @@ -49,13 +66,13 @@ id = 1 implementation = none name = power_supply optype = power_supply -[Pump 1] +[Syringe] datype = pump enabled = False id = 1 implementation = none -name = hplc -optype = pump +name = syr +optype = syringe [T1] datype = T enabled = False @@ -121,7 +138,7 @@ optype = motion_axis desc = "The New Zealand magnet" driver = tsi_smc imptype = magnetic_field -ip = 137.157.202.79 +ip = 137.157.202.151 port = 4004 timeout = 2000 @@ -145,34 +162,31 @@ port = 5025 [bruker_bec1] desc = "Bruker Magnet" -driver = "bruker_bec1" +driver = "bruker" imptype = magnetic_field ip = 10.157.205.13 port = 4444 -type = B +tol = 0.1 + +[hiden_xcs] +desc = "Hiden XCS Relative Humidity Flow Control" +driver = "hiden_xcs" +imptype = flowcontrol +ip = 137.157.202.151 +port = 4001 [isotech_ps] desc = "Isotech Power Supply:Baud=2400,Data=8,Stop=1,Parity=None,Flow=None" driver = "isotech_ps" imptype = power_supply -ip = 137.157.202.79 +ip = 137.157.202.151 port = 4001 -[julabo_lh45] -ctrl_sensor = "bath" -desc = "Julabo temperature controller" -driver = "julabo_lh45" -imptype = temperature -ip = 10.157.205.39 -port = 4001 -tol = 5.0 -type = T - [knauer_01] asyncprotocol = knauer_ap desc = "Knauer BlueShadow Pump 40P (High Performance/Pressure Liquid Chromatography)" driver = knauer_pump -imptype = pump +imptype = hplc ip = 10.157.205.51 port = 10001 timeout = 1000 @@ -210,28 +224,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" @@ -243,48 +235,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" @@ -307,10 +257,27 @@ terminator = \r\n tol = 1.0 valve_tol = 2 +[mvp] +desc = "Valve controller" +driver = mvp_valve +imptype = valve +ip = 137.157.202.151 +port = 4004 + [normal_sample_stage] desc = "This is the default sample stage configuration xyz translation omega rotation but no tilt axes" imptype = motion_axis +[platypus_julabo] +ctrl_sensor = "bath" +desc = "Julabo temperature controller" +driver = "julabo_lh45" +imptype = temperature +ip = 137.157.202.151 +port = 4002 +tol = 2.0 +type = T + [protek_01] asyncqueue = sct desc = "Protek Multimeter" @@ -327,3 +294,11 @@ imptype = multimeter ip = 10.157.205.37 port = 4001 +[syringe] +desc = "Syringe Pump" +driver = syringe_pump +imptype = syringe +ip = 137.157.202.151 +port = 4003 +timeout = 1000 +