Merged release 2.0 patch-set 1 (RELEASE-2_0P1 )

r2624 | ffr | 2008-06-12 09:05:36 +1000 (Thu, 12 Jun 2008) | 2 lines
This commit is contained in:
Ferdi Franceschini
2008-06-12 09:05:36 +10:00
committed by Douglas Clowes
parent 528d125efe
commit 3a40ea5693
12 changed files with 79 additions and 32 deletions

View File

@@ -13,7 +13,15 @@ proc ::histogram_memory::init_OAT_TABLE {} {
OAT_TABLE Y -setdata BMIN -0.5
OAT_TABLE Y -setdata BMAX 511.5
OAT_TABLE -set X { 127.5 126.5 } NXC 128 Y { -0.5 0.5 } NYC 512 T { 0 2000 } NTC 1
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}
return -code error $message
}
}
proc ::histogram_memory::init_SAT_TABLE {} {
if [ catch {
SAT_TABLE -set APPLY ENABLE MIDPOINT 480 DIRECTION X SWAP ENABLE WRAP ENABLE
} message ] {
if {$::errorCode=="NONE"} {return $message}
return -code error $message
@@ -43,7 +51,7 @@ proc ::histogram_memory::initialize {} {
::histogram_memory::two_theta -boundaries
detector_active_height_mm 335
detector_active_width_mm 500
detector_active_width_mm 3463.4
detector_radius_mm 1250.0
# hmm configure FAT_SIMULATED_EVENT_Y0 $y_bb0
@@ -51,6 +59,7 @@ proc ::histogram_memory::initialize {} {
# hmm configure FAT_SIMULATED_EVENT_X0 $x_bb0
# hmm configure FAT_SIMULATED_EVENT_X1 $xbbmax
::histogram_memory::init_OAT_TABLE
::histogram_memory::init_SAT_TABLE
::histogram_memory::upload_config Filler_defaults
::nexus::data alias ::histogram_memory::vertical_axis ::histogram_memory::y_pixel_offset