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

Pullback from Quokka 2015-04-17

Browse Source
This commit is contained in:
Douglas Clowes
2015-04-17 12:15:01 +10:00
parent a5498a2a77
commit 1f9dd8da95
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
site_ansto/instrument/config/environment/temperature/sct_watlow_mrm.tcl
View File

@ -56,8 +56,8 @@ proc ::scobj::watlow_mrm::add_driver {name device_class simulation_flag ip_addre
::scobj::watlow_mrm::sics_log 9 "makesctcontroller sct_${name} aqadapter ${tcp_port}" ::scobj::watlow_mrm::sics_log 9 "makesctcontroller sct_${name} aqadapter ${tcp_port}"
makesctcontroller sct_${name} aqadapter ${tcp_port} makesctcontroller sct_${name} aqadapter ${tcp_port}
} else { } else {
::scobj::watlow_mrm::sics_log 9 "makesctcontroller sct_${name} std ${ip_address}:${tcp_port}" ::scobj::watlow_mrm::sics_log 9 "makesctcontroller sct_${name} modbus ${ip_address}:${tcp_port}"
makesctcontroller sct_${name} std ${ip_address}:${tcp_port} makesctcontroller sct_${name} modbus ${ip_address}:${tcp_port}
} }
} else { } else {
::scobj::watlow_mrm::sics_log 9 "simulation_flag={simulation_flag} => No sctcontroller for watlow_mrm" ::scobj::watlow_mrm::sics_log 9 "simulation_flag={simulation_flag} => No sctcontroller for watlow_mrm"

10
site_ansto/instrument/sans/config/motors/positmotor_configuration.tcl
View File

@ -47,11 +47,21 @@ set 10sample_table {
10 -214.5996 10 -214.5996
} }
set 5sample_table {
1 120
2 60
3 0
4 -60
5 -120
}
if { [ info exists ::config_dict ] } { if { [ info exists ::config_dict ] } {
if { [ dict exists $::config_dict sample_stage implementation ] } { if { [ dict exists $::config_dict sample_stage implementation ] } {
set implementation [ dict get $::config_dict sample_stage implementation ] set implementation [ dict get $::config_dict sample_stage implementation ]
if {$implementation == "normal_sample_stage"} { if {$implementation == "normal_sample_stage"} {
# Don't make posit motor # Don't make posit motor
} elseif {$implementation == "5_pos_sample_tumbler"} {
mkPosit sct_mc1 sampleNum float samx sample $5sample_table
} elseif {$implementation == "10_pos_sample_stage"} { } elseif {$implementation == "10_pos_sample_stage"} {
mkPosit sct_mc1 sampleNum float samx sample $10sample_table mkPosit sct_mc1 sampleNum float samx sample $10sample_table
} elseif {$implementation == "20_pos_sample_stage"} { } elseif {$implementation == "20_pos_sample_stage"} {