conman.c
Reduce log noise by setting iout = eInternal for macros. servlog.c Fixed timestamp in logfiles to get hours. hmm_configuration_common_1.tcl Added ML's mods to wombat config: ie BAT and FAT TABLE attributes and elements for multi-period acquisition and histo-streaming. Fixed "failed lsearch" bug. It's more robust to test for a non-successful lsearch instead of a failed lsearch. nxscripts_common_1.tcl SICS-297 Fixed Saving data series in a scratch file overwrites earlier entries. instdict_specification.tcl Added "scobj" kind and "sct_indexed_motor" sics object type for script context controllers and and objects. hipadaba_configuration_common.tcl Added sct_indexed_motor sics obj type to ::hdb::sobjadd and scobj kind to ::hdb::add_node sct_positmotor_common.tcl Update the index SICS variable when updating the current index value to make sure that the position is saved in the data file. You must now provide the hdb node_name when creating the sct posit motor. mk_sct_positmotor now sets the "param" and "long_name" attributes on the posit motor object util/utility.tcl Added ::utility::set_sct_indexed_motor_attributes to set SICS object attributes required for generating hdb info for an SCT_POSIT_MOTOR nxscript.c Merge the ansto mod to putslab (rev1.7) which adds support for saving unbuffered data from the histmem. sicshipadaba.c This incorporates the patch made to CommandSetCallback in rev1.10 so it can just be copied as is (ie no merge required). WARNING: There are changes to ListHdbNode to handle record separators which may affect us. Disabled sending hdb command start and stop messages because they break gumtree sicshdbfactory.c Disabled sending hdb command start and stop messages because they break gumtree hipadaba_configuration_common.tcl R2.4DEV The sct_posit_motor case of ::hdb::sobjadd is only needed to call add_node with kind=scobj. nxscripts_common_1.tcl R2.4DEV Added ::nexus::scobj::sdsinfo _gen_nxdict now skips nodes with data_type == "none" new util/script_context_util.tcl R2.4DEV Adds ::scobj::hinitprops command to initialise the hdb properties for script context object nodes. sct_positmotor_common.tcl R2.4DEV Use ::scobj::hinitprops utility command to initialise hdb properties on script context object parameter nodes. dynstring.c DynStringReplace should memcopy '\0', otherwise it can get the wrong length for iTextLen. Added DynStringReplaceWithLen to allow initialising a dynstring with char arrays which contain null chars and other non-ascii chars. Useful for read and write buffers in script context. ascon.c AsconRead return NULL for noResponse and AsconFailed otherwise the "result" node gets set with a spurious empty value. scriptcontext.c SctActionHandler only set the "result" node if there really is a reply. sicsobj.c Update from M.K. site_ansto.c Added galil and ordela hvps protocol handlers for scriptcontext. motor_dmc2280.c Allow home parameter to be outside of limits (for KOWARI) hardsup/makefile Added ordela HVPS protocol handler hardsup/sct_orhvpsprot.c New ordela HVPS protocol handler. Retries on NAKs and re-orders pot channels (ie toggles lower two bits). hardsup/sct_velselprot.c Start velocity selector protocol handler. hardsup/sct_galilprot.c Completed galil protocol handler. hipadaba_configuration_common.tcl Add new style SICS objects to hdb tree. instdict_specification.tcl Added scobj to kind list and sct_motor to sics object list. (and some housekeeping) hmm_configuration_common_1.tcl Added ratemaps to simulation. Fixe BAT_TABLE and added PERIOD_INDICES as per Mark Lesha's mods for multi-period acquisition. ratemaps now return float. sct_postimotor_common.tcl Now setting properties on the posit motor object so that it can be automatically added to the hdb tree. hrpd/config/motors/motor_configuration.tcl Fixed simulated msd motor so that it's handle properly in the hdb layer. sans/config/hmm/detector_ordela.tcl Updated the ordela calibration script to use the new sct_orhvpsprop.c script context controller. quokka_configuration.tcl Deleted lines which set the hdb properties for script context posit motors. This is now handled automatically as for other SICS objects. utility.tcl setpos now replaces the motor setpos subcommand. Added functions to set script context object attributes and sct_posit motor attributes. Created hparPath and hsibPath convenience commands for new-style SICS objects. script_context_util.tcl NEW! Adds hinitprops function to initialise the hdb properties for a script context object r2758 | ffr | 2008-12-12 17:53:53 +1100 (Fri, 12 Dec 2008) | 113 lines
This commit is contained in:
Ferdi Franceschini
committed by
Douglas Clowes
Douglas Clowes
parent
121aac2946
commit
e36e9f1146
@@ -1,5 +1,5 @@
|
||||
# $Revision: 1.43 $
|
||||
# $Date: 2008-11-06 23:13:50 $
|
||||
# $Revision: 1.44 $
|
||||
# $Date: 2008-12-12 06:53:49 $
|
||||
# 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
|
||||
@@ -52,6 +52,8 @@ namespace eval histogram_memory {
|
||||
hmm configure statuscheck false
|
||||
hmm configure num_events_filled_to_histo 12345
|
||||
hmm configure acq_dataset_active_sec 9.8
|
||||
hmm configure ratemap_xy_max_bin 123
|
||||
hmm configure ratemap_xy_total 321
|
||||
foreach bm $::counter::isc_beam_monitor_list {
|
||||
set bm_num [string index $bm end]
|
||||
if [string is integer $bm_num] {
|
||||
@@ -674,7 +676,7 @@ proc HISTMEM_TABLE {tpath args} {
|
||||
"-setel" {
|
||||
set element [lindex $arglist 0]
|
||||
set value [lindex $arglist 1]
|
||||
if {[lsearch [::utility::tabget hmm_xml $tpath/_ALLOWED_ELEMENTS_] $element] != -1} {
|
||||
if {[lsearch [::utility::tabget hmm_xml $tpath/_ALLOWED_ELEMENTS_] $element] >= 0} {
|
||||
::utility::tabset hmm_xml $tpath/$element/_CONTENT_ $value
|
||||
} else {
|
||||
error "ERROR: $element is not an allowed element in $tpath"
|
||||
@@ -683,7 +685,7 @@ proc HISTMEM_TABLE {tpath args} {
|
||||
"-setatt" {
|
||||
set attname [lindex $arglist 0]
|
||||
set value [lindex $arglist 1]
|
||||
if {[lsearch [::utility::tabget hmm_xml $tpath/_ALLOWED_ATTRIBUTES_] $attname] != -1} {
|
||||
if {[lsearch [::utility::tabget hmm_xml $tpath/_ALLOWED_ATTRIBUTES_] $attname] >= 0} {
|
||||
::utility::tabset hmm_xml $tpath/_ATTLIST_/$attname $value
|
||||
} else {
|
||||
error "ERROR: $attname is not an allowed attribute in $tpath"
|
||||
@@ -751,8 +753,8 @@ proc HISTMEM_TABLE {tpath args} {
|
||||
#
|
||||
proc BAT_TABLE {args} {
|
||||
if [ catch {
|
||||
set attributes { FRAME_FREQUENCY SIZE_PERIOD COUNT_METHOD COUNT_SIZE READ_DATA_TYPE }
|
||||
set elements {{ }}
|
||||
set attributes { NO_BAT_ENTRIES NO_BAT_PERIODS NO_REPEAT_ENTRY NO_REPEAT_TABLE NO_EXECUTE_TABLE }
|
||||
set elements {{ PERIOD_INDICES }}
|
||||
|
||||
set tag BAT
|
||||
foreach {opt arglist} [::utility::get_opt_arglist $args] {}
|
||||
@@ -806,11 +808,11 @@ proc BAT_TABLE {args} {
|
||||
"-del" {
|
||||
foreach att [lindex $attributes 0] el [lindex $elements 0] {
|
||||
set index [lsearch -exact $arglist $el]
|
||||
if {$index != -1} {
|
||||
if {$index >= 0} {
|
||||
HISTMEM_TABLE $tag -delel $el
|
||||
}
|
||||
set index [lsearch -exact $arglist $att]
|
||||
if {$index != -1} {
|
||||
if {$index >= 0} {
|
||||
HISTMEM_TABLE $tag -delatt $att
|
||||
}
|
||||
}
|
||||
@@ -894,11 +896,11 @@ proc CAT_TABLE {args} {
|
||||
"-del" {
|
||||
foreach att [lindex $attributes 0] el [lindex $elements 0] {
|
||||
set index [lsearch -exact $arglist $el]
|
||||
if {$index != -1} {
|
||||
if {$index >= 0} {
|
||||
HISTMEM_TABLE $tag -delel $el
|
||||
}
|
||||
set index [lsearch -exact $arglist $att]
|
||||
if {$index != -1} {
|
||||
if {$index >= 0} {
|
||||
HISTMEM_TABLE $tag -delatt $att
|
||||
}
|
||||
}
|
||||
@@ -927,7 +929,7 @@ proc CAT_TABLE {args} {
|
||||
#
|
||||
proc FAT_TABLE {args} {
|
||||
if [ catch {
|
||||
set attributes { FRAME_FREQUENCY SIZE_PERIOD COUNT_METHOD COUNT_SIZE READ_DATA_TYPE VIEW_MAG_X VIEW_MAG_Y}
|
||||
set attributes { FRAME_FREQUENCY SIZE_PERIOD NOS_PERIODS COUNT_METHOD COUNT_SIZE READ_DATA_TYPE VIEW_MAG_X VIEW_MAG_Y HISTO_STREAMING }
|
||||
set elements {{ }}
|
||||
|
||||
set tag FAT
|
||||
@@ -982,11 +984,11 @@ proc FAT_TABLE {args} {
|
||||
"-del" {
|
||||
foreach att [lindex $attributes 0] el [lindex $elements 0] {
|
||||
set index [lsearch -exact $arglist $el]
|
||||
if {$index != -1} {
|
||||
if {$index >= 0} {
|
||||
HISTMEM_TABLE $tag -delel $el
|
||||
}
|
||||
set index [lsearch -exact $arglist $att]
|
||||
if {$index != -1} {
|
||||
if {$index >= 0} {
|
||||
HISTMEM_TABLE $tag -delatt $att
|
||||
}
|
||||
}
|
||||
@@ -1112,11 +1114,11 @@ proc OAT_TABLE {args} {
|
||||
"-del" {
|
||||
foreach att [array names attlookup] el [lindex $elements 0] {
|
||||
set index [lsearch -exact $arglist $el]
|
||||
if {$index != -1} {
|
||||
if {$index >= 0} {
|
||||
HISTMEM_TABLE $tag -delel $el
|
||||
}
|
||||
set index [lsearch -exact $arglist $att]
|
||||
if {$index != -1} {
|
||||
if {$index >= 0} {
|
||||
HISTMEM_TABLE $tag -delatt $attlookup($att)
|
||||
}
|
||||
}
|
||||
@@ -1201,7 +1203,7 @@ proc SAT_TABLE {args} {
|
||||
"-del" {
|
||||
foreach att $attributes {
|
||||
set index [lsearch -exact $arglist $att]
|
||||
if {$index != -1} {
|
||||
if {$index >= 0} {
|
||||
HISTMEM_TABLE $attpath -delatt $att
|
||||
}
|
||||
}
|
||||
@@ -1576,14 +1578,14 @@ 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 {} {
|
||||
::utility::macro::getset float ::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 {} {
|
||||
::utility::macro::getset float ::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
|
||||
|
||||
Reference in New Issue
Block a user