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

Fixed L2 and DetPosYOffset regression

Browse Source 
r2943 | ffr | 2010-05-31 12:01:51 +1000 (Mon, 31 May 2010) | 2 lines
This commit is contained in:
Ferdi Franceschini
2010-05-31 12:01:51 +10:00
committed by Douglas Clowes
parent 01dcc14d5a
commit a3d0a90616
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
site_ansto/instrument/sans/config/parameters/parameters.tcl
View File

@@ -11,6 +11,7 @@ foreach {var lname type priv units klass} {
BeamCenterZ BeamCenterZ float user mm reduce BeamCenterZ BeamCenterZ float user mm reduce
BeamStop BeamStop int user none parameter BeamStop BeamStop int user none parameter
BSdiam BSdiam float user mm parameter BSdiam BSdiam float user mm parameter
DetPosYOffset DetPosYOffset float user mm parameter
EApPosY EApPosY float user mm parameter EApPosY EApPosY float user mm parameter
EndFacePosY EndFacePosY float readonly mm parameter EndFacePosY EndFacePosY float readonly mm parameter
GuideConfig GuideConfig text user none parameter GuideConfig GuideConfig text user none parameter
@@ -76,8 +77,9 @@ sicslist setatt L1 units mm
::utility::macro::getset float L2 {} { ::utility::macro::getset float L2 {} {
set detpy [SplitReply [det]] set detpy [SplitReply [det]]
set detpyos [SplitReply [DetPosYOffset]]
set sapy [SplitReply [samy]] set sapy [SplitReply [samy]]
return [sicsmsgfmt [expr {$detpy - $sapy}]] return [sicsmsgfmt [expr {$detpy + $detpyos - $sapy}]]
} }
sicslist setatt L2 long_name L2 sicslist setatt L2 long_name L2
sicslist setatt L2 klass parameter sicslist setatt L2 klass parameter
@@ -110,6 +112,7 @@ namespace eval parameters {
set paramlist { set paramlist {
AttFactor AttFactor
BSdiam BSdiam
DetPosYOffset
EApPosY EApPosY
EApShape EApShape
EApX EApX