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

Rename bilby rough_20 to rough_100

Browse Source
This commit is contained in:
Douglas Clowes
2014-02-19 17:20:16 +11:00
parent 4bfa758667
commit 867b783ab9
2 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
site_ansto/instrument/bilby/config/motors/sct_shutters.tcl
View File

@ -168,22 +168,22 @@ proc ::scobj::shutters::mk_sct_shutters { sct_controller name } {
hsetprop ${scobj_hpath}/fast_shutter sdsinfo "::nexus::scobj::sdsinfo" hsetprop ${scobj_hpath}/fast_shutter sdsinfo "::nexus::scobj::sdsinfo"
hsetprop ${scobj_hpath}/fast_shutter type "part" hsetprop ${scobj_hpath}/fast_shutter type "part"
hfactory ${scobj_hpath}/rough_20 plain user text hfactory ${scobj_hpath}/rough_100 plain user text
hsetprop ${scobj_hpath}/rough_20 read ${ns}::getValue ${scobj_hpath} read_switch_pair {MG @IN[15], @IN[16]} hsetprop ${scobj_hpath}/rough_100 read ${ns}::getValue ${scobj_hpath} read_switch_pair {MG @IN[15], @IN[16]}
hsetprop ${scobj_hpath}/rough_20 read_switch_pair ${ns}::read_switch_pair ${scobj_hpath} hsetprop ${scobj_hpath}/rough_100 read_switch_pair ${ns}::read_switch_pair ${scobj_hpath}
hsetprop ${scobj_hpath}/rough_20 write ${ns}::write_switch ${scobj_hpath} noResponse {11} hsetprop ${scobj_hpath}/rough_100 write ${ns}::write_switch ${scobj_hpath} noResponse {11}
hsetprop ${scobj_hpath}/rough_20 noResponse ${ns}::noResponse ${scobj_hpath} hsetprop ${scobj_hpath}/rough_100 noResponse ${ns}::noResponse ${scobj_hpath}
hsetprop ${scobj_hpath}/rough_20 check ${ns}::checkrange ${scobj_hpath} hsetprop ${scobj_hpath}/rough_100 check ${ns}::checkrange ${scobj_hpath}
hsetprop ${scobj_hpath}/rough_20 control true hsetprop ${scobj_hpath}/rough_100 control true
hsetprop ${scobj_hpath}/rough_20 data true hsetprop ${scobj_hpath}/rough_100 data true
hsetprop ${scobj_hpath}/rough_20 mutable false hsetprop ${scobj_hpath}/rough_100 mutable false
hsetprop ${scobj_hpath}/rough_20 nxsave true hsetprop ${scobj_hpath}/rough_100 nxsave true
hsetprop ${scobj_hpath}/rough_20 values in,out hsetprop ${scobj_hpath}/rough_100 values in,out
hsetprop ${scobj_hpath}/rough_20 oldval UNKNOWN hsetprop ${scobj_hpath}/rough_100 oldval UNKNOWN
hsetprop ${scobj_hpath}/rough_20 klass "collimator" hsetprop ${scobj_hpath}/rough_100 klass "collimator"
hsetprop ${scobj_hpath}/rough_20 nxalias "rough_20" hsetprop ${scobj_hpath}/rough_100 nxalias "rough_100"
hsetprop ${scobj_hpath}/rough_20 sdsinfo "::nexus::scobj::sdsinfo" hsetprop ${scobj_hpath}/rough_100 sdsinfo "::nexus::scobj::sdsinfo"
hsetprop ${scobj_hpath}/rough_20 type "part" hsetprop ${scobj_hpath}/rough_100 type "part"
hfactory ${scobj_hpath}/rough_40 plain user text hfactory ${scobj_hpath}/rough_40 plain user text
hsetprop ${scobj_hpath}/rough_40 read ${ns}::getValue ${scobj_hpath} read_switch_pair {MG @IN[13], @IN[14]} hsetprop ${scobj_hpath}/rough_40 read ${ns}::getValue ${scobj_hpath} read_switch_pair {MG @IN[13], @IN[14]}
@ -207,9 +207,9 @@ proc ::scobj::shutters::mk_sct_shutters { sct_controller name } {
if {[SplitReply [motor_simulation]]=="false"} { if {[SplitReply [motor_simulation]]=="false"} {
${sct_controller} poll ${scobj_hpath}/fast_shutter 1 ${sct_controller} poll ${scobj_hpath}/fast_shutter 1
${sct_controller} poll ${scobj_hpath}/rough_20 1 ${sct_controller} poll ${scobj_hpath}/rough_100 1
${sct_controller} poll ${scobj_hpath}/rough_40 1 ${sct_controller} poll ${scobj_hpath}/rough_40 1
${sct_controller} write ${scobj_hpath}/rough_20 ${sct_controller} write ${scobj_hpath}/rough_100
${sct_controller} write ${scobj_hpath}/rough_40 ${sct_controller} write ${scobj_hpath}/rough_40
} }
hsetprop ${scobj_hpath} klass collimator hsetprop ${scobj_hpath} klass collimator

4
site_ansto/instrument/bilby/config/motors/shutters.sct
View File

@ -37,7 +37,7 @@ driver shutters = {
allowed = 'in,out' allowed = 'in,out'
property 'nxalias' = 'rough_40' property 'nxalias' = 'rough_40'
} }
var rough_20 = { var rough_100 = {
readable = 1; readable = 1;
read_function = read_switch_pair; read_function = read_switch_pair;
read_command = 'MG @IN[15], @IN[16]' read_command = 'MG @IN[15], @IN[16]'
@ -45,7 +45,7 @@ driver shutters = {
write_function = write_switch; write_function = write_switch;
write_command = '11' write_command = '11'
allowed = 'in,out' allowed = 'in,out'
property 'nxalias' = 'rough_20' property 'nxalias' = 'rough_100'
} }
}; };