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