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

Pull back changes in Kookaburra config

Browse Source
This commit is contained in:
Douglas Clowes
2014-07-07 14:48:12 +10:00
parent 852f87f131
commit cc5400c595
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,6 +44,17 @@ return {
} }
} }
proc ::histogram_memory::init_FAT_TABLE {} {
FAT_TABLE -set COUNT_ROI_TYPE RECTANGULAR
FAT_TABLE -set COUNT_ROI_REGION INCLUSIVE
FAT_TABLE -set COUNT_ROI_XMIN 0
FAT_TABLE -set COUNT_ROI_XMAX 4
FAT_TABLE -set COUNT_ROI_YMIN 0
FAT_TABLE -set COUNT_ROI_YMAX 1023
FAT_TABLE -set COUNT_ROI_TMIN 0
FAT_TABLE -set COUNT_ROI_TMAX 1e9
}
proc ::histogram_memory::init_CAT_TABLE {} { proc ::histogram_memory::init_CAT_TABLE {} {
CAT_TABLE -set MESYTEC_MPSD8_CHANNEL_GAINS { CAT_TABLE -set MESYTEC_MPSD8_CHANNEL_GAINS {
1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00
@ -107,6 +118,7 @@ proc ::histogram_memory::isc_initialize {} {
# hmm configure FAT_SIMULATED_EVENT_X0 $x_bb0 # hmm configure FAT_SIMULATED_EVENT_X0 $x_bb0
# hmm configure FAT_SIMULATED_EVENT_X1 $xbbmax # hmm configure FAT_SIMULATED_EVENT_X1 $xbbmax
::histogram_memory::init_OAT_TABLE ::histogram_memory::init_OAT_TABLE
::histogram_memory::init_FAT_TABLE
# ::histogram_memory::init_SAT_TABLE # ::histogram_memory::init_SAT_TABLE
# ::histogram_memory::init_CAT_TABLE # ::histogram_memory::init_CAT_TABLE
::histogram_memory::upload_config Filler_defaults ::histogram_memory::upload_config Filler_defaults

2
site_ansto/instrument/kookaburra/config/motors/motor_configuration.tcl
View File

@ -308,7 +308,7 @@ m1x home 0
# mc2: Slit system - 1 TOP Blade # mc2: Slit system - 1 TOP Blade
# Gearbox 55:1, pitch 0.5mm # Gearbox 55:1, pitch 0.5mm
# Encoder 2p13 # Encoder 2p13
set ss1u_Home 918407 set ss1u_Home 754567
set ss1uSetRate [expr $motorrate*55.0/0.5] set ss1uSetRate [expr $motorrate*55.0/0.5]
Motor ss1u $motor_driver_type [params \ Motor ss1u $motor_driver_type [params \
asyncqueue mc2\ asyncqueue mc2\