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

Make 3He fields numeric and align with R 3.1

Browse Source
This commit is contained in:
Douglas Clowes
2014-11-13 14:10:20 +11:00
parent f076b537ed
commit 8a7ff5d63c
1 changed files with 5 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
site_ansto/instrument/config/beamline/he3_polanal.sct
View File

@ -16,14 +16,14 @@ driver he3_polanal = {
writeable = 1; writeable = 1;
write_command = 'polariser'; write_command = 'polariser';
check_function = chkWrite; check_function = chkWrite;
allowed = "+,-,Refresh" allowed = "-1,0,+1"
} }
var amplitude = { } var amplitude = { }
var freq = { units = 'Hertz'; } var freq = { units = 'Hertz'; }
var phase = { units = 'Degree'; } var phase = { units = 'Degree'; }
var time2 = { units = 'Second'; } var time2 = { units = 'Second'; }
var field = { units = 'Oersted'; } var field = { units = 'Oersted'; }
var timestamp = { } var timestamp = { type = int; }
} }
group polariser_start = { group polariser_start = {
conditional = '[string equal -nocase ${has_pol} "true"]'; conditional = '[string equal -nocase ${has_pol} "true"]';
@ -34,7 +34,7 @@ driver he3_polanal = {
var phase = { units = 'Degree'; } var phase = { units = 'Degree'; }
var time2 = { units = 'Second'; } var time2 = { units = 'Second'; }
var field = { units = 'Oersted'; } var field = { units = 'Oersted'; }
var timestamp = { } var timestamp = { type = int; }
} }
group analyser = { group analyser = {
@ -54,7 +54,7 @@ driver he3_polanal = {
var phase = { units = 'Degree'; } var phase = { units = 'Degree'; }
var time2 = { units = 'Second'; } var time2 = { units = 'Second'; }
var field = { units = 'Oersted'; } var field = { units = 'Oersted'; }
var timestamp = { } var timestamp = { type = int; }
} }
group analyser_start = { group analyser_start = {
conditional = '[string equal -nocase ${has_anal} "true"]'; conditional = '[string equal -nocase ${has_anal} "true"]';
@ -65,7 +65,7 @@ driver he3_polanal = {
var phase = { units = 'Degree'; } var phase = { units = 'Degree'; }
var time2 = { units = 'Second'; } var time2 = { units = 'Second'; }
var field = { units = 'Oersted'; } var field = { units = 'Oersted'; }
var timestamp = { } var timestamp = { type = int; }
} }
code chkWrite = {%% code chkWrite = {%%
@ -103,27 +103,9 @@ driver he3_polanal = {
code setValue = {%% code setValue = {%%
set cmd "${cmd_str}" set cmd "${cmd_str}"
if {[string equal -nocase [sct target] "refresh"]} {
set cmd "${cmd_str}"
}
if {[string equal -nocase [sct target] "minus"]} {
set cmd "${cmd_str} -"
}
if {[string equal -nocase [sct target] "dn"]} {
set cmd "${cmd_str} -"
}
if {[string equal -nocase [sct target] "down"]} {
set cmd "${cmd_str} -"
}
if {[sct target] == "-" || [sct target] == -1} { if {[sct target] == "-" || [sct target] == -1} {
set cmd "${cmd_str} -" set cmd "${cmd_str} -"
} }
if {[string equal -nocase [sct target] "plus"]} {
set cmd "${cmd_str} +"
}
if {[string equal -nocase [sct target] "up"]} {
set cmd "${cmd_str} +"
}
if {[sct target] == "+" || [sct target] == 1} { if {[sct target] == "+" || [sct target] == 1} {
set cmd "${cmd_str} +" set cmd "${cmd_str} +"
} }