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

Fixed maximum and minimum bin boundaries.

Browse Source 
Code cleanup.

r2172 | ffr | 2007-10-03 10:08:40 +1000 (Wed, 03 Oct 2007) | 3 lines
This commit is contained in:
Ferdi Franceschini
2007-10-03 10:08:40 +10:00
committed by Douglas Clowes
parent 75e7862cc6
commit 67a8a8c0c3
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -109,10 +109,10 @@ proc ::histogram_memory::initialize {} {
} else {
set y_bin1 [expr {$y_bin0-$y_binwidth}]
}
OAT_TABLE -init X_min $x_bin0 X_max $x_binmax Y_min $y_bin0 Y_max $y_binmax
OAT_TABLE -init X_MIN $x_bin0 X_MAX $x_binmax Y_MIN $y_bin0 Y_MAX $y_binmax
# We default to one big bin for time
set t_bin0 [OAT_TABLE -get T_min]
set t_bin1 [OAT_TABLE -get T_max]
set t_bin0 [OAT_TABLE -get T_MIN]
set t_bin1 [OAT_TABLE -get T_MAX]
OAT_TABLE X "$x_bin0 $x_bin1" Y "$y_bin0 $y_bin1" T "$t_bin0 $t_bin1"
::histogram_memory::configure_server Filler_defaults

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

@@ -99,28 +99,28 @@ proc ::histogram_memory::setmode {mode} {
proc ::histogram_memory::initialize {} {
::histogram_memory::_initialize
detector_active_height_mm 500
detector_active_width_mm 500
detector_active_height_mm 192
detector_active_width_mm 192
set x_bin0 -0.5; set x_binmax 500.5
set y_bin0 -0.5; set y_binmax 500.5
set x_bb0 -0.5; set xbbmax 191.5
set y_bb0 -0.5; set ybbmax 191.5
set x_binwidth 1
if {[expr {$x_binmax - $x_bin0}] > 0} {
set x_bin1 [expr {$x_bin0+$x_binwidth}]
if {[expr {$xbbmax - $x_bb0}] > 0} {
set x_bb1 [expr {$x_bb0+$x_binwidth}]
} else {
set x_bin1 [expr {$x_bin0-$x_binwidth}]
set x_bb1 [expr {$x_bb0-$x_binwidth}]
}
set y_binwidth 1
if {[expr {$y_binmax - $y_bin0}] > 0} {
set y_bin1 [expr {$y_bin0+$y_binwidth}]
if {[expr {$ybbmax - $y_bb0}] > 0} {
set y_bb1 [expr {$y_bb0+$y_binwidth}]
} else {
set y_bin1 [expr {$y_bin0-$y_binwidth}]
set y_bb1 [expr {$y_bb0-$y_binwidth}]
}
OAT_TABLE -init X_MIN $x_bin0 X_MAX $x_binmax Y_MIN $y_bin0 Y_MAX $y_binmax
OAT_TABLE -init X_MIN $x_bb0 X_MAX $xbbmax Y_MIN $y_bb0 Y_MAX $ybbmax
# We default to one big bin for time
set t_bin0 [OAT_TABLE -get T_MIN]
set t_bin1 [OAT_TABLE -get T_MAX]
OAT_TABLE X "$x_bin0 $x_bin1" Y "$y_bin0 $y_bin1" T "$t_bin0 $t_bin1"
set t_bb0 [OAT_TABLE -get T_MIN]
set t_bb1 [OAT_TABLE -get T_MAX]
OAT_TABLE X "$x_bb0 $x_bb1" Y "$y_bb0 $y_bb1" T "$t_bb0 $t_bb1"
::histogram_memory::configure_server Filler_defaults
::nexus::data alias ::histogram_memory::vertical_axis ::histogram_memory::y_pixel_offset