diff --git a/site_ansto/instrument/hipd/util/sics_config.ini b/site_ansto/instrument/hipd/util/sics_config.ini index 887f1d2b..1fc5f2ab 100644 --- a/site_ansto/instrument/hipd/util/sics_config.ini +++ b/site_ansto/instrument/hipd/util/sics_config.ini @@ -4,15 +4,26 @@ enabled = False [CF1] cascade = T1:CF1_ls340,sample_stage:normal_sample_stage enabled = False +[CF8] +cascade = T1:ls336_01,T2:ls340_11,sample_stage:normal_sample_stage +enabled = False [Default] cascade = sample_stage:normal_sample_stage enabled = True [B1] +datype = B enabled = False id = 1 implementation = none name = magnet1 optype = magnetic_field +[Function_Generator] +datype = V +enabled = False +id = 1 +implementation = none +name = pulser +optype = function_generator [I1] datype = I enabled = False @@ -28,36 +39,42 @@ implementation = none name = curr2 optype = multimeter [T1] +datype = T enabled = False id = 1 implementation = none name = tc1 optype = temperature [T2] +datype = T enabled = False id = 2 implementation = none name = tc2 optype = temperature [T3] +datype = T enabled = False id = 3 implementation = none name = tc3 optype = temperature [T4] +datype = T enabled = False id = 4 implementation = none name = tc4 optype = temperature [T5] +datype = T enabled = False id = 5 implementation = none name = tc5 optype = temperature [T6] +datype = T enabled = False id = 6 implementation = none @@ -85,7 +102,6 @@ optype = motion_axis [12tmagnet_oxford] desc = "12 Tesla Oxford Magnet" driver = "oxford_labview" -id = 1 imptype = magnetic_field ip = 10.157.205.3 port = 55001 @@ -96,7 +112,7 @@ imptype = motion_axis [CF1_ls340] desc = "cf1: Bottom loading cryofurnace" -driver = "lakeshore_340" +driver = "ls340" imptype = temperature ip = 10.157.205.43 port = 4001 @@ -104,13 +120,22 @@ terminator = \r\n tol1 = 1.0 tol2 = 1.0 +[agilent_33220A] +asyncqueue = sct +desc = "Function Generator" +driver = agilent_33220A +imptype = function_generator +ip = 10.157.205.16 +port = 5025 + [eularian_cradle] desc = "Load the Eulerian cradle configuration" imptype = motion_axis [ls336_01] -desc = "tc1: Lakeshore 336 temperature controller" -driver = "lakeshore_336" +asyncqueue = sct +desc = "Lakeshore 336 temperature controller" +driver = "ls336" imptype = temperature ip = 10.157.205.28 port = 7777 @@ -119,8 +144,9 @@ tol1 = 1.0 tol2 = 1.0 [ls336_02] -desc = "tc2: Lakeshore 336 temperature controller" -driver = "lakeshore_336" +asyncqueue = sct +desc = "Lakeshore 336 temperature controller" +driver = "ls336" imptype = temperature ip = 10.157.205.29 port = 7777 @@ -129,8 +155,9 @@ tol1 = 1.0 tol2 = 1.0 [ls336_04] -desc = "tc3: Lakeshore 336 temperature controller" -driver = "lakeshore_336" +asyncqueue = sct +desc = "Lakeshore 336 temperature controller" +driver = "ls336" imptype = temperature ip = 10.157.205.30 port = 7777 @@ -139,8 +166,9 @@ tol1 = 1.0 tol2 = 1.0 [ls336_05] -desc = "tc4: Lakeshore 336 temperature controller" -driver = "lakeshore_336" +asyncqueue = sct +desc = "Lakeshore 336 temperature controller" +driver = "ls336" imptype = temperature ip = 137.157.201.21 port = 7777 @@ -149,8 +177,9 @@ tol1 = 1.0 tol2 = 1.0 [ls336_06] -desc = "tc5: Lakeshore 336 temperature controller" -driver = "lakeshore_336" +asyncqueue = sct +desc = "Lakeshore 336 temperature controller" +driver = "ls336" imptype = temperature ip = 137.157.201.21 port = 7777 @@ -158,9 +187,20 @@ terminator = \r\n tol1 = 1.0 tol2 = 1.0 +[ls336_11] +desc = "Lakeshore 336 temperature controller" +driver = "ls336" +imptype = temperature +ip = 10.157.205.27 +port = 7777 +terminator = \r\n +tol1 = 1.0 +tol2 = 1.0 + [ls336_12] -desc = "tc6: Lakeshore 336 temperature controller" -driver = "lakeshore_336" +asyncqueue = sct +desc = "Lakeshore 336 temperature controller" +driver = "ls336" imptype = temperature ip = 10.157.205.31 port = 7777 @@ -169,9 +209,9 @@ tol1 = 1.0 tol2 = 1.0 [ls340_01] -desc = "tc7: Lakeshore 340 temperature controller" -driver = "lakeshore_340" -id = 2 +asyncqueue = sct +desc = "Lakeshore 340 temperature controller" +driver = "ls340" imptype = temperature ip = 137.157.201.86 port = 4001 @@ -180,9 +220,9 @@ tol1 = 1.0 tol2 = 1.0 [ls340_02] -desc = "tc8: Lakeshore 340 temperature controller" -driver = "lakeshore_340" -id = 3 +asyncqueue = sct +desc = "Lakeshore 340 temperature controller" +driver = "ls340" imptype = temperature ip = 137.157.201.86 port = 4002 @@ -190,24 +230,30 @@ 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" -id = 1 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 @@ -221,7 +267,6 @@ imptype = motion_axis asyncqueue = sct desc = "Protek Multimeter" driver = "protekmm" -id = 1 imptype = multimeter ip = 10.157.205.36 port = 4001 @@ -230,7 +275,6 @@ port = 4001 asyncqueue = sct desc = "Protek Multimeter" driver = "protekmm" -id = 2 imptype = multimeter ip = 10.157.205.37 port = 4001 @@ -241,6 +285,7 @@ imptype = motion_axis [west4100] desc = "Blue furnace temperature controller" +dev_id = 1 driver = "west4100" imptype = temperature ip = 10.157.205.19 diff --git a/site_ansto/instrument/sans/util/sics_config.ini b/site_ansto/instrument/sans/util/sics_config.ini index 76189b90..84691877 100644 --- a/site_ansto/instrument/sans/util/sics_config.ini +++ b/site_ansto/instrument/sans/util/sics_config.ini @@ -13,6 +13,15 @@ enabled = False [Default] cascade = sample_stage:normal_sample_stage enabled = True +[Differential_Scanning_Calorimetry] +cascade = DSC:protek_01,sample_stage:normal_sample_stage +enabled = False +[HV_control] +cascade = Function_Generator:agilent_33220A,High_Voltage:protek_01,sample_stage:normal_sample_stage +enabled = False +[Rheometer_APMCR500_setup] +cascade = rhSpeed:protek_01,rhTorque:protek_02,Rheometry:antonparr_MCR500 +enabled = False [bruker_setup] cascade = B1:bruker_bec1,sample_stage:normal_sample_stage,T1:julabo_lh45 enabled = False @@ -20,11 +29,33 @@ enabled = False cascade = sample_stage:normal_sample_stage,T1:ls340_01,T2:ls340_02 enabled = False [B1] +datype = B enabled = False id = 1 implementation = none name = magnet1 optype = magnetic_field +[DSC] +datype = V +enabled = False +id = 1 +implementation = none +name = dsc_val +optype = multimeter +[Function_Generator] +datype = V +enabled = False +id = 1 +implementation = none +name = pulser +optype = function_generator +[High_Voltage] +datype = V +enabled = False +id = 1 +implementation = none +name = hv_val +optype = multimeter [I1] datype = I enabled = False @@ -39,36 +70,52 @@ id = 2 implementation = none name = curr2 optype = multimeter +[Rheometry] +enabled = False +implementation = none +optype = rheometry [T1] +datype = T enabled = False id = 1 implementation = none name = tc1 optype = temperature [T2] +datype = T enabled = False id = 2 implementation = none name = tc2 optype = temperature [T3] +datype = T enabled = False id = 3 implementation = none name = tc3 optype = temperature [T4] +datype = T enabled = False id = 4 implementation = none name = tc4 optype = temperature [T5] +datype = T enabled = False id = 5 implementation = none name = tc5 optype = temperature +[T6] +datype = T +enabled = False +id = 6 +implementation = none +name = tc6 +optype = temperature [V1] datype = V enabled = False @@ -83,6 +130,22 @@ id = 2 implementation = none name = volts2 optype = multimeter +[Viscosity] +enabled = False +id = 1 +implementation = none +name = visc +optype = viscosity +[rhSpeed] +enabled = False +implementation = none +name = rhSpeed +optype = rheometry +[rhTorque] +enabled = False +implementation = none +name = rhTorque +optype = rheometry [sample_stage] enabled = Always implementation = normal_sample_stage @@ -105,7 +168,7 @@ imptype = motion_axis [CF1_ls340] desc = "cf1: Bottom loading cryofurnace" -driver = "lakeshore_340" +driver = "ls340" imptype = temperature ip = 10.157.205.43 port = 4001 @@ -117,6 +180,26 @@ tol2 = 1.0 desc = "som will be redefined as the magnet sample insert rotation. Sample stage will be renamed to somss" imptype = motion_axis +[agilent_33220A] +asyncqueue = sct +desc = "Function Generator" +driver = agilent_33220A +imptype = function_generator +ip = 10.157.205.16 +port = 5025 + +[antonparr_MCR500] +cbfunc = "rhCallback /sics/$rhControl" +desc = "Anton Parr MRC500 Rheometer" +driver = "antonparr_MCR500" +imptype = rheometry +ip = noip +port = noport +speed_name = rhSpeed +torque_name = rhTorque +tol = 0.01 +settle = 5.0 + [bruker_bec1] desc = "Bruker Magnet" driver = "bruker_bec1" @@ -136,8 +219,9 @@ tol = 5.0 type = T [ls336_01] -desc = "tc1: Lakeshore 336 temperature controller" -driver = "lakeshore_336" +asyncqueue = sct +desc = "Lakeshore 336 temperature controller" +driver = "ls336" imptype = temperature ip = 10.157.205.28 port = 7777 @@ -146,8 +230,9 @@ tol1 = 1.0 tol2 = 1.0 [ls336_02] -desc = "tc2: Lakeshore 336 temperature controller" -driver = "lakeshore_336" +asyncqueue = sct +desc = "Lakeshore 336 temperature controller" +driver = "ls336" imptype = temperature ip = 10.157.205.29 port = 7777 @@ -156,8 +241,9 @@ tol1 = 1.0 tol2 = 1.0 [ls336_04] -desc = "tc3: Lakeshore 336 temperature controller" -driver = "lakeshore_336" +asyncqueue = sct +desc = "Lakeshore 336 temperature controller" +driver = "ls336" imptype = temperature ip = 10.157.205.30 port = 7777 @@ -166,8 +252,9 @@ tol1 = 1.0 tol2 = 1.0 [ls336_05] -desc = "tc4: Lakeshore 336 temperature controller" -driver = "lakeshore_336" +asyncqueue = sct +desc = "Lakeshore 336 temperature controller" +driver = "ls336" imptype = temperature ip = 137.157.201.21 port = 7777 @@ -176,8 +263,9 @@ tol1 = 1.0 tol2 = 1.0 [ls336_06] -desc = "tc5: Lakeshore 336 temperature controller" -driver = "lakeshore_336" +asyncqueue = sct +desc = "Lakeshore 336 temperature controller" +driver = "ls336" imptype = temperature ip = 137.157.201.21 port = 7777 @@ -186,8 +274,9 @@ tol1 = 1.0 tol2 = 1.0 [ls336_12] -desc = "tc6: Lakeshore 336 temperature controller" -driver = "lakeshore_336" +asyncqueue = sct +desc = "Lakeshore 336 temperature controller" +driver = "ls336" imptype = temperature ip = 10.157.205.31 port = 7777 @@ -196,9 +285,9 @@ tol1 = 1.0 tol2 = 1.0 [ls340_01] -desc = "tc7: Lakeshore 340 temperature controller" -driver = "lakeshore_340" -id = 2 +asyncqueue = sct +desc = "Lakeshore 340 temperature controller" +driver = "ls340" imptype = temperature ip = 137.157.201.86 port = 4001 @@ -207,8 +296,9 @@ tol1 = 1.0 tol2 = 1.0 [ls340_02] -desc = "tc8: Lakeshore 340 temperature controller" -driver = "lakeshore_340" +asyncqueue = sct +desc = "Lakeshore 340 temperature controller" +driver = "ls340" imptype = temperature ip = 137.157.201.86 port = 4002 @@ -216,6 +306,16 @@ 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" @@ -238,11 +338,20 @@ terminator = \r\n tol = 1.0 valve_tol = 2 +[newport_rva] +desc = "Newport Rapid Visco-Analyser" +driver = "nprvasm2" +imptype = viscosity +ip = 137.157.202.91 +port = 4001 +tol = 1 + [normal_sample_stage] desc = "This is the default sample stage configuration xyz translation omega rotation but no tilt axes" imptype = motion_axis [protek_01] +asyncqueue = sct desc = "Protek Multimeter" driver = "protekmm" imptype = multimeter @@ -250,6 +359,7 @@ ip = 10.157.205.36 port = 4001 [protek_02] +asyncqueue = sct desc = "Protek Multimeter" driver = "protekmm" imptype = multimeter @@ -258,7 +368,7 @@ port = 4001 [watlow_rm] desc = "Watlow RM temperature controller" -driver = "watlow_rm" +driver = "watlow_mrm" imptype = temperature ip = 10.157.205.6 terminator = \r\n @@ -267,6 +377,7 @@ type = T [west4100] desc = "Blue furnace temperature controller" +dev_id = 1 driver = "west4100" imptype = temperature ip = 10.157.205.19