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

Merge from Quokka sans sct_flipper, environment, motor_config

Browse Source
This commit is contained in:
Douglas Clowes
2014-06-25 16:41:54 +10:00
parent 7d36bb0508
commit d404bdbb06
3 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
site_ansto/instrument/sans/config/environment/environment.tcl
View File

@@ -50,7 +50,7 @@ switch [string tolower $envtemp] {
}
"11tmagnet" {
puts "Configuring 11TMagnet"
add_sct_ls340 tc2 137.157.202.78 4001 "\r" 0.5 5.0
add_sct_ls340 tc2 137.157.202.79 4001 "\r" 0.5 5.0
if { [SplitReply [environment_simulation]] == "false"} {
::utility::macro::getset float temperature {} {
return [sicsmsgfmt [hval /sample/tc2/sensor/ctrlLp1_value]]
@@ -64,13 +64,7 @@ switch [string tolower $envtemp] {
#add_ips120 ips120 137.157.202.78 4004 0.001
# make sure to lodge "fileeval $cfPath(environment)/magneticField/sct_oxford_labview.tcl" before calling below
::scobj::magnetic::mkMagnetic {
name "magnetic"
IP 137.157.202.80
PORT 22
tuning 0
interval 10
}
add_oxmag magnetic 10.157.205.44 55001
hfactory /sics/tc2/sensor/start_sensorValueA plain user float
hfactory /sics/tc2/sensor/end_sensorValueA plain user float
# ::scobj::hinitprops tc2 sensor/start_sensorValueA sensor/end_sensorValueA