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

Merged release 2.1

Browse Source 
r2664 | ffr | 2008-07-18 14:33:39 +1000 (Fri, 18 Jul 2008) | 2 lines
This commit is contained in:
Ferdi Franceschini
2008-07-18 14:33:39 +10:00
committed by Douglas Clowes
parent 8fb864ee37
commit e31aa973a6
10 changed files with 61 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
site_ansto/instrument/hipd/config/hmm/hmm_configuration.tcl
View File

@@ -2,8 +2,14 @@ source $cfPath(hmm)/hmm_configuration_common_1.tcl
source $cfPath(hmm)/hmm_cylindrical_detector_configuration.tcl
set sim_mode [SplitReply [hmm_simulation]]
proc ::histogram_memory::init_OAT_TABLE {} {
proc ::histogram_memory::init_OAT_TABLE {args} {
if [ catch {
array set pararr $args
if [info exists pararr(res)] {
set resolution $pararr(res)
} else {
set resolution "hires"
}
# We don't need a MAX_CHAN parameter for time because the time channel
# is scaled by calling the ::histogram_memory::clock_scale function
OAT_TABLE X -setdata MAX_CHAN 3872
@@ -15,10 +21,21 @@ proc ::histogram_memory::init_OAT_TABLE {} {
OAT_TABLE Y -setdata BMIN -0.5
OAT_TABLE Y -setdata BMAX 511.5
# x bin range 0, 3871
# y bin range 0, 511
FAT_TABLE -set MULTI_HOST_HISTO_STITCH_OVERLAP 32
OAT_TABLE -set X { 991.5 990.5 } NXC 992 Y { 511.5 510.5 } NYC 512 T { 0 20000 } NTC 1
switch $resolution {
"hires" {
FAT_TABLE -set MULTI_HOST_HISTO_STITCH_OVERLAP 32
OAT_TABLE -set X { 991.5 990.5 } NXC 992 Y { -0.5 0.5 } NYC 512 T { 0 20000 } NTC 1
}
"std_968x128" {
FAT_TABLE -set MULTI_HOST_HISTO_STITCH_OVERLAP 8
OAT_TABLE -set X { 991.5 987.5 } NXC 248 Y { -0.5 3.5 } NYC 128 T { 0 20000 } NTC 1
}
default {
# Default to std_968x128
FAT_TABLE -set MULTI_HOST_HISTO_STITCH_OVERLAP 8
OAT_TABLE -set X { 991.5 987.5 } NXC 248 Y { -0.5 3.5 } NYC 128 T { 0 20000 } NTC 1
}
}
} message ] {
if {$::errorCode=="NONE"} {return $message}
return -code error $message
@@ -34,14 +51,9 @@ proc ::histogram_memory::oat_bins {axis} {
foreach {bb0 bb1} [OAT_TABLE -get $axis] {}
set bstep [expr $bb1 - $bb0]
if {$bstep < 0} {
set nch_perseg [OAT_TABLE -get $channID($axis)]
set overlap [FAT_TABLE -get MULTI_HOST_HISTO_STITCH_OVERLAP]
set bb0 [expr 4*$nch_perseg - 3*$overlap + $bstep/2.0]
set bb1 [expr $bb0+$bstep]
###########
# set overlap [FAT_TABLE -get MULTI_HOST_HISTO_STITCH_OVERLAP]
# set bb0 [expr 4*$bb0 - 3*($overlap-1)]
# set bb1 [expr $bb0+$bstep]
set bb0 3871.5
set bb1 [expr $bb0+$bstep]
FAT_TABLE -set MULTI_HOST_HISTO_STITCH_OVERLAP [expr abs(32.0/$bstep)]
}
return [list $bb0 $bb1]
} else {
@@ -104,11 +116,7 @@ proc ::histogram_memory::isc_initialize {} {
detector_active_width_mm 1524
detector_radius_mm 728.0
# 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_OAT_TABLE res "std_968x128"
::histogram_memory::upload_config Filler_defaults
::nexus::data alias ::histogram_memory::vertical_axis ::histogram_memory::y_pixel_offset

1
site_ansto/instrument/hipd/config/motors/motor_configuration.tcl
View File

@@ -643,4 +643,3 @@ make_gap_motors ss2hg gap ss2ho offset ss2r ss2l mm $slit2HGroup
proc motor_set_sobj_attributes {} {
}
# END MOTOR CONFIGURATION
::anticollider::init

8
site_ansto/instrument/hipd/wombat_configuration.tcl
View File

@@ -1,5 +1,5 @@
# $Revision: 1.23 $
# $Date: 2008-07-11 01:09:56 $
# $Revision: 1.24 $
# $Date: 2008-07-18 04:33:39 $
# Author: Ferdi Franceschini (ffr@ansto.gov.au)
# Last revision by: $Author: ffr $
@@ -47,8 +47,8 @@ catch {
#::environment::temperature::add_ls340
if [file exists extraconfig.tcl] {
fileeval extraconfig.tcl
if [file exists ../extraconfig.tcl] {
fileeval ../extraconfig.tcl
}
buildHDB instrument_dictionary