linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

New sicsconfig.ini file configuration editor.

Browse Source 
Updated wombat sics_config.ini and gen_sct.py
Generated new tcl files from sct templates and
modified some old sct_*.tcl drivers.

TODO
sct_keithley_2700.tcl
magneticField/sct_oxford_labview.tcl
magneticField/sct_bruker_BEC1.tcl
temperature/sct_watlow_st4.tcl
temperature/sct_oxford_mercury.tcl
temperature/sct_mercury_pres.tcl
temperature/sct_julabo_lh45.tcl
temperature/sct_lakeshore_340.tcl
temperature/sct_julabo_lh45_gen.tcl
temperature/sct_watlow_rm.tcl
temperature/sct_eurotherm_2000.tcl
temperature/sct_lakeshore_336.tcl
temperature/sct_watlow_pm.tcl
temperature/sct_oxford_itc.tcl
temperature/sct_lakeshore_370.tcl
temperature/west400.tcl
This commit is contained in:
Ferdi Franceschini
2014-06-30 09:08:19 +10:00
parent c960a3bb2d
commit e971cd8b64
25 changed files with 782 additions and 344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
site_ansto/instrument/hipd/config/motors/motor_configuration.tcl
View File

@@ -111,16 +111,19 @@ set move_count 10
set axis_config 0
if { [ info exists ::config_dict ] } {
if {[ dict get $::config_dict normal_sample_stage enabled ] } {
set axis_config 0
} elseif {[ dict get $::config_dict eularian_cradle enabled ] } {
set axis_config 1
} elseif {[ dict get $::config_dict small_omega enabled ] } {
set axis_config 2
} elseif {[ dict get $::config_dict 12tmagnet_sample_insert enabled ] } {
set axis_config 3
} else {
set axis_config 0
if { [ dict exists $::config_dict sample_stage implementation ] } {
set implementation [ dict get $::config_dict sample_stage implementation ]
if {$implementation == "normal_sample_stage"} {
set axis_config 0
} elseif {$implementation == "eularian_cradle"} {
set axis_config 1
} elseif {$implementation == "small_omega"} {
set axis_config 2
} elseif {$implementation == "12tmagnet_sample_insert"} {
set axis_config 3
} else {
set axis_config 0
}
}
}

132
site_ansto/instrument/hipd/util/sics_config.ini
View File

@@ -1,32 +1,76 @@
[12tmagnet]
desc = "12 Tesla Oxford Magnet"
driver = "12tmagnet"
enabled = False
group = environment:magnet
group = implementation
id = 11
ip = 10.157.205.3
name = magnetic
port = 55001
type = B
imptype = magnetic_field
[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
group = implementation
offifon = normal_sample_stage,eularian_cradle,small_omega
radio = samstage
imptype = motion_axis
[Default]
cascade = sample_stage:normal_sample_stage
enabled = True
group = Configuration
[12tmagnet_setup]
cascade = 12tmagnet,12tmagnet_sample_insert,mercury_scpi
enabled = False
group = 0setup
cascade = B1:12tmagnet,sample_stage:12tmagnet_sample_insert,T1:mercury_scpi
enabled = True
group = Configuration
onifoff = normal_sample_stage
[CF1]
desc = "cf1: Bottom loading cryofurnace"
driver = "ls340"
cascade = T1:CF1_ls340,sample_stage:normal_sample_stage
enabled = False
group = environment:temperature
group = Configuration
[T1]
name = tc1
enabled = True
group = Configuration Components
implementation = mercury_scpi
type = temperature
[T2]
name = tc2
enabled = False
group = Configuration Components
implementation = ls336_02
type = temperature
[T3]
name = tc3
enabled = False
group = Configuration Components
implementation = ls336_04
type = temperature
[B1]
name = magnet1
enabled = True
group = Configuration Components
implementation = 12tmagnet
type = magnetic_field
[sample_stage]
name = sample_stage
enabled = Always
group = Configuration Components
implementation = 12tmagnet_sample_insert
type = motion_axis
[CF1_ls340]
desc = "cf1: Bottom loading cryofurnace"
driver = "lakeshore_340"
group = implementation
id = 12
ip = 10.157.205.43
name = cf1
@@ -35,19 +79,19 @@ terminator = \r\n
tol1 = 1.0
tol2 = 1.0
type = T
imptype = temperature
[eularian_cradle]
desc = "Load the Eulerian cradle configuration"
enabled = False
group = motors
group = implementation
offifon = normal_sample_stage,small_omega,12tmagnet_sample_insert
radio = samstage
imptype = motion_axis
[ls336_01]
desc = "tc1: Lakeshore 336 temperature controller"
driver = "ls336"
enabled = False
group = environment:temperature
driver = "lakeshore_336"
group = implementation
id = 1
ip = 10.157.205.28
name = tc1
@@ -56,12 +100,12 @@ terminator = \r\n
tol1 = 1.0
tol2 = 1.0
type = T
imptype = temperature
[ls336_02]
desc = "tc2: Lakeshore 336 temperature controller"
driver = "ls336"
enabled = False
group = environment:temperature
driver = "lakeshore_336"
group = implementation
id = 2
ip = 10.157.205.29
name = tc2
@@ -70,12 +114,12 @@ terminator = \r\n
tol1 = 1.0
tol2 = 1.0
type = T
imptype = temperature
[ls336_04]
desc = "tc3: Lakeshore 336 temperature controller"
driver = "ls336"
enabled = False
group = environment:temperature
driver = "lakeshore_336"
group = implementation
id = 3
ip = 10.157.205.30
name = tc3
@@ -84,12 +128,12 @@ terminator = \r\n
tol1 = 1.0
tol2 = 1.0
type = T
imptype = temperature
[ls336_05]
desc = "tc4: Lakeshore 336 temperature controller"
driver = "ls336"
enabled = False
group = environment:temperature
driver = "lakeshore_336"
group = implementation
id = 4
ip = 137.157.201.21
name = tc4
@@ -98,12 +142,12 @@ terminator = \r\n
tol1 = 1.0
tol2 = 1.0
type = T
imptype = temperature
[ls336_06]
desc = "tc5: Lakeshore 336 temperature controller"
driver = "ls336"
enabled = False
group = environment:temperature
driver = "lakeshore_336"
group = implementation
id = 5
ip = 137.157.201.21
name = tc5
@@ -112,12 +156,12 @@ terminator = \r\n
tol1 = 1.0
tol2 = 1.0
type = T
imptype = temperature
[ls336_12]
desc = "tc6: Lakeshore 336 temperature controller"
driver = "ls336"
enabled = False
group = environment:temperature
driver = "lakeshore_336"
group = implementation
id = 6
ip = 10.157.205.31
name = tc6
@@ -126,11 +170,12 @@ terminator = \r\n
tol1 = 1.0
tol2 = 1.0
type = T
imptype = temperature
[ls340_01]
desc = "tc7: Lakeshore 340 temperature controller"
enabled = False
group = environment:temperature
group = implementation
driver = "lakeshore_340"
id = 7
ip = 137.157.201.86
name = tc7
@@ -139,11 +184,12 @@ terminator = \r\n
tol1 = 1.0
tol2 = 1.0
type = T
imptype = temperature
[ls340_02]
desc = "tc8: Lakeshore 340 temperature controller"
enabled = False
group = environment:temperature
group = implementation
driver = "lakeshore_340"
id = 8
ip = 137.157.201.86
name = tc8
@@ -152,42 +198,42 @@ terminator = \r\n
tol1 = 1.0
tol2 = 1.0
type = T
imptype = temperature
[mercury_scpi]
desc = "tc9: Oxford Mercury temperature controller in Mercury mode"
driver = "mercury_scpi"
enabled = False
group = environment:temperature
group = implementation
id = 9
ip = 10.157.205.5
name = tc9
offifon = mercury_itc500
port = 7020
terminator = \r
tol = 2.0
type = T
imptype = temperature
[normal_sample_stage]
desc = "This is the default sample stage configuration with xy translation and phi and chi tilt stages"
enabled = True
group = motors
group = implementation
offifon = eularian_cradle,small_omega,12tmagnet_sample_insert
radio = samstage
imptype = motion_axis
[small_omega]
desc = "Load the small omega configuration"
enabled = False
group = motors
group = implementation
offifon = normal_sample_stage,eularian_cradle,12tmagnet_sample_insert
radio = samstage
imptype = motion_axis
[west4100]
desc = "tc10: Blue furnace temperature controller"
driver = "west4100"
enabled = False
group = environment:temperature
group = implementation
id = 10
ip = 10.157.205.19
name = tc10
type = T
imptype = temperature

6
site_ansto/instrument/hipd/wombat_configuration.tcl
View File

@@ -76,9 +76,9 @@ SetVoltScale 2000.0
# LS336 01 at 205.28
# LS336 02 at 205.29
add_sct_ls336 tc2 10.157.205.30 7777 "\r\n" 1.0 1.0
add_sct_ls336 tc1 10.157.205.31 7777 "\r\n" 1.0 1.0
add_sct_ls340 tc3 137.157.201.86 4001 "\r\n" 1.0 1.0
# add_sct_ls336 tc2 10.157.205.30 7777 "\r\n" 1.0 1.0
# add_sct_ls336 tc1 10.157.205.31 7777 "\r\n" 1.0 1.0
# add_sct_ls340 tc3 137.157.201.86 4001 "\r\n" 1.0 1.0
server_init
###########################################