Merged 2.4 branch

r2828 | ffr | 2009-11-25 09:56:49 +1100 (Wed, 25 Nov 2009) | 2 lines
This commit is contained in:
Ferdi Franceschini
2009-11-25 09:56:49 +11:00
committed by Douglas Clowes
parent c58ee9fbcb
commit 2ec6505ef8
71 changed files with 2237 additions and 1528 deletions

View File

@@ -130,13 +130,16 @@ proc ::histogram_memory::detector_posn_degrees {} {
proc ::histogram_memory::pre_count {} {}
proc ::histogram_memory::post_count {} {}
proc ::histogram_memory::isc_initialize {} {
# Instrument specific X and Y dimension names
variable INST_NXC "oat_nxc_eff"
variable INST_NYC "oat_nyc_eff"
if [ catch {
::histogram_memory::init_hmm_objs
if {$::sim_mode == "true"} {
hmm configure oat_ntc_eff 1
hmm configure oat_nyc_eff 1024
hmm configure oat_nxc_eff 64
hmm configure $INST_NYC 1024
hmm configure $INST_NXC 64
}
BAT_TABLE -init
CAT_TABLE -init
@@ -144,11 +147,14 @@ proc ::histogram_memory::isc_initialize {} {
OAT_TABLE -init
FAT_TABLE -init
::histogram_memory::ic_initialize
::histogram_memory::two_theta -boundaries
::histogram_memory::set_graphtype "two_theta" "boundaries"
detector_active_height_mm 335
detector_active_height_mm lock
detector_active_width_mm 3490.64
detector_active_width_mm lock
detector_radius_mm 1250.0
detector_radius_mm lock
# hmm configure FAT_SIMULATED_EVENT_Y0 $y_bb0
# hmm configure FAT_SIMULATED_EVENT_Y1 $ybbmax
@@ -160,7 +166,7 @@ proc ::histogram_memory::isc_initialize {} {
::histogram_memory::upload_config Filler_defaults
::nexus::data alias ::histogram_memory::vertical_axis ::histogram_memory::y_pixel_offset
::nexus::data alias ::histogram_memory::horizontal_axis ::histogram_memory::two_theta
::nexus::data alias ::histogram_memory::horizontal_axis ::histogram_memory::x_pixel_angular_offset
} message ] {
if {$::errorCode=="NONE"} {return $message}
return -code error $message