From e3377553bda4e7714618ff23fb485b267dc34f35 Mon Sep 17 00:00:00 2001 From: Douglas Clowes Date: Tue, 24 Jun 2014 15:23:52 +1000 Subject: [PATCH] Sort the *.ini files so we can better compare them --- .../instrument/hipd/util/sics_config.ini | 357 +++++++++--------- .../instrument/hrpd/util/sics_config.ini | 169 ++++----- .../instrument/rsd/util/sics_config.ini | 151 ++++---- .../instrument/tas/util/sics_config.ini | 155 ++++---- 4 files changed, 418 insertions(+), 414 deletions(-) diff --git a/site_ansto/instrument/hipd/util/sics_config.ini b/site_ansto/instrument/hipd/util/sics_config.ini index 3d81dc33..9f881c9b 100644 --- a/site_ansto/instrument/hipd/util/sics_config.ini +++ b/site_ansto/instrument/hipd/util/sics_config.ini @@ -1,192 +1,193 @@ -[12tmagnet_setup] -cascade = 12tmagnet,12tmagnet_sample_insert,mercury_scpi -enabled = False -group = 0setup -onifoff = normal_sample_stage - -[ls336_01] -desc = "tc1: Lakeshore 336 temperature controller" -driver = "ls336" -enabled = False -group = environment:temperature -ip = 10.157.205.28 -name = tc1 -type = T -id = 1 -port = 7777 -terminator = \r\n -tol1 = 1.0 -tol2 = 1.0 - -[ls336_02] -desc = "tc2: Lakeshore 336 temperature controller" -driver = "ls336" -enabled = False -group = environment:temperature -ip = 10.157.205.29 -name = tc2 -type = T -id = 2 -port = 7777 -terminator = \r\n -tol1 = 1.0 -tol2 = 1.0 - -[ls336_04] -desc = "tc3: Lakeshore 336 temperature controller" -driver = "ls336" -enabled = False -group = environment:temperature -ip = 10.157.205.30 -name = tc3 -type = T -id = 3 -port = 7777 -terminator = \r\n -tol1 = 1.0 -tol2 = 1.0 - -[ls336_05] -desc = "tc4: Lakeshore 336 temperature controller" -driver = "ls336" -enabled = False -group = environment:temperature -ip = 137.157.201.21 -name = tc4 -type = T -id = 4 -port = 7777 -terminator = \r\n -tol1 = 1.0 -tol2 = 1.0 - -[ls336_06] -desc = "tc5: Lakeshore 336 temperature controller" -driver = "ls336" -enabled = False -group = environment:temperature -ip = 137.157.201.21 -name = tc5 -type = T -id = 5 -port = 7777 -terminator = \r\n -tol1 = 1.0 -tol2 = 1.0 - -[ls336_12] -desc = "tc6: Lakeshore 336 temperature controller" -driver = "ls336" -enabled = False -group = environment:temperature -ip = 10.157.205.31 -name = tc6 -type = T -id = 6 -port = 7777 -terminator = \r\n -tol1 = 1.0 -tol2 = 1.0 - -[ls340_01] -desc = "tc7: Lakeshore 340 temperature controller" -enabled = False -group = environment:temperature -ip = 137.157.201.86 -name = tc7 -type = T -id = 7 -port = 4001 -terminator = \r\n -tol1 = 1.0 -tol2 = 1.0 - -[ls340_02] -desc = "tc8: Lakeshore 340 temperature controller" -enabled = False -group = environment:temperature -ip = 137.157.201.86 -name = tc8 -type = T -id = 8 -port = 4002 -terminator = \r\n -tol1 = 1.0 -tol2 = 1.0 - -[mercury_scpi] -desc = "tc9: Oxford Mercury temperature controller in Mercury mode" -driver = "mercury_scpi" -enabled = False -group = environment:temperature -ip = 10.157.205.5 -name = tc9 -type = T -id = 9 -offifon = mercury_itc500 -port = 7020 -tol = 2.0 -terminator = \r - -[west4100] -desc = "tc10: Blue furnace temperature controller" -driver = "west4100" -enabled = False -group = environment:temperature -ip = 10.157.205.19 -name = tc10 -type = T -id = 10 - [12tmagnet] desc = "12 Tesla Oxford Magnet" driver = "12tmagnet" enabled = False group = environment:magnet +id = 11 ip = 10.157.205.3 name = magnetic -type = B -id = 11 port = 55001 - -[CF1] -desc = "cf1: Bottom loading cryofurnace" -driver = "ls340" -enabled = False -group = environment:temperature -ip = 10.157.205.43 -name = cf1 -type = T -id = 12 -port = 4001 -terminator = \r\n -tol1 = 1.0 -tol2 = 1.0 - -[normal_sample_stage] -desc = "This is the default sample stage configuration with xy translation and phi and chi tilt stages" -enabled = True -group = motors -offifon = eularian_cradle,small_omega,12tmagnet_sample_insert -radio=samstage - -[eularian_cradle] -desc = "Load the Eulerian cradle configuration" -enabled = False -group = motors -offifon = normal_sample_stage,small_omega,12tmagnet_sample_insert -radio=samstage - -[small_omega] -desc = "Load the small omega configuration" -enabled = False -group = motors -offifon = normal_sample_stage,eularian_cradle,12tmagnet_sample_insert -radio=samstage +type = B [12tmagnet_sample_insert] desc = "som will be redefined as the magnet sample insert rotation. Sample stage will be renamed to somss" enabled = False group = motors offifon = normal_sample_stage,eularian_cradle,small_omega -radio=samstage +radio = samstage + +[12tmagnet_setup] +cascade = 12tmagnet,12tmagnet_sample_insert,mercury_scpi +enabled = False +group = 0setup +onifoff = normal_sample_stage + +[CF1] +desc = "cf1: Bottom loading cryofurnace" +driver = "ls340" +enabled = False +group = environment:temperature +id = 12 +ip = 10.157.205.43 +name = cf1 +port = 4001 +terminator = \r\n +tol1 = 1.0 +tol2 = 1.0 +type = T + +[eularian_cradle] +desc = "Load the Eulerian cradle configuration" +enabled = False +group = motors +offifon = normal_sample_stage,small_omega,12tmagnet_sample_insert +radio = samstage + +[ls336_01] +desc = "tc1: Lakeshore 336 temperature controller" +driver = "ls336" +enabled = False +group = environment:temperature +id = 1 +ip = 10.157.205.28 +name = tc1 +port = 7777 +terminator = \r\n +tol1 = 1.0 +tol2 = 1.0 +type = T + +[ls336_02] +desc = "tc2: Lakeshore 336 temperature controller" +driver = "ls336" +enabled = False +group = environment:temperature +id = 2 +ip = 10.157.205.29 +name = tc2 +port = 7777 +terminator = \r\n +tol1 = 1.0 +tol2 = 1.0 +type = T + +[ls336_04] +desc = "tc3: Lakeshore 336 temperature controller" +driver = "ls336" +enabled = False +group = environment:temperature +id = 3 +ip = 10.157.205.30 +name = tc3 +port = 7777 +terminator = \r\n +tol1 = 1.0 +tol2 = 1.0 +type = T + +[ls336_05] +desc = "tc4: Lakeshore 336 temperature controller" +driver = "ls336" +enabled = False +group = environment:temperature +id = 4 +ip = 137.157.201.21 +name = tc4 +port = 7777 +terminator = \r\n +tol1 = 1.0 +tol2 = 1.0 +type = T + +[ls336_06] +desc = "tc5: Lakeshore 336 temperature controller" +driver = "ls336" +enabled = False +group = environment:temperature +id = 5 +ip = 137.157.201.21 +name = tc5 +port = 7777 +terminator = \r\n +tol1 = 1.0 +tol2 = 1.0 +type = T + +[ls336_12] +desc = "tc6: Lakeshore 336 temperature controller" +driver = "ls336" +enabled = False +group = environment:temperature +id = 6 +ip = 10.157.205.31 +name = tc6 +port = 7777 +terminator = \r\n +tol1 = 1.0 +tol2 = 1.0 +type = T + +[ls340_01] +desc = "tc7: Lakeshore 340 temperature controller" +enabled = False +group = environment:temperature +id = 7 +ip = 137.157.201.86 +name = tc7 +port = 4001 +terminator = \r\n +tol1 = 1.0 +tol2 = 1.0 +type = T + +[ls340_02] +desc = "tc8: Lakeshore 340 temperature controller" +enabled = False +group = environment:temperature +id = 8 +ip = 137.157.201.86 +name = tc8 +port = 4002 +terminator = \r\n +tol1 = 1.0 +tol2 = 1.0 +type = T + +[mercury_scpi] +desc = "tc9: Oxford Mercury temperature controller in Mercury mode" +driver = "mercury_scpi" +enabled = False +group = environment:temperature +id = 9 +ip = 10.157.205.5 +name = tc9 +offifon = mercury_itc500 +port = 7020 +terminator = \r +tol = 2.0 +type = T + +[normal_sample_stage] +desc = "This is the default sample stage configuration with xy translation and phi and chi tilt stages" +enabled = True +group = motors +offifon = eularian_cradle,small_omega,12tmagnet_sample_insert +radio = samstage + +[small_omega] +desc = "Load the small omega configuration" +enabled = False +group = motors +offifon = normal_sample_stage,eularian_cradle,12tmagnet_sample_insert +radio = samstage + +[west4100] +desc = "tc10: Blue furnace temperature controller" +driver = "west4100" +enabled = False +group = environment:temperature +id = 10 +ip = 10.157.205.19 +name = tc10 +type = T + diff --git a/site_ansto/instrument/hrpd/util/sics_config.ini b/site_ansto/instrument/hrpd/util/sics_config.ini index fd88ffc0..7c378da0 100644 --- a/site_ansto/instrument/hrpd/util/sics_config.ini +++ b/site_ansto/instrument/hrpd/util/sics_config.ini @@ -1,3 +1,19 @@ +[12tmagnet] +desc = "12 Tesla Oxford Magnet" +driver = "12tmagnet" +enabled = False +group = environment:magnet +id = 27 +ip = 10.157.205.3 +name = magnetic +port = 55001 +type = B + +[12tmagnet_sample_insert] +desc = "REVIEW THIS -> som will be redefined as the sample insert rotation. Sample stage will be renamed to somss" +enabled = False +group = motors + [12tmagnet_setup] cascade = 12tmagnet,12tmagnet_sample_insert,mercury_scpi enabled = False @@ -8,163 +24,148 @@ desc = "tc1: Lakeshore 336 temperature controller" driver = "ls336" enabled = False group = environment:temperature +id = 1 ip = 10.157.205.28 name = tc1 -type = T -id = 1 port = 7777 terminator = \r\n tol1 = 1.0 tol2 = 1.0 - -[ls336_2] -desc = "tc2: Lakeshore 336 temperature controller" -driver = "ls336" -enabled = False -group = environment:temperature -ip = 10.157.205.29 -name = tc2 type = T -id = 2 -port = 7777 -terminator = \r\n -tol1 = 1.0 -tol2 = 1.0 - -[ls336_4] -desc = "tc4: Lakeshore 336 temperature controller" -driver = "ls336" -enabled = False -group = environment:temperature -ip = 10.157.205.30 -name = tc4 -type = T -id = 4 -port = 7777 -terminator = \r\n -tol1 = 1.0 -tol2 = 1.0 - -[ls336_5] -desc = "tc5: Lakeshore 336 temperature controller" -driver = "ls336" -enabled = False -group = environment:temperature -ip = 137.157.201.21 -name = tc5 -type = T -id = 5 -port = 7777 -terminator = \r\n -tol1 = 1.0 -tol2 = 1.0 - -[ls336_6] -desc = "tc6: Lakeshore 336 temperature controller" -driver = "ls336" -enabled = False -group = environment:temperature -ip = 137.157.201.21 -name = tc6 -type = T -id = 6 -port = 7777 -terminator = \r\n -tol1 = 1.0 -tol2 = 1.0 [ls336_11] desc = "tc11: Lakeshore 336 temperature controller" driver = "ls336" enabled = False group = environment:temperature +id = 11 ip = 10.157.205.27 name = tc11 -type = T -id = 11 port = 7777 terminator = \r\n tol1 = 1.0 tol2 = 1.0 +type = T [ls336_12] desc = "tc12: Lakeshore 336 temperature controller" driver = "ls336" enabled = False group = environment:temperature +id = 12 ip = 10.157.205.31 name = tc12 -type = T -id = 12 port = 7777 terminator = \r\n tol1 = 1.0 tol2 = 1.0 +type = T + +[ls336_2] +desc = "tc2: Lakeshore 336 temperature controller" +driver = "ls336" +enabled = False +group = environment:temperature +id = 2 +ip = 10.157.205.29 +name = tc2 +port = 7777 +terminator = \r\n +tol1 = 1.0 +tol2 = 1.0 +type = T + +[ls336_4] +desc = "tc4: Lakeshore 336 temperature controller" +driver = "ls336" +enabled = False +group = environment:temperature +id = 4 +ip = 10.157.205.30 +name = tc4 +port = 7777 +terminator = \r\n +tol1 = 1.0 +tol2 = 1.0 +type = T + +[ls336_5] +desc = "tc5: Lakeshore 336 temperature controller" +driver = "ls336" +enabled = False +group = environment:temperature +id = 5 +ip = 137.157.201.21 +name = tc5 +port = 7777 +terminator = \r\n +tol1 = 1.0 +tol2 = 1.0 +type = T + +[ls336_6] +desc = "tc6: Lakeshore 336 temperature controller" +driver = "ls336" +enabled = False +group = environment:temperature +id = 6 +ip = 137.157.201.21 +name = tc6 +port = 7777 +terminator = \r\n +tol1 = 1.0 +tol2 = 1.0 +type = T [ls340_1] desc = "tc13: Lakeshore 340 temperature controller" driver = "ls340" enabled = False group = environment:temperature +id = 13 ip = ca5-echidna name = tc13 -type = T -id = 13 port = 4001 terminator = \r\n tol1 = 1.0 tol2 = 1.0 +type = T [ls340_2] desc = "tc14: Lakeshore 340 temperature controller" driver = "ls340" enabled = False group = environment:temperature +id = 14 ip = ca5-echidna name = tc14 -type = T -id = 14 port = 4002 terminator = \r\n tol1 = 1.0 tol2 = 1.0 +type = T [mercury_scpi] desc = "tc25: Oxford Mercury temperature controller in Mercury mode" driver = "mercury_scpi" enabled = False group = environment:temperature +id = 25 ip = 10.157.205.5 name = tc25 -type = T -id = 25 offifon = mercury_itc500 port = 7020 -tol = 2.0 terminator = \r +tol = 2.0 +type = T [west4100] desc = "tc26: Blue furnace temperature controller" driver = "west4100" enabled = False group = environment:temperature +id = 26 ip = 10.157.205.19 name = tc26 type = T -id = 26 -[12tmagnet] -desc = "12 Tesla Oxford Magnet" -driver = "12tmagnet" -enabled = False -group = environment:magnet -ip = 10.157.205.3 -name = magnetic -type = B -id = 27 -port = 55001 - -[12tmagnet_sample_insert] -desc = "REVIEW THIS -> som will be redefined as the sample insert rotation. Sample stage will be renamed to somss" -enabled = False -group = motors diff --git a/site_ansto/instrument/rsd/util/sics_config.ini b/site_ansto/instrument/rsd/util/sics_config.ini index 553bb486..f8aa9b8d 100644 --- a/site_ansto/instrument/rsd/util/sics_config.ini +++ b/site_ansto/instrument/rsd/util/sics_config.ini @@ -1,123 +1,124 @@ +[eurotherm_2000] +desc = "tc26: Eurotherm 2000 temperature controller" +driver = "et2000" +enabled = False +group = environment:temperature +id = 26 +ip = 137.157.201.213 +name = et2000 +port = 502 +tol = 5.0 +type = T + [ls336_1] desc = "tc1: Lakeshore 336 temperature controller" driver = "ls336" enabled = False group = environment:temperature +id = 1 ip = 10.157.205.28 name = tc1 -type = T -id = 1 port = 7777 terminator = \r\n tol1 = 1.0 tol2 = 1.0 - -[ls336_2] -desc = "tc2: Lakeshore 336 temperature controller" -driver = "ls336" -enabled = False -group = environment:temperature -ip = 10.157.205.29 -name = tc2 type = T -id = 2 -port = 7777 -terminator = \r\n -tol1 = 1.0 -tol2 = 1.0 - -[ls336_4] -desc = "tc4: Lakeshore 336 temperature controller" -driver = "ls336" -enabled = False -group = environment:temperature -ip = 10.157.205.30 -name = tc4 -type = T -id = 4 -port = 7777 -terminator = \r\n -tol1 = 1.0 -tol2 = 1.0 - -[ls336_5] -desc = "tc5: Lakeshore 336 temperature controller" -driver = "ls336" -enabled = False -group = environment:temperature -ip = 137.157.201.21 -name = tc5 -type = T -id = 5 -port = 7777 -terminator = \r\n -tol1 = 1.0 -tol2 = 1.0 - -[ls336_6] -desc = "tc6: Lakeshore 336 temperature controller" -driver = "ls336" -enabled = False -group = environment:temperature -ip = 137.157.201.21 -name = tc6 -type = T -id = 6 -port = 7777 -terminator = \r\n -tol1 = 1.0 -tol2 = 1.0 [ls336_11] desc = "tc11: Lakeshore 336 temperature controller" driver = "ls336" enabled = False group = environment:temperature +id = 11 ip = 10.157.205.27 name = tc11 -type = T -id = 11 port = 7777 terminator = \r\n tol1 = 1.0 tol2 = 1.0 +type = T [ls336_12] desc = "tc12: Lakeshore 336 temperature controller" driver = "ls336" enabled = False group = environment:temperature +id = 12 ip = 10.157.205.31 name = tc12 -type = T -id = 12 port = 7777 terminator = \r\n tol1 = 1.0 tol2 = 1.0 +type = T + +[ls336_2] +desc = "tc2: Lakeshore 336 temperature controller" +driver = "ls336" +enabled = False +group = environment:temperature +id = 2 +ip = 10.157.205.29 +name = tc2 +port = 7777 +terminator = \r\n +tol1 = 1.0 +tol2 = 1.0 +type = T + +[ls336_4] +desc = "tc4: Lakeshore 336 temperature controller" +driver = "ls336" +enabled = False +group = environment:temperature +id = 4 +ip = 10.157.205.30 +name = tc4 +port = 7777 +terminator = \r\n +tol1 = 1.0 +tol2 = 1.0 +type = T + +[ls336_5] +desc = "tc5: Lakeshore 336 temperature controller" +driver = "ls336" +enabled = False +group = environment:temperature +id = 5 +ip = 137.157.201.21 +name = tc5 +port = 7777 +terminator = \r\n +tol1 = 1.0 +tol2 = 1.0 +type = T + +[ls336_6] +desc = "tc6: Lakeshore 336 temperature controller" +driver = "ls336" +enabled = False +group = environment:temperature +id = 6 +ip = 137.157.201.21 +name = tc6 +port = 7777 +terminator = \r\n +tol1 = 1.0 +tol2 = 1.0 +type = T [mercury_scpi] desc = "tc25: Oxford Mercury temperature controller in Mercury mode" driver = "mercury_scpi" enabled = False group = environment:temperature +id = 25 ip = 10.157.205.5 name = tc25 -type = T -id = 25 offifon = mercury_itc500 port = 7020 -tol = 2.0 terminator = \r - -[eurotherm_2000] -desc = "tc26: Eurotherm 2000 temperature controller" -driver = "et2000" -enabled = false -group = environment:temperature -name = et2000 -ip = 137.157.201.213 -port = 502 -id = 26 -tol = 5.0 +tol = 2.0 type = T + diff --git a/site_ansto/instrument/tas/util/sics_config.ini b/site_ansto/instrument/tas/util/sics_config.ini index 352cd7a7..a6d20e29 100644 --- a/site_ansto/instrument/tas/util/sics_config.ini +++ b/site_ansto/instrument/tas/util/sics_config.ini @@ -1,3 +1,14 @@ +[12tmagnet] +desc = "12 Tesla Oxford Magnet" +driver = "12tmagnet" +enabled = False +group = environment:magnet +id = 11 +ip = 10.157.205.3 +name = magnetic +port = 55001 +type = B + [12tmagnet_setup] cascade = 12tmagnet,s1_sample_insert,mercury_scpi enabled = False @@ -8,125 +19,125 @@ desc = "tc1: Lakeshore 336 temperature controller" driver = "ls336" enabled = False group = environment:temperature +id = 1 ip = 10.157.205.28 name = tc1 -type = T -id = 1 port = 7777 terminator = \r\n tol1 = 1.0 tol2 = 1.0 - -[ls336_2] -desc = "tc2: Lakeshore 336 temperature controller" -driver = "ls336" -enabled = False -group = environment:temperature -ip = 10.157.205.29 -name = tc2 type = T -id = 2 -port = 7777 -terminator = \r\n -tol1 = 1.0 -tol2 = 1.0 - -[ls336_4] -desc = "tc3: Lakeshore 336 temperature controller" -driver = "ls336" -enabled = False -group = environment:temperature -ip = 10.157.205.30 -name = tc3 -type = T -id = 3 -port = 7777 -terminator = \r\n -tol1 = 1.0 -tol2 = 1.0 - -[ls336_5] -desc = "tc4: Lakeshore 336 temperature controller" -driver = "ls336" -enabled = False -group = environment:temperature -ip = 137.157.201.21 -name = tc4 -type = T -id = 4 -port = 7777 -terminator = \r\n -tol1 = 1.0 -tol2 = 1.0 - -[ls336_6] -desc = "tc5: Lakeshore 336 temperature controller" -driver = "ls336" -enabled = False -group = environment:temperature -ip = 137.157.201.21 -name = tc5 -type = T -id = 5 -port = 7777 -terminator = \r\n -tol1 = 1.0 -tol2 = 1.0 [ls336_12] desc = "tc6: Lakeshore 336 temperature controller" driver = "ls336" enabled = False group = environment:temperature +id = 6 ip = 10.157.205.31 name = tc6 -type = T -id = 6 port = 7777 terminator = \r\n tol1 = 1.0 tol2 = 1.0 +type = T + +[ls336_2] +desc = "tc2: Lakeshore 336 temperature controller" +driver = "ls336" +enabled = False +group = environment:temperature +id = 2 +ip = 10.157.205.29 +name = tc2 +port = 7777 +terminator = \r\n +tol1 = 1.0 +tol2 = 1.0 +type = T + +[ls336_4] +desc = "tc3: Lakeshore 336 temperature controller" +driver = "ls336" +enabled = False +group = environment:temperature +id = 3 +ip = 10.157.205.30 +name = tc3 +port = 7777 +terminator = \r\n +tol1 = 1.0 +tol2 = 1.0 +type = T + +[ls336_5] +desc = "tc4: Lakeshore 336 temperature controller" +driver = "ls336" +enabled = False +group = environment:temperature +id = 4 +ip = 137.157.201.21 +name = tc4 +port = 7777 +terminator = \r\n +tol1 = 1.0 +tol2 = 1.0 +type = T + +[ls336_6] +desc = "tc5: Lakeshore 336 temperature controller" +driver = "ls336" +enabled = False +group = environment:temperature +id = 5 +ip = 137.157.201.21 +name = tc5 +port = 7777 +terminator = \r\n +tol1 = 1.0 +tol2 = 1.0 +type = T [ls340_1] desc = "tc13: Lakeshore 340 temperature controller" driver = "ls340" enabled = False group = environment:temperature +id = 13 ip = 137.157.203.137 name = tc13 -type = T -id = 13 port = 4001 terminator = \r\n tol1 = 1.0 tol2 = 1.0 +type = T [ls370] desc = "tc8: Lakeshore 370 temperature controller" driver = "ls370" enabled = False group = environment:temperature +id = 8 ip = 137.157.203.137 name = tc8 -type = T -id = 8 port = 4003 terminator = \r\n tol = 2.0 +type = T [mercury_scpi] desc = "tc9: Oxford Mercury temperature controller in Mercury mode" driver = "mercury_scpi" enabled = False group = environment:temperature +id = 9 ip = 10.157.205.5 name = tc9 -type = T -id = 9 offifon = mercury_itc500 port = 7020 -tol = 2.0 terminator = \r +tol = 2.0 +type = T [s1_sample_insert] desc = "s1 will be defined as the sample insert rotation. Sample stage will be renamed to s1ss and sgu and sgl will be simulated" @@ -138,18 +149,8 @@ desc = "tc10: Blue furnace temperature controller" driver = "west4100" enabled = False group = environment:temperature +id = 10 ip = 10.157.205.19 name = tc10 type = T -id = 10 -[12tmagnet] -desc = "12 Tesla Oxford Magnet" -driver = "12tmagnet" -enabled = False -group = environment:magnet -ip = 10.157.205.3 -name = magnetic -type = B -id = 11 -port = 55001