remove HMM component of Dingo
r3598 | jgn | 2012-06-12 10:01:17 +1000 (Tue, 12 Jun 2012) | 1 line
This commit is contained in:
committed by
Douglas Clowes
parent
843c12d208
commit
97fcb9ecf3
@@ -6,55 +6,12 @@ source $cfPath(hmm)/hmm_cylindrical_detector_configuration.tcl
|
||||
set sim_mode [SplitReply [hmm_simulation]]
|
||||
|
||||
proc ::histogram_memory::init_OAT_TABLE {} {
|
||||
if [ catch {
|
||||
|
||||
OAT_TABLE X -setdata MAX_CHAN 8
|
||||
OAT_TABLE Y -setdata MAX_CHAN 1024
|
||||
OAT_TABLE X -setdata BMIN -0.5
|
||||
OAT_TABLE X -setdata BMAX 7.5
|
||||
OAT_TABLE Y -setdata BMIN -0.5
|
||||
OAT_TABLE Y -setdata BMAX 1023.5
|
||||
|
||||
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}
|
||||
return -code error $message
|
||||
}
|
||||
}
|
||||
|
||||
proc CAT_TABLE {args} {
|
||||
return {
|
||||
<CAT>
|
||||
<WIX APPLY="ENABLE" MIN_RAW="0" MAX_RAW="7" TABLE_SIZE="8">
|
||||
<link_numeric_file filename="../../dingo_wix.dat" default_filename="../HMconfig/Default/dingo_wix.dat" />
|
||||
</WIX>
|
||||
<OFFSET_Y_PER_X APPLY="ENABLE" MIN_RAW="0" MAX_RAW="7" TABLE_SIZE="8" BASE_VAL="0">
|
||||
<link_numeric_file filename="../../dingo_offset_y_per_x.dat" default_filename="../HMconfig/Default/dingo_offset_y_per_x.dat" />
|
||||
</OFFSET_Y_PER_X>
|
||||
<MAGNIFY APPLY="ENABLE" MIN_RAW="0" MAX_RAW="7" TABLE_SIZE="8" DIRECTION="X" MAX_IN="1023" MAX_OUT="1023" RANGE="UNSIGNED">
|
||||
<link_numeric_file filename="../../dingo_magnify.dat" default_filename="../HMconfig/Default/dingo_magnify.dat" />
|
||||
</MAGNIFY>
|
||||
</CAT>
|
||||
}
|
||||
}
|
||||
|
||||
proc ::histogram_memory::init_CAT_TABLE {} {
|
||||
CAT_TABLE -set MESYTEC_MPSD8_CHANNEL_GAINS {
|
||||
1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00
|
||||
}
|
||||
CAT_TABLE -set MESYTEC_MPSD8_THRESHOLDS { 10 }
|
||||
CAT_TABLE -set MESYTEC_TUBE_PAIR_RESISTANCE_RATIOS {
|
||||
1. 1. 1. 1. 1. 1. 1. 1.
|
||||
}
|
||||
CAT_TABLE -set MESYTEC_TUBE_MAGNIFICATIONS {
|
||||
1. 1. 1. 1. 1. 1. 1. 1.
|
||||
}
|
||||
CAT_TABLE -set MESYTEC_TUBE_OFFSETS {
|
||||
0. 0. 0. 0. 0. 0. 0. 0.
|
||||
}
|
||||
CAT_TABLE -set MESYTEC_TUBE_HISTOGRAM_WEIGHTS {
|
||||
1 1 1 1 1 1 1 1
|
||||
}
|
||||
}
|
||||
|
||||
##
|
||||
@@ -66,51 +23,6 @@ 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 $INST_NYC 1024
|
||||
hmm configure $INST_NXC 8
|
||||
}
|
||||
BAT_TABLE -init
|
||||
# CAT_TABLE -init
|
||||
SAT_TABLE -init
|
||||
OAT_TABLE -init
|
||||
FAT_TABLE -init
|
||||
::histogram_memory::ic_initialize
|
||||
::histogram_memory::set_graphtype "two_theta" "boundaries"
|
||||
|
||||
# MJL TODO detector geometry for Kookaburra TBD. Figures need revision during commissioning
|
||||
# Width = 25mm spacing * 8 tubes = 5000mm (??? degree coverage)
|
||||
# Height = 1015mm (tube length)
|
||||
# Radius = 2400mm
|
||||
detector_active_height_mm 1015
|
||||
detector_active_height_mm lock
|
||||
detector_active_width_mm 5000
|
||||
detector_active_width_mm lock
|
||||
detector_radius_mm 2400.0
|
||||
detector_radius_mm lock
|
||||
|
||||
# hmm configure FAT_SIMULATED_EVENT_Y0 $y_bb0
|
||||
# hmm configure FAT_SIMULATED_EVENT_Y1 $ybbmax
|
||||
# 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::init_CAT_TABLE
|
||||
::histogram_memory::upload_config Filler_defaults
|
||||
|
||||
set ::histogram_memory::histmem_axes(HOR) /instrument/detector/x_pixel_angular_offset
|
||||
set ::histogram_memory::histmem_axes(VER) /instrument/detector/y_pixel_offset
|
||||
} message ] {
|
||||
if {$::errorCode=="NONE"} {return $message}
|
||||
return -code error $message
|
||||
}
|
||||
}
|
||||
|
||||
proc histmem {cmd args} {
|
||||
|
||||
Reference in New Issue
Block a user