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

quokka sct_velsel.tcl

Browse Source 
Renamed LambdaResFWHM_percent to wavelength_spread and added wavelength_spread_nominal which will be the wavelength_spread calculated from speed and tilt angle.
Lambda -> wavelength_nominal, added wavelength for analysis code.
r3145 | ffr | 2011-05-19 08:49:08 +1000 (Thu, 19 May 2011) | 3 lines
This commit is contained in:
Ferdi Franceschini
2011-05-19 08:49:08 +10:00
committed by Douglas Clowes
parent 3660b95ee4
commit a2a4a3cd39
2 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
site_ansto/instrument/sans/config/velsel/sct_velsel.tcl
View File

@@ -459,7 +459,10 @@ proc halt {root} {
hset $velselPath/device_error "" hset $velselPath/device_error ""
# Must be set by user # Must be set by user
hfactory $velselPath/LambdaResFWHM_percent plain user float hfactory $velselPath/wavelength plain user float
hsetprop $velselPath/wavelength permlink data_set
hfactory $velselPath/wavelength_spread plain user float
hfactory $velselPath/wavelength_spread_nominal plain user float
hfactory $velselPath/geometry plain spy none hfactory $velselPath/geometry plain spy none
hfactory $velselPath/geometry/position plain spy none hfactory $velselPath/geometry/position plain spy none
hfactory $velselPath/geometry/position/VelSelPosX plain user float hfactory $velselPath/geometry/position/VelSelPosX plain user float
@@ -496,15 +499,15 @@ proc halt {root} {
hsetprop $velselPath/set_ttang units "degrees" hsetprop $velselPath/set_ttang units "degrees"
# Get Lambda # Get wavelength_nominal
hfactory $velselPath/Lambda plain spy float hfactory $velselPath/wavelength_nominal plain spy float
hsetprop $velselPath/Lambda read ${scobjNS}::getpar rdpar hsetprop $velselPath/wavelength_nominal read ${scobjNS}::getpar rdpar
hsetprop $velselPath/Lambda rdpar ${scobjNS}::readLambda $statusPath hsetprop $velselPath/wavelength_nominal rdpar ${scobjNS}::readLambda $statusPath
hsetprop $velselPath/Lambda oldval "UNKNOWN" hsetprop $velselPath/wavelength_nominal oldval "UNKNOWN"
hsetprop $velselPath/Lambda units "Angstrom" hsetprop $velselPath/wavelength_nominal units "Angstrom"
hsetprop $velselPath/Lambda permlink data_set # hsetprop $velselPath/wavelength_nominal permlink data_set
# Set Lambda # Set wavelength_nominal
hfactory $velselPath/setLambda plain spy float hfactory $velselPath/setLambda plain spy float
hsetprop $velselPath/setLambda check ${scobjNS}::checkBlockedWavelengths $statusPath hsetprop $velselPath/setLambda check ${scobjNS}::checkBlockedWavelengths $statusPath
hsetprop $velselPath/setLambda write ${scobjNS}::setLambda $velselPath $statusPath ignore hsetprop $velselPath/setLambda write ${scobjNS}::setLambda $velselPath $statusPath ignore
@@ -554,8 +557,10 @@ proc halt {root} {
foreach { foreach {
hpath klass control data nxsave mutable priv alias hpath klass control data nxsave mutable priv alias
} { } {
Lambda parameter true true true true user velsel_lambdaa wavelength_nominal parameter true true true true user velsel_wavelength_nominal
LambdaResFWHM_percent parameter true true true true spy velsel_lambdaresfwhm_percent wavelength parameter true true true true user velsel_wavelength
wavelength_spread parameter true true true true spy velsel_wavelength_spread
wavelength_spread_nominal parameter true true true true spy velsel_wavelength_spread_nominal
rspeed parameter true true true true spy velsel_rspeed rspeed parameter true true true true spy velsel_rspeed
aspeed parameter true true true true user velsel_aspeed aspeed parameter true true true true user velsel_aspeed
ttang parameter true true true true user velsel_ttang ttang parameter true true true true user velsel_ttang
@@ -602,12 +607,12 @@ proc halt {root} {
} }
sct_velsel write $velselPath/ttinit sct_velsel write $velselPath/ttinit
sct_velsel write $velselPath/set_ttang sct_velsel write $velselPath/set_ttang
sct_velsel poll $velselPath/Lambda $pollrate sct_velsel poll $velselPath/wavelength_nominal $pollrate
sct_velsel write $velselPath/setLambda sct_velsel write $velselPath/setLambda
sct_velsel write $velselPath/setspeed sct_velsel write $velselPath/setspeed
sct_velsel write $velselPath/cmd sct_velsel write $velselPath/cmd
ansto_makesctdrive nvs_speed $velselPath/setspeed $velselPath/aspeed sct_velsel ansto_makesctdrive nvs_speed $velselPath/setspeed $velselPath/aspeed sct_velsel
ansto_makesctdrive nvs_lambda $velselPath/setLambda $velselPath/Lambda sct_velsel ansto_makesctdrive nvs_lambda $velselPath/setLambda $velselPath/wavelength_nominal sct_velsel
} }
if {$sim_mode == "false"} { if {$sim_mode == "false"} {
makesctcontroller sct_velsel astvelsel $velsel_IP:$velsel_port "" 10 makesctcontroller sct_velsel astvelsel $velsel_IP:$velsel_port "" 10

2
site_ansto/instrument/sans/config/velsel/velsel.tcl
View File

@@ -1,5 +1,5 @@
# Set currVelSel to select either the NVS40 or NVS43 # Set currVelSel to select either the NVS40 or NVS43
set currVelSel 43 set currVelSel 40
namespace eval ::scobj::velocity_selector { namespace eval ::scobj::velocity_selector {
variable blocked_speeds variable blocked_speeds