Store hmm_setup parameters in hmm_* SICS variables for use in file writing, the GumTree interface and commandline feedback code.
Set place holders for hpath setup and initialisation functions. r1682 | ffr | 2007-03-20 11:50:11 +1100 (Tue, 20 Mar 2007) | 3 lines
This commit is contained in:
committed by
Douglas Clowes
parent
17b5fe7ca6
commit
f19a328280
@@ -1,13 +1,27 @@
|
|||||||
# $Revision: 1.2 $
|
# $Revision: 1.3 $
|
||||||
# $Date: 2007-03-11 21:41:30 $
|
# $Date: 2007-03-20 00:50:11 $
|
||||||
# Author: Mark Lesha (mle@ansto.gov.au)
|
# Author: Mark Lesha (mle@ansto.gov.au)
|
||||||
# Last revision by: $Author: ffr $
|
# Last revision by: $Author: ffr $
|
||||||
|
|
||||||
#-------------------------------------------------------------------------
|
#-------------------------------------------------------------------------
|
||||||
# System: Histogram Server (sample)
|
# System: Histogram Server (sample)
|
||||||
#------------------------------------------------------------------------
|
#------------------------------------------------------------------------
|
||||||
namespace eval histogram_memory {
|
|
||||||
|
|
||||||
|
MakeHM hmm anstohttp
|
||||||
|
hmm configure hmaddress http://das1-[SplitReply [instrument]]:8080
|
||||||
|
hmm configure username spy
|
||||||
|
hmm configure password 007
|
||||||
|
hmm configure hmDataPath ../HMData
|
||||||
|
|
||||||
|
namespace eval histogram_memory {
|
||||||
|
VarMake hmm_dim0 Int User
|
||||||
|
VarMake hmm_dim1 Int User
|
||||||
|
VarMake hmm_dim2 Int User
|
||||||
|
VarMake hmm_histmode Text User
|
||||||
|
VarMake hmm_bank Int User
|
||||||
|
VarMake hmm_rank Int User
|
||||||
|
VarMake hmm_start Int User
|
||||||
|
VarMake hmm_length Int User
|
||||||
##############################################
|
##############################################
|
||||||
# Creating the histogram memories in SICS
|
# Creating the histogram memories in SICS
|
||||||
##############################################
|
##############################################
|
||||||
@@ -84,12 +98,19 @@ proc hmmdictitemval {histomem dictitem} {
|
|||||||
# For the dimensions, set the 'effective' OAT dimensions which are the
|
# For the dimensions, set the 'effective' OAT dimensions which are the
|
||||||
# histogram period dimensions. Do an init after to cause memory to be allocated.
|
# histogram period dimensions. Do an init after to cause memory to be allocated.
|
||||||
proc hmm_setup {mode bankNum rankNum nyc nxc ntc} {
|
proc hmm_setup {mode bankNum rankNum nyc nxc ntc} {
|
||||||
|
hmm_histmode $mode
|
||||||
|
hmm_bank $bankNum
|
||||||
|
hmm_rank $rankNum
|
||||||
hmm configure histmode $mode
|
hmm configure histmode $mode
|
||||||
hmm configure bank $bankNum
|
hmm configure bank $bankNum
|
||||||
hmm configure rank $rankNum
|
hmm configure rank $rankNum
|
||||||
hmm configure dim0 [hmmdictitemval hmm $nyc]
|
hmm_dim0 [hmmdictitemval hmm $nyc]
|
||||||
hmm configure dim1 [hmmdictitemval hmm $nxc]
|
hmm_dim1 [hmmdictitemval hmm $nxc]
|
||||||
hmm configure dim2 [hmmdictitemval hmm $ntc]
|
hmm_length [expr {[SplitReply [hmm_dim0]] * [SplitReply [hmm_dim1]]} ]
|
||||||
|
hmm_dim2 [hmmdictitemval hmm $ntc]
|
||||||
|
hmm configure dim0 [SplitReply [hmm_dim0]]
|
||||||
|
hmm configure dim1 [SplitReply [hmm_dim1]]
|
||||||
|
hmm configure dim2 [SplitReply [hmm_dim2]]
|
||||||
hmm init
|
hmm init
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -357,11 +378,21 @@ proc hs_finish {scanobjectname userobjectname} {
|
|||||||
# Sicne this is the first (and only) access to hmm data, it is retrieved from
|
# Sicne this is the first (and only) access to hmm data, it is retrieved from
|
||||||
# the server and we don't need to do hmm init first to force update hmm memory.
|
# the server and we don't need to do hmm init first to force update hmm memory.
|
||||||
# hmm init
|
# hmm init
|
||||||
savehistodata hmm "../data/HistoData"
|
# savehistodata hmm "../data/HistoData"
|
||||||
#
|
#
|
||||||
#clientput "Exit finish" value
|
#clientput "Exit finish" value
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
proc init {} {
|
||||||
|
}
|
||||||
|
proc graphics_hpath_setup {parent} {
|
||||||
|
}
|
||||||
|
proc commands_hpath_setup {parent} {
|
||||||
|
}
|
||||||
|
proc instrument_hpath_setup {parent} {
|
||||||
|
}
|
||||||
|
proc experiment_hpath_setup {parent} {
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
publish ::histogram_memory::hs_finish user
|
publish ::histogram_memory::hs_finish user
|
||||||
@@ -373,19 +404,3 @@ publish ::histogram_memory::set_oat_offset user
|
|||||||
publish ::histogram_memory::scan2_runb user
|
publish ::histogram_memory::scan2_runb user
|
||||||
publish ::histogram_memory::scan2_runa user
|
publish ::histogram_memory::scan2_runa user
|
||||||
publish ::histogram_memory::returnconfigfile user
|
publish ::histogram_memory::returnconfigfile user
|
||||||
|
|
||||||
#hmscan function count ::histogram_memory::hs_count_bm_controlled
|
|
||||||
#hmscan function collect ::histogram_memory::hs_collect
|
|
||||||
#hmscan function finish ::histogram_memory::hs_finish
|
|
||||||
#
|
|
||||||
#scan2 function prepare hs_prepare
|
|
||||||
scan2 function count ::histogram_memory::hs_count_hs_controlled
|
|
||||||
#scan2 function collect ::histogram_memory::hs_collect
|
|
||||||
scan2 function finish ::histogram_memory::hs_finish
|
|
||||||
|
|
||||||
MakeHM hmm anstohttp
|
|
||||||
hmm configure hmaddress http://das1-[SplitReply [instrument]]:8080
|
|
||||||
hmm configure username spy
|
|
||||||
hmm configure password 007
|
|
||||||
hmm configure hmDataPath ../HMData
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user