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

source_common.tcl

Browse Source 
SICS-280 Check RCMS data-type and return -1 if it's invalid

motor_configuration.tcl files
Make sure that long_name matches data name for slit motors in data file.

hmm_configuration_common_1.tcl
SICS-268 Don't set VIEW_MAG_X/Y on histmem

r2699 | ffr | 2008-09-22 15:58:31 +1000 (Mon, 22 Sep 2008) | 9 lines
This commit is contained in:
Ferdi Franceschini
2008-09-22 15:58:31 +10:00
committed by Douglas Clowes
parent 538a36df3f
commit ab218f64b6
6 changed files with 110 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
site_ansto/instrument/config/hmm/hmm_configuration_common_1.tcl
View File

@@ -1,5 +1,5 @@
# $Revision: 1.39 $
# $Date: 2008-09-18 02:20:09 $
# $Revision: 1.40 $
# $Date: 2008-09-22 05:58:31 $
# Author: Ferdi Franceschini
# Based on the examples in the hs_test.tcl sample configuration by Mark Lesha.
# http://gumtree.ansto.gov.au:9080/nbicms/bragg-systems/histogram-server/hs_test.tcl/view
@@ -1623,7 +1623,7 @@ proc ::histogram_memory::ic_initialize {} {
::histogram_memory::x_pixel_offset -boundaries
::histogram_memory::time_channel -boundaries
::histogram_memory::clear_tables
FAT_TABLE -set VIEW_MAG_X -1 VIEW_MAG_Y -1
# FAT_TABLE -set VIEW_MAG_X -1 VIEW_MAG_Y -1
foreach hm_obj [sicslist type histmem] {
$hm_obj configure hmaddress http://das1-[instname].nbi.ansto.gov.au:8080

26
site_ansto/instrument/config/source/source_common.tcl
View File

@@ -34,7 +34,11 @@ if {$sim_mode == "true"} {
::utility::macro::getset float reactor_power {} {
set str [opal "CALIBRATED REACTOR POWER"]
set value [lindex [lindex [split $str =] 1] 0]
return "reactor_power = $value"
if [string is double $value] {
return "reactor_power = $value"
} else {
return "reactor_power = -1"
}
}
sicslist setatt reactor_power klass source
sicslist setatt reactor_power long_name power
@@ -48,8 +52,12 @@ proc ::source::ic_initialize {guide} {
::utility::macro::getset float cns_inlet_temp {} {
set str [opal "CNS HELIUM INLET TEMPERATURE"]
set value [lindex [lindex [split $str =] 1] 0]
return "cns_inlet_temp = $value"
}
if [string is double $value] {
return "cns_inlet_temp = $value"
} else {
return "cns_inlet_temp = -1"
}
}
sicslist setatt cns_inlet_temp klass source
sicslist setatt cns_inlet_temp long_name cns_inlet_temp
sicslist setatt cns_inlet_temp mutable true
@@ -58,7 +66,11 @@ proc ::source::ic_initialize {guide} {
::utility::macro::getset float cns_outlet_temp {} {
set str [opal "HELIUM OUTLET TEMPERATUR"]
set value [lindex [lindex [split $str =] 1] 0]
return "cns_outlet_temp = $value"
if [string is double $value] {
return "cns_outlet_temp = $value"
} else {
return "cns_outlet_temp = -1"
}
}
sicslist setatt cns_outlet_temp klass source
sicslist setatt cns_outlet_temp long_name cns_outlet_temp
@@ -68,7 +80,11 @@ proc ::source::ic_initialize {guide} {
::utility::macro::getset float cns_flow {} {
set str [opal "CNS HELIUM FLOW"]
set value [lindex [lindex [split $str =] 1] 0]
return "cns_flow = $value"
if [string is double $value] {
return "cns_flow = $value"
} else {
return "cns_flow = -1"
}
}
sicslist setatt cns_flow klass source
sicslist setatt cns_flow long_name cns_flow_temp

32
site_ansto/instrument/hipd/config/motors/motor_configuration.tcl
View File

@@ -468,8 +468,8 @@ ss1r softlowerlim $ss1r_LoRange
ss1r softupperlim $ss1r_HiRange
ss1r home 0
ss1r movecount $move_count
ss1r part aperture.first
ss1r long_name right
ss1r part aperture
ss1r long_name first_right
# Slit 1, left
Motor ss1l $motor_driver_type [params \
@@ -487,8 +487,8 @@ ss1l softlowerlim $ss1l_LoRange
ss1l softupperlim $ss1l_HiRange
ss1l home 0
ss1l movecount $move_count
ss1l part aperture.first
ss1l long_name left
ss1l part aperture
ss1l long_name first_left
# Slit 1, up
Motor ss1u $motor_driver_type [params \
@@ -506,8 +506,8 @@ ss1u softlowerlim $ss1u_LoRange
ss1u softupperlim $ss1u_HiRange
ss1u home 0
ss1u movecount $move_count
ss1u part aperture.first
ss1u long_name top
ss1u part aperture
ss1u long_name first_top
# Slit 1, down
Motor ss1d $motor_driver_type [params \
@@ -525,8 +525,8 @@ ss1d softlowerlim $ss1d_LoRange
ss1d softupperlim $ss1d_HiRange
ss1d home 0
ss1d movecount $move_count
ss1d part aperture.first
ss1d long_name bottom
ss1d part aperture
ss1d long_name first_bottom
############################
# Motor Controller 4
@@ -551,8 +551,8 @@ ss2r softlowerlim $ss2r_LoRange
ss2r softupperlim $ss2r_HiRange
ss2r home 0
ss2r movecount $move_count
ss2r part aperture.second
ss2r long_name right
ss2r part aperture
ss2r long_name second_right
# Slit 2, left
Motor ss2l $motor_driver_type [params \
@@ -570,8 +570,8 @@ ss2l softlowerlim $ss2l_LoRange
ss2l softupperlim $ss2l_HiRange
ss2l home 0
ss2l movecount $move_count
ss2l part aperture.second
ss2l long_name left
ss2l part aperture
ss2l long_name second_left
# Slit 2, up
Motor ss2u $motor_driver_type [params \
@@ -589,8 +589,8 @@ ss2u softlowerlim $ss2u_LoRange
ss2u softupperlim $ss2u_HiRange
ss2u home 0
ss2u movecount $move_count
ss2u part aperture.second
ss2u long_name top
ss2u part aperture
ss2u long_name second_top
# Slit 2, down
Motor ss2d $motor_driver_type [params \
@@ -608,8 +608,8 @@ ss2d softlowerlim $ss2d_LoRange
ss2d softupperlim $ss2d_HiRange
ss2d home 0
ss2d movecount $move_count
ss2d part aperture.second
ss2d long_name bottom
ss2d part aperture
ss2d long_name second_bottom
proc mthGet {} { return [expr [SplitReply [mtth]]/2.0]}
proc mthSet {val} { return "mtth=[SplitReply [mtth]]"}

36
site_ansto/instrument/hrpd/config/motors/motor_configuration.tcl
View File

@@ -1,5 +1,5 @@
# $Revision: 1.29 $
# $Date: 2008-08-07 03:17:28 $
# $Revision: 1.30 $
# $Date: 2008-09-22 05:58:31 $
# Author: Ferdi Franceschini (ffr@ansto.gov.au)
# Last revision by: $Author: ffr $
source $cfPath(anticollider)/anticollider.tcl
@@ -513,8 +513,8 @@ ss1r softlowerlim $ss1r_LoRange
ss1r softupperlim $ss1r_HiRange
ss1r home 0
ss1r movecount $move_count
ss1r part aperture.first
ss1r long_name right
ss1r part aperture
ss1r long_name first_right
# Slit 1, left
Motor ss1l $motor_driver_type [params \
@@ -532,8 +532,8 @@ ss1l softlowerlim $ss1l_LoRange
ss1l softupperlim $ss1l_HiRange
ss1l home 0
ss1l movecount $move_count
ss1l part aperture.first
ss1l long_name left
ss1l part aperture
ss1l long_name first_left
# Slit 1, up
Motor ss1u $motor_driver_type [params \
@@ -551,8 +551,8 @@ ss1u softlowerlim $ss1u_LoRange
ss1u softupperlim $ss1u_HiRange
ss1u home 0
ss1u movecount $move_count
ss1u part aperture.first
ss1u long_name top
ss1u part aperture
ss1u long_name first_top
# Slit 1, down
Motor ss1d $motor_driver_type [params \
@@ -570,8 +570,8 @@ ss1d softlowerlim $ss1d_LoRange
ss1d softupperlim $ss1d_HiRange
ss1d home 0
ss1d movecount $move_count
ss1d part aperture.first
ss1d long_name bottom
ss1d part aperture
ss1d long_name first_bottom
############################
# Motor Controller 4
@@ -624,8 +624,8 @@ ss2r softlowerlim $ss2r_LoRange
ss2r softupperlim $ss2r_HiRange
ss2r home 0
ss2r movecount $move_count
ss2r part aperture.second
ss2r long_name right
ss2r part aperture
ss2r long_name second_right
# Slit 2, left
Motor ss2l $motor_driver_type [params \
@@ -643,8 +643,8 @@ ss2l softlowerlim $ss2l_LoRange
ss2l softupperlim $ss2l_HiRange
ss2l home 0
ss2l movecount $move_count
ss2l part aperture.second
ss2l long_name left
ss2l part aperture
ss2l long_name second_left
# Slit 2, up
Motor ss2u $motor_driver_type [params \
@@ -662,8 +662,8 @@ ss2u softlowerlim $ss2u_LoRange
ss2u softupperlim $ss2u_HiRange
ss2u home 0
ss2u movecount $move_count
ss2u part aperture.second
ss2u long_name top
ss2u part aperture
ss2u long_name second_top
# Slit 2, down
Motor ss2d $motor_driver_type [params \
@@ -681,8 +681,8 @@ ss2d softlowerlim $ss2d_LoRange
ss2d softupperlim $ss2d_HiRange
ss2d home 0
ss2d movecount $move_count
ss2d part aperture.second
ss2d long_name bottom
ss2d part aperture
ss2d long_name second_bottom
# Virtual and Simulated Motors
# ----------------------------

72
site_ansto/instrument/reflectometer/config/motors/motor_configuration.tcl
View File

@@ -307,8 +307,8 @@ Motor st3vt $motor_driver_type [params \
absEnc 1\
absEncHome $st3vt_home\
cntsPerX -8192]
st3vt part aperture.$slit3VGroup
st3vt long_name st3vt
st3vt part aperture
st3vt long_name ${slit3VGroup}_st3vt
st3vt softlowerlim 0
st3vt softupperlim 253
st3vt home 0
@@ -331,8 +331,8 @@ Motor st4vt $motor_driver_type [params \
absEnc 1\
absEncHome $st4vt_home\
cntsPerX -8192]
st4vt part aperture.$slit4VGroup
st4vt long_name st4vt
st4vt part aperture
st4vt long_name ${slit4VGroup}_st4vt
st4vt softlowerlim 0
st4vt softupperlim 249
st4vt home 0
@@ -530,8 +530,8 @@ Motor ss1l $motor_driver_type [params \
maxDecel 5\
stepsPerX $slitStepRate\
motorHome $ss1l_Home]
ss1l part aperture.$slit1HGroup
ss1l long_name left
ss1l part aperture
ss1l long_name ${slit1HGroup}_left
ss1l softlowerlim $ss1l_LoRange
ss1l softupperlim $ss1l_HiRange
ss1l home 0
@@ -550,8 +550,8 @@ Motor ss1r $motor_driver_type [params \
maxDecel 5\
stepsPerX -$slitStepRate\
motorHome $ss1r_Home]
ss1r part aperture.$slit1HGroup
ss1r long_name right
ss1r part aperture
ss1r long_name ${slit1HGroup}_right
ss1r softlowerlim $ss1r_LoRange
ss1r softupperlim $ss1r_HiRange
ss1r home 0
@@ -570,8 +570,8 @@ Motor ss1u $motor_driver_type [params \
maxDecel 5\
stepsPerX -$slitStepRate\
motorHome $ss1u_Home]
ss1u part aperture.$slit1VGroup
ss1u long_name upper
ss1u part aperture
ss1u long_name ${slit1VGroup}_upper
ss1u softlowerlim $ss1u_LoRange
ss1u softupperlim $ss1u_HiRange
ss1u home 0
@@ -590,8 +590,8 @@ Motor ss1d $motor_driver_type [params \
maxDecel 5\
stepsPerX $slitStepRate\
motorHome $ss1d_Home]
ss1d part aperture.$slit1VGroup
ss1d long_name lower
ss1d part aperture
ss1d long_name ${slit1VGroup}_lower
ss1d softlowerlim $ss1d_LoRange
ss1d softupperlim $ss1d_HiRange
ss1d home 0
@@ -610,8 +610,8 @@ Motor ss2l $motor_driver_type [params \
maxDecel 5\
stepsPerX $slitStepRate\
motorHome $ss2l_Home]
ss2l part aperture.$slit2HGroup
ss2l long_name left
ss2l part aperture
ss2l long_name ${slit2HGroup}_left
ss2l softlowerlim $ss2l_LoRange
ss2l softupperlim $ss2l_HiRange
ss2l home 0
@@ -630,8 +630,8 @@ Motor ss2r $motor_driver_type [params \
maxDecel 5\
stepsPerX -$slitStepRate\
motorHome $ss2r_Home]
ss2r part aperture.$slit2HGroup
ss2r long_name right
ss2r part aperture
ss2r long_name ${slit2HGroup}_right
ss2r softlowerlim $ss2r_LoRange
ss2r softupperlim $ss2r_HiRange
ss2r home 0
@@ -650,8 +650,8 @@ Motor ss2u $motor_driver_type [params \
maxDecel 5\
stepsPerX -$slitStepRate\
motorHome $ss2u_Home]
ss2u part aperture.$slit2VGroup
ss2u long_name upper
ss2u part aperture
ss2u long_name ${slit2VGroup}_upper
ss2u softlowerlim $ss2u_LoRange
ss2u softupperlim $ss2u_HiRange
ss2u home 0
@@ -670,8 +670,8 @@ Motor ss2d $motor_driver_type [params \
maxDecel 5\
stepsPerX $slitStepRate\
motorHome $ss2d_Home]
ss2d part aperture.$slit2VGroup
ss2d long_name lower
ss2d part aperture
ss2d long_name ${slit2VGroup}_lower
ss2d softlowerlim $ss2d_LoRange
ss2d softupperlim $ss2d_HiRange
ss2d home 0
@@ -697,8 +697,8 @@ Motor ss3d $motor_driver_type [params \
maxDecel 5\
stepsPerX $slitStepRate\
motorHome $ss3d_Home]
ss3d part aperture.$slit3VGroup
ss3d long_name lower
ss3d part aperture
ss3d long_name ${slit3VGroup}_lower
ss3d softlowerlim $ss3d_LoRange
ss3d softupperlim $ss3d_HiRange
ss3d home 0
@@ -717,8 +717,8 @@ Motor ss3u $motor_driver_type [params \
maxDecel 5\
stepsPerX -$slitStepRate\
motorHome $ss3u_Home]
ss3u part aperture.$slit3VGroup
ss3u long_name upper
ss3u part aperture
ss3u long_name ${slit3VGroup}_upper
ss3u softlowerlim $ss3u_LoRange
ss3u softupperlim $ss3u_HiRange
ss3u home 0
@@ -737,8 +737,8 @@ Motor ss3l $motor_driver_type [params \
maxDecel 5\
stepsPerX $slitStepRate\
motorHome $ss3l_Home]
ss3l part aperture.$slit3HGroup
ss3l long_name left
ss3l part aperture
ss3l long_name ${slit3HGroup}_left
ss3l softlowerlim $ss3l_LoRange
ss3l softupperlim $ss3l_HiRange
ss3l home 0
@@ -757,8 +757,8 @@ Motor ss3r $motor_driver_type [params \
maxDecel 5\
stepsPerX -$slitStepRate\
motorHome $ss3r_Home]
ss3r part aperture.$slit3HGroup
ss3r long_name right
ss3r part aperture
ss3r long_name ${slit3HGroup}_right
ss3r softlowerlim $ss3r_LoRange
ss3r softupperlim $ss3r_HiRange
ss3r home 0
@@ -777,8 +777,8 @@ Motor ss4d $motor_driver_type [params \
maxDecel 5\
stepsPerX $slitStepRate\
motorHome $ss4d_Home]
ss4d part aperture.$slit4VGroup
ss4d long_name lower
ss4d part aperture
ss4d long_name ${slit4VGroup}_lower
ss4d softlowerlim $ss4d_LoRange
ss4d softupperlim $ss4d_HiRange
ss4d home 0
@@ -797,8 +797,8 @@ Motor ss4u $motor_driver_type [params \
maxDecel 5\
stepsPerX -$slitStepRate\
motorHome $ss4u_Home]
ss4u part aperture.$slit4VGroup
ss4u long_name upper
ss4u part aperture
ss4u long_name ${slit4VGroup}_upper
ss4u softlowerlim $ss4u_LoRange
ss4u softupperlim $ss4u_HiRange
ss4u home 0
@@ -817,8 +817,8 @@ Motor ss4l $motor_driver_type [params \
maxDecel 5\
stepsPerX $slitStepRate\
motorHome $ss4l_Home]
ss4l part aperture.$slit4HGroup
ss4l long_name left
ss4l part aperture
ss4l long_name ${slit4HGroup}_left
ss4l softlowerlim $ss4l_LoRange
ss4l softupperlim $ss4l_HiRange
ss4l home 0
@@ -837,8 +837,8 @@ Motor ss4r $motor_driver_type [params \
maxDecel 5\
stepsPerX -$slitStepRate\
motorHome $ss4r_Home]
ss4r part aperture.$slit4HGroup
ss4r long_name right
ss4r part aperture
ss4r long_name ${slit4HGroup}_right
ss4r softlowerlim $ss4r_LoRange
ss4r softupperlim $ss4r_HiRange
ss4r home 0

32
site_ansto/instrument/rsd/config/motors/motor_configuration.tcl
View File

@@ -542,8 +542,8 @@ Motor psho $motor_driver_type [params \
absenchome $psho_home\
cntsPerX 8192]
psho Backlash_offset -0.3
psho part aperture.primary
psho long_name horizontal_offset
psho part aperture
psho long_name primary_horizontal_offset
setHomeandRange -motor psho -home 0 -lowrange 0 -uprange 30
# Primary Slit, position 0-150mm (Y-axis)
@@ -561,8 +561,8 @@ Motor psp $motor_driver_type [params \
absenchome $psp_home\
cntsPerX -8192]
psp Backlash_offset -0.3
psp part aperture.primary
psp long_name position
psp part aperture
psp long_name primary_position
setHomeandRange -motor psp -home 0 -lowrange 0 -uprange 150
# Primary Slit, width, 0-30mm
@@ -580,8 +580,8 @@ Motor psw $motor_driver_type [params \
absenchome $psw_home\
cntsPerX -8192]
psw Backlash_offset 0.3
psw part aperture.primary
psw long_name width
psw part aperture
psw long_name primary_width
setHomeandRange -motor psw -home 0 -lowrange 0 -uprange 30
#--------------------------------------------------------
@@ -601,8 +601,8 @@ Motor ssho $motor_driver_type [params \
absenchome $ssho_home\
cntsPerX 8192]
ssho Backlash_offset -0.3
ssho part aperture.secondary
ssho long_name horizontal_offset
ssho part aperture
ssho long_name secondary_horizontal_offset
setHomeandRange -motor ssho -home 0 -lowrange 0 -uprange 30
# Secondary Slit, position
@@ -620,8 +620,8 @@ Motor ssp $motor_driver_type [params \
absenchome $ssp_home\
cntsPerX -8192]
ssp Backlash_offset -0.3
ssp part aperture.secondary
ssp long_name position
ssp part aperture
ssp long_name secondary_position
setHomeandRange -motor ssp -home 0 -lowrange 0 -uprange 150
# Secondary Slit, width
@@ -639,8 +639,8 @@ Motor ssw $motor_driver_type [params \
absenchome $ssw_home\
cntsPerX -8192]
ssw Backlash_offset 0.3
ssw part aperture.secondary
ssw long_name width
ssw part aperture
ssw long_name secondary_width
setHomeandRange -motor ssw -home 0 -lowrange 0 -uprange 30
## Primary Slit, height, 0-30mm
@@ -657,8 +657,8 @@ setHomeandRange -motor ssw -home 0 -lowrange 0 -uprange 30
# absenc 1\
# absenchome 542093\
# cntsPerX 8192]
#psh part aperture.primary
#psh part long_name height
#psh part aperture
#psh part long_name primary_height
#setHomeandRange -motor psh -home 0 -lowrange 0 -uprange 30
## Secondary Slit, height
@@ -675,8 +675,8 @@ setHomeandRange -motor ssw -home 0 -lowrange 0 -uprange 30
# absenc 1\
# absenchome 500000\
# cntsPerX 8192]
#ssh part aperture.secondary
#ssh long_name height
#ssh part aperture
#ssh long_name secondary_height
#setHomeandRange -motor ssh -home 0 -lowrange 0 -uprange 30
#--------------------------------------------------------