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

Merge branch 'RELEASE-3_1' into RELEASE-3_2

Browse Source 
Conflicts:
	sics/site_ansto/instrument/config/beamline/sct_he3_polanal.tcl
	sics/site_ansto/instrument/hipd/wombat_configuration.tcl
	sics/site_ansto/instrument/hrpd/echidna_configuration.tcl
	sics/site_ansto/instrument/pelican/pelican_configuration.tcl
This commit is contained in:
Douglas Clowes
2014-09-01 13:23:21 +10:00
parent 679838eac3 2b73a7eaca
commit c3bb4a9591
69 changed files with 3633 additions and 1057 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
site_ansto/instrument/pelican/config/motors/motor_configuration.tcl
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