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

nxscript.c SICS-295

Browse Source 
Restored a modification made in revision 1.7 which was reverted during the PSI update (2/10/08) probably when investigating SICS-291

hmm_configuration_common_1.tcl
Added hmm ratemap_xy_max_bin and ratemap_xy_total

site_ansto/hardsup/sct_galilprot.c
site_ansto/hardsup/makefile
Started adding galil protocol for script-context controllers.

sans/config/parameters/parameters.tcl
SICS-180 BeamCenterY should have been BeamCenterZ

r2742 | ffr | 2008-11-07 10:13:51 +1100 (Fri, 07 Nov 2008) | 13 lines
This commit is contained in:
Ferdi Franceschini
2008-11-07 10:13:51 +11:00
committed by Douglas Clowes
parent a00b32dbe4
commit 283c7d56dc
5 changed files with 93 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
# $Revision: 1.42 $
# $Date: 2008-10-27 04:55:41 $
# $Revision: 1.43 $
# $Date: 2008-11-06 23:13:50 $
# 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
@@ -1576,6 +1576,20 @@ sicslist setatt ::histogram_memory::time long_name time
sicslist setatt ::histogram_memory::time mutable true
sicslist setatt ::histogram_memory::time units seconds
::utility::macro::getset int ::histogram_memory::ratemap_xy_max_bin {} {
return "ratemap_xy_max_bin = [lindex [hmm configure ratemap_xy_max_bin] 2]"
}
sicslist setatt ::histogram_memory::ratemap_xy_max_bin klass detector
sicslist setatt ::histogram_memory::ratemap_xy_max_bin long_name max_binrate
sicslist setatt ::histogram_memory::ratemap_xy_max_bin mutable true
::utility::macro::getset int ::histogram_memory::ratemap_xy_total {} {
return "ratemap_xy_total = [lindex [hmm configure ratemap_xy_total] 2]"
}
sicslist setatt ::histogram_memory::ratemap_xy_total klass detector
sicslist setatt ::histogram_memory::ratemap_xy_total long_name total_maprate
sicslist setatt ::histogram_memory::ratemap_xy_total mutable true
##
# @brief Update the beam monitors when the histmem has finished counting.
proc ::histogram_memory::countend_event {} {

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

@@ -65,7 +65,7 @@ foreach {var lname nxname units priv } {
BSZmm BSZmm z mm user
Transmission Transmission Transmission 1 user
BeamCenterX BeamCenterX BeamCenterX mm user
BeamCenterY BeamCenterY BeamCenterY mm user
BeamCenterZ BeamCenterZ BeamCenterZ mm user
} {
::utility::mkVar $var float $priv $lname true parameter true true
if {$units != 1} {