Merge from Wombat hmm_object.tcl

This commit is contained in:
Douglas Clowes
2014-06-25 12:28:16 +10:00
parent c5f7a7375e
commit 3f8f5fcba7

View File

@ -77,6 +77,13 @@ proc ::histogram_memory::select_read_type {type} {
$HMOBJ configure READ_DATA_TYPE "HISTOPERIOD_T"
set hmm_ext "_t"
}
"HISTOGRAM_XP" {
$HMOBJ configure rank 2
$HMOBJ configure dim0 [SplitReply [$HMOBJ configure $INST_NXC]]
$HMOBJ configure dim1 [SplitReply [$HMOBJ configure maximum_period]]
$HMOBJ configure READ_DATA_TYPE "HISTOPERIOD_XP"
set hmm_ext "_total_xp"
}
"TOTAL_HISTOGRAM_XY" {
$HMOBJ configure rank 2
$HMOBJ configure dim0 [SplitReply [$HMOBJ configure $INST_NXC]]
@ -112,6 +119,14 @@ proc ::histogram_memory::select_read_type {type} {
$HMOBJ configure READ_DATA_TYPE $type
set hmm_ext "_total_py"
}
"TOTAL_HISTOGRAM_XYP" {
$HMOBJ configure rank 3
$HMOBJ configure dim0 [expr 1 + [SplitReply [$HMOBJ configure maximum_period]]]
$HMOBJ configure dim1 [SplitReply [$HMOBJ configure $INST_NYC]]
$HMOBJ configure dim2 [SplitReply [$HMOBJ configure $INST_NXC]]
$HMOBJ configure READ_DATA_TYPE $type
set hmm_ext "_total_xyp"
}
"TOTAL_HISTOGRAM_X" {
$HMOBJ configure rank 1
$HMOBJ configure dim0 [SplitReply [$HMOBJ configure $INST_NXC]]
@ -292,6 +307,18 @@ proc ::histogram_memory::set_axes {typelist} {
lappend siglist $signal
lappend hmmdatname "${HMOBJ}_t"
}
"HISTOGRAM_XP" {
lappend rank 2
set dim0 [SplitReply [expr 1 + [$HMOBJ configure maximum_period]]]
set dim1 [SplitReply [$HMOBJ configure $INST_NXC]]
lappend dimstr "$dim0,$dim1"
lappend hmmslabstart [list 0 0]
lappend hmmslabend [list $dim0 $dim1]
lappend hmmperiodsize [expr $dim0 * $dim1]
lappend axeslist [::histogram_memory::gen_axes {SVAR PER HOR}]
lappend siglist $signal
lappend hmmdatname "${HMOBJ}_total_xp"
}
"TOTAL_HISTOGRAM_XY" {
lappend rank 2
set dim0 [SplitReply [$HMOBJ configure $INST_NYC]]
@ -364,6 +391,20 @@ proc ::histogram_memory::set_axes {typelist} {
lappend siglist $signal
lappend hmmdatname "${HMOBJ}_total_py"
}
"TOTAL_HISTOGRAM_XYP" {
lappend rank 3
set dim0 [expr 1 + [SplitReply [$HMOBJ configure maximum_period]]]
set dim1 [SplitReply [$HMOBJ configure $INST_NYC]]
set dim2 [SplitReply [$HMOBJ configure $INST_NXC]]
lappend dimstr "$dim0,$dim1,$dim2"
lappend hmmslabstart [list 0 0 0]
lappend hmmslabend [list $dim0 $dim1 $dim2]
lappend hmmperiodsize [expr $dim0 * $dim1 * $dim2]
lappend axeslist [::histogram_memory::gen_axes {SVAR PER VER HOR}]
lappend siglist $signal
lappend hmmdatname "${HMOBJ}_total_xyp"
}
"TOTAL_HISTOGRAM_X" {
lappend rank 1
set dim0 [SplitReply [$HMOBJ configure $INST_NXC]]