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

Fix order of axes to match the order in which the histogram memory is written

Browse Source 
ie Time, Vertical, Horizontal.

r2171 | ffr | 2007-10-03 10:07:27 +1000 (Wed, 03 Oct 2007) | 3 lines
This commit is contained in:
Ferdi Franceschini
2007-10-03 10:07:27 +10:00
committed by Douglas Clowes
parent 67810158ee
commit 75e7862cc6
2 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
# $Revision: 1.17 $
# $Date: 2007-09-26 06:11:40 $
# $Revision: 1.18 $
# $Date: 2007-10-03 00:07:26 $
# Author: Mark Lesha (mle@ansto.gov.au)
# Last revision by: $Author: ffr $
@@ -456,6 +456,7 @@ namespace eval histogram_memory {
# Don't calculate axis values, we're just setting or getting the graph_type
} else {
set i 0
array unset ${proc_name}_array
if {$state($proc_name,graph_type) == "boundaries"} {
foreach bb $boundaries {
set val [expr {$scale_factor*$bb + $offset}]
@@ -927,13 +928,13 @@ proc ::histogram_memory::configure_server {instdef} {
}
::histogram_memory::setup
if {[instname] == "wombat"} {
hmm_dim0 [hmmdictitemval hmm stitch_nxc]
hmm_dim1 [hmmdictitemval hmm stitch_nyc]
hmm_dim2 [hmmdictitemval hmm stitch_nxc]
} else {
hmm_dim0 [hmmdictitemval hmm oat_nxc_eff]
hmm_dim1 [hmmdictitemval hmm oat_nyc_eff]
hmm_dim2 [hmmdictitemval hmm oat_nxc_eff]
}
hmm_dim2 [hmmdictitemval hmm oat_ntc_eff]
hmm_dim0 [hmmdictitemval hmm oat_ntc_eff]
hmm_length [expr {[SplitReply [hmm_dim0]] * [SplitReply [hmm_dim1]] * [SplitReply [hmm_dim2]]} ]
hmm configure dim0 [SplitReply [hmm_dim0]]
hmm configure dim1 [SplitReply [hmm_dim1]]

23
site_ansto/instrument/config/nexus/nxscripts_common_1.tcl
View File

@@ -44,6 +44,8 @@ namespace eval nexus {
#
# NOTE: The ::histogram_memory::horizontal_axis and ::histogram_memory::vertical_axis are aliases which
# must be set by the instrument specific histogram memory configuration.
#
# TODO Put the filetype_spec in a separate file.
variable filetype_spec {
BEAM_MONITOR {
link {axis 1 ::data::gumtree_save_par_run_number}
@@ -52,30 +54,30 @@ namespace eval nexus {
}
HISTOGRAM_XYT {
link {axis 1 ::data::gumtree_save_par_run_number}
link {axis 2 ::histogram_memory::horizontal_axis}
link {axis 2 ::histogram_memory::time_channel}
link {axis 3 ::histogram_memory::vertical_axis}
link {axis 4 ::histogram_memory::time_channel}
link {axis 4 ::histogram_memory::horizontal_axis}
link {data_set hmm}
save_policy {include @all exclude {hmm_xy hmm_xt hmm_yt hmm_x hmm_y hmm_t}}
}
HISTOGRAM_XY {
link {axis 1 ::data::gumtree_save_par_run_number}
link {axis 2 ::histogram_memory::horizontal_axis}
link {axis 3 ::histogram_memory::vertical_axis}
link {axis 2 ::histogram_memory::vertical_axis}
link {axis 3 ::histogram_memory::horizontal_axis}
link {data_set hmm_xy}
save_policy {include @all exclude {hmm hmm_xt hmm_yt hmm_x hmm_y hmm_t}}
}
HISTOGRAM_XT {
link {axis 1 ::data::gumtree_save_par_run_number}
link {axis 2 ::histogram_memory::horizontal_axis}
link {axis 3 ::histogram_memory::time_channel}
link {axis 2 ::histogram_memory::time_channel}
link {axis 3 ::histogram_memory::horizontal_axis}
link {data_set hmm_xt}
save_policy {include @all exclude {hmm_xy hmm hmm_yt hmm_x hmm_y hmm_t}}
}
HISTOGRAM_YT {
link {axis 1 ::data::gumtree_save_par_run_number}
link {axis 2 ::histogram_memory::vertical_axis}
link {axis 3 ::histogram_memory::time_channel}
link {axis 2 ::histogram_memory::time_channel}
link {axis 3 ::histogram_memory::vertical_axis}
link {data_set hmm_yt}
save_policy {include @all exclude {hmm_xy hmm_xt hmm hmm_x hmm_y hmm_t}}
}
@@ -422,6 +424,9 @@ proc newfile {type {namestyle data}} {
##
# @brief Links data and axis into /data group
#
# Sets the "signal" and "axes" attributes on the plottable data
# Also sets the "axis" attribute for each of the axes.
proc linkdata {} {
array unset axes
set hpath /data
@@ -802,7 +807,7 @@ proc ::nexus::script::sdsinfo {script data_type args} {
set tmpstr [string map {"$" ""} {$Name: not supported by cvs2svn $}]
set nx_content_release_tag [lindex $tmpstr [expr [llength $tmpstr] - 1]]
set tmpstr [string map {"$" ""} {$Revision: 1.30 $}]
set tmpstr [string map {"$" ""} {$Revision: 1.31 $}]
set nx_content_revision_num [lindex $tmpstr [expr [llength $tmpstr] - 1]]
namespace eval data {