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

Speed up histmem config when SICS starts up.

Browse Source 
Clock scale, frame freq and source should be set in the instrument specific
hmm_configuration.tcl file, not in hmm_configuration_common_1.tcl.
This commit is contained in:
Ferdi Franceschini
2013-08-15 13:56:50 +10:00
parent 4434d97239
commit ca1e34856a
9 changed files with 35 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1545,11 +1545,12 @@ proc ::histogram_memory::ic_initialize {} {
$hm_obj configure password SICS
$hm_obj configure histmode transparent
}
::histogram_memory::initialise_dictionary
# ::histogram_memory::initialise_dictionary
::histogram_memory::frame_source_always_internal $default_frame_source_always_internal([instname])
::histogram_memory::set_frame_freq 50
::histogram_memory::set_clock_scale 1000
::histogram_memory::set_frame_source $default_frame_source_when_there_is_no_frame_signal([instname])
## ffr clock scale, frame freq and source should be set in instrument specific hmm_configuration.tcl to speed up initialisation
# ::histogram_memory::set_frame_freq 50
# ::histogram_memory::set_clock_scale 1000
# ::histogram_memory::set_frame_source $default_frame_source_when_there_is_no_frame_signal([instname])
::histogram_memory::count_method unlimited
::histogram_memory::count_size 0
::histogram_memory::softveto false

4
site_ansto/instrument/hipd/config/hmm/hmm_configuration.tcl
View File

@@ -21,6 +21,10 @@ proc ::histogram_memory::init_OAT_TABLE {args} {
OAT_TABLE Y -setdata BMIN -0.5
OAT_TABLE Y -setdata BMAX 511.5
set clock_scale 1000
set freq 50
hmm configure fat_frame_source INTERNAL
switch $resolution {
"hires" {
FAT_TABLE -set MULTI_HOST_HISTO_STITCH_OVERLAP 32 MULTI_HOST_HISTO_JOIN_STITCH_ORDER INVERTED

4
site_ansto/instrument/hrpd/config/hmm/hmm_configuration.tcl
View File

@@ -13,6 +13,10 @@ proc ::histogram_memory::init_OAT_TABLE {} {
OAT_TABLE Y -setdata BMIN -0.5
OAT_TABLE Y -setdata BMAX 511.5
set clock_scale 1000
set freq 50
hmm configure fat_frame_source INTERNAL
OAT_TABLE -set X { 127.5 126.5 } NXC 128 Y { -0.5 3.5 } NYC 128 T { 0 20000 } NTC 1
} message ] {
if {$::errorCode=="NONE"} {return $message}

4
site_ansto/instrument/kookaburra/config/hmm/hmm_configuration.tcl
View File

@@ -15,6 +15,10 @@ proc ::histogram_memory::init_OAT_TABLE {} {
OAT_TABLE Y -setdata BMIN -0.5
OAT_TABLE Y -setdata BMAX 1023.5
set clock_scale 1000
set freq 50
hmm configure fat_frame_source INTERNAL
OAT_TABLE -set X { 7.5 6.5 } NXC 8 Y { -0.5 0.5 } NYC 1024 T { 0 200000 } NTC 1
} message ] {
if {$::errorCode=="NONE"} {return $message}

4
site_ansto/instrument/lyrebird/config/hmm/hmm_configuration.tcl
View File

@@ -15,6 +15,10 @@ proc ::histogram_memory::init_OAT_TABLE {} {
OAT_TABLE Y -setdata BMIN -0.5
OAT_TABLE Y -setdata BMAX 1023.5
set clock_scale 1000
set freq 50
hmm configure fat_frame_source INTERNAL
OAT_TABLE -set X { 29.5 28.5 } NXC 30 Y { -0.5 0.5 } NYC 1024 T { 0 200000 } NTC 1
} message ] {
if {$::errorCode=="NONE"} {return $message}

3
site_ansto/instrument/pelican/config/hmm/hmm_configuration.tcl
View File

@@ -34,6 +34,7 @@ proc ::histogram_memory::init_OAT_TABLE {} {
set tbinwidth_ns [expr $period/$tbins * 1e9]
hmm configure fat_clock_scale $clock_scale
hmm configure fat_frame_frequency $freq
hmm configure fat_frame_source EXTERNAL
# The entries in the time bin array are in nanoseconds/clock_scale because the clock base is in nanoseconds
set tbb0 0.0
set tbb1 [expr $tbb0 + $tbinwidth_ns / $clock_scale]
@@ -203,7 +204,7 @@ proc ::histogram_memory::isc_initialize {} {
# hmm configure FAT_SIMULATED_EVENT_X1 $xbbmax
::histogram_memory::init_OAT_TABLE
::histogram_memory::init_SAT_TABLE
# ::histogram_memory::init_CAT_TABLE
::histogram_memory::init_CAT_TABLE
::histogram_memory::upload_config Filler_defaults
set ::histogram_memory::histmem_axes(HOR) /instrument/detector/x_pixel_angular_offset

4
site_ansto/instrument/reflectometer/config/hmm/hmm_configuration.tcl
View File

@@ -12,6 +12,10 @@ proc ::histogram_memory::init_OAT_TABLE {} {
OAT_TABLE Y -setdata BMIN -110.5
OAT_TABLE Y -setdata BMAX 110.5
set clock_scale 1000
set freq 50
hmm configure fat_frame_source EXTERNAL
OAT_TABLE -set X { -210.5 -209.5 } NXC 421 Y { -110.5 -109.5 } NYC 221 T { 0 20000 } NTC 1
} message ] {
if {$::errorCode=="NONE"} {return $message}

4
site_ansto/instrument/rsd/config/hmm/hmm_configuration.tcl
View File

@@ -14,6 +14,10 @@ proc ::histogram_memory::init_OAT_TABLE {} {
OAT_TABLE Y -setdata BMIN -210.5
OAT_TABLE Y -setdata BMAX 210.5
set clock_scale 1000
set freq 50
hmm configure fat_frame_source EXTERNAL
OAT_TABLE -set X { -210.5 -209.5 } NXC 421 Y { -210.5 -209.5 } NYC 421 T { 0 20000 } NTC 1
}

4
site_ansto/instrument/sans/config/hmm/hmm_configuration.tcl
View File

@@ -13,6 +13,10 @@ proc ::histogram_memory::init_OAT_TABLE {} {
OAT_TABLE Y -setdata BMIN -0.5
OAT_TABLE Y -setdata BMAX 191.5
set clock_scale 1000
set freq 50
hmm configure fat_frame_source INTERNAL
OAT_TABLE -set X { 191.5 190.5 } NXC 192 Y { -0.5 0.5 } NYC 192 T { 0 20000 } NTC 1
} message ] {
return -code error $message