Pullback from Pelican 2015-02-19

This commit is contained in:
Douglas Clowes
2015-02-19 11:24:44 +11:00
parent 16ad9ed8e2
commit 40d2a1e2f4
5 changed files with 291 additions and 146 deletions

View File

@@ -910,7 +910,7 @@ proc get_vei {} {
proc set_vwi {wavelength} {
set dd 3.35416
set theta [expr (180.0 / 3.141592654) * asin($wavelength / (2.0 * $dd))]
set result [format "moma=%f,momb=%f,momc=%f,mtth=%f" $theta $theta $theta [expr 2.0 * $theta]]
set result [format "moma=%f,momb=%f,momc=%f,mtth=%f" -$theta -$theta -$theta [expr 2.0 * $theta]]
return $result
}
@@ -930,10 +930,15 @@ vwi drivescript set_vwi
sicslist setatt vwi units Angstrom
sicslist setatt vwi klass crystal
sicslist setatt vwi long_name wavelength
sicslist setatt vwi hdbchain mtth
MakeConfigurableMotor vei
vei readscript get_vei
vei drivescript set_vei
sicslist setatt vei units mEv
sicslist setatt vei klass crystal
sicslist setatt vei long_name energy
sicslist setatt vei hdbchain mtth
publish get_vwi user
publish set_vwi user

View File

@@ -117,3 +117,8 @@ server_init
# WARNING: Do not add any code below server_init, if you do SICS may fail to initialise properly.
# You can add extra-configuration code in ../extraconfig.tcl
# Update chopper speed and phase if a stop or idle command is issued.
sicspoll add /instrument/fermi_chopper/mchs hdb 5
sicspoll add /instrument/fermi_chopper/mchp hdb 5
sicspoll add /instrument/fermi_chopper/schs hdb 5
sicspoll add /instrument/fermi_chopper/schp hdb 5