histmem.c
sicvar.c SICS-93 Save histogram data and instrument state during an acquisition hipadaba_configuration_common.tcl SICS-185 Preserve case on hdb node names hmm_configuration_common_1.tcl nxscripts_common_1.tcl sicvar.c SICS-174 Allow saving of histmem data and instrument status during a count operation. wombat_configuration.tcl echidna_configuration.tcl platypus_configuration.tcl kowari_configuration.tcl quokka_configuration.tcl SICS-153 Move setup of statemon to new server_init function for the new sics_uid state variable server_config.tcl SICS-153 set attributes on the sics_suid var which is now created by MakeStateMon SICS-187 Add cold source info (TODO move to platypus,quokka and pelican configs) utility.tcl SICS-185 Added normalgetatt to preserve case on hdb node names etc. sans/config/optics/aperture_configuration.tcl New file, Provides lookup tables for attenuation and entrance apertures. (SICS-157) sans/config/optics/optics.tcl Load the new aperture_configuration.tcl sans/config/parameters/parameters.tcl SICS-157 Add instrument parameters section with derived parameters and their dependencies statemon.c SICS-153 Create sics_suid sicsvariable when loading statemon and increment it on each status change. r2635 | ffr | 2008-06-23 12:41:12 +1000 (Mon, 23 Jun 2008) | 38 lines
This commit is contained in:
committed by
Douglas Clowes
parent
eea4d4d9eb
commit
ef7c2a6f87
@@ -1,5 +1,5 @@
|
||||
# $Revision: 1.31 $
|
||||
# $Date: 2008-06-10 04:40:30 $
|
||||
# $Revision: 1.32 $
|
||||
# $Date: 2008-06-23 02:41:12 $
|
||||
# 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
|
||||
@@ -1347,36 +1347,36 @@ proc ::histogram_memory::configure_dims {} {
|
||||
if {[instname] == "wombat"} {
|
||||
array set dim_map {
|
||||
hmm {{hmm_dim0 oat_ntc_eff} {hmm_dim1 stitch_nyc} {hmm_dim2 stitch_nxc}}
|
||||
hmm,fat_read_data_type HISTOPERIOD_XYT
|
||||
hmm,read_data_type HISTOPERIOD_XYT
|
||||
hmm_xy {{hmm_dim0 stitch_nyc} {hmm_dim1 stitch_nxc}}
|
||||
hmm_xy,fat_read_data_type TOTAL_HISTOGRAM_XY
|
||||
hmm_xy,read_data_type TOTAL_HISTOGRAM_XY
|
||||
hmm_xt {{hmm_dim0 oat_ntc_eff} {hmm_dim1 stitch_nxc}}
|
||||
hmm_xt,fat_read_data_type TOTAL_HISTOGRAM_XT
|
||||
hmm_xt,read_data_type TOTAL_HISTOGRAM_XT
|
||||
hmm_yt {{hmm_dim0 oat_ntc_eff} {hmm_dim1 stitch_nyc}}
|
||||
hmm_yt,fat_read_data_type TOTAL_HISTOGRAM_YT
|
||||
hmm_yt,read_data_type TOTAL_HISTOGRAM_YT
|
||||
hmm_x {{hmm_dim0 stitch_nxc}}
|
||||
hmm_x,fat_read_data_type TOTAL_HISTOGRAM_X
|
||||
hmm_x,read_data_type TOTAL_HISTOGRAM_X
|
||||
hmm_y {{hmm_dim0 stitch_nyc}}
|
||||
hmm_y,fat_read_data_type TOTAL_HISTOGRAM_Y
|
||||
hmm_y,read_data_type TOTAL_HISTOGRAM_Y
|
||||
hmm_t {{hmm_dim0 oat_ntc_eff}}
|
||||
hmm_t,fat_read_data_type TOTAL_HISTOGRAM_T
|
||||
hmm_t,read_data_type TOTAL_HISTOGRAM_T
|
||||
}
|
||||
} else {
|
||||
array set dim_map {
|
||||
hmm {{hmm_dim0 oat_ntc_eff} {hmm_dim1 oat_nyc_eff} {hmm_dim2 oat_nxc_eff}}
|
||||
hmm,fat_read_data_type HISTOPERIOD_XYT
|
||||
hmm,read_data_type HISTOPERIOD_XYT
|
||||
hmm_xy {{hmm_dim0 oat_nyc_eff} {hmm_dim1 oat_nxc_eff}}
|
||||
hmm_xy,fat_read_data_type TOTAL_HISTOGRAM_XY
|
||||
hmm_xy,read_data_type TOTAL_HISTOGRAM_XY
|
||||
hmm_xt {{hmm_dim0 oat_ntc_eff} {hmm_dim1 oat_nxc_eff}}
|
||||
hmm_xt,fat_read_data_type TOTAL_HISTOGRAM_XT
|
||||
hmm_xt,read_data_type TOTAL_HISTOGRAM_XT
|
||||
hmm_yt {{hmm_dim0 oat_ntc_eff} {hmm_dim1 oat_nyc_eff}}
|
||||
hmm_yt,fat_read_data_type TOTAL_HISTOGRAM_YT
|
||||
hmm_yt,read_data_type TOTAL_HISTOGRAM_YT
|
||||
hmm_x {{hmm_dim0 oat_nxc_eff}}
|
||||
hmm_x,fat_read_data_type TOTAL_HISTOGRAM_X
|
||||
hmm_x,read_data_type TOTAL_HISTOGRAM_X
|
||||
hmm_y {{hmm_dim0 oat_nyc_eff}}
|
||||
hmm_y,fat_read_data_type TOTAL_HISTOGRAM_Y
|
||||
hmm_y,read_data_type TOTAL_HISTOGRAM_Y
|
||||
hmm_t {{hmm_dim0 oat_ntc_eff}}
|
||||
hmm_t,fat_read_data_type TOTAL_HISTOGRAM_T
|
||||
hmm_t,read_data_type TOTAL_HISTOGRAM_T
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1386,7 +1386,7 @@ proc ::histogram_memory::configure_dims {} {
|
||||
foreach elmt $dim_map($hm_obj) {
|
||||
set [lindex $elmt 0] [hmmdictitemval hmm [lindex $elmt 1]]
|
||||
}
|
||||
$hm_obj configure FAT_READ_DATA_TYPE $dim_map($hm_obj,fat_read_data_type)
|
||||
$hm_obj configure READ_DATA_TYPE $dim_map($hm_obj,read_data_type)
|
||||
$hm_obj stop
|
||||
$hm_obj configure init 0
|
||||
$hm_obj init
|
||||
|
||||
Reference in New Issue
Block a user