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,7 @@ proc ::histogram_memory::init_OAT_TABLE {} {
OAT_TABLE Y -setdata BMIN -0.5
OAT_TABLE Y -setdata BMAX 127.5
OAT_TABLE -set X { 127.5 126.5 } NXC 128 Y { -0.5 0.5 } NYC 127 T { 0 2000 } NTC 1
OAT_TABLE -set X { 127.5 126.5 } NXC 128 Y { -0.5 0.5 } NYC 127 T { 0 20000 } NTC 1
} message ] {
if {$::errorCode=="NONE"} {return $message}
return -code error $message
@@ -35,8 +35,8 @@ proc ::histogram_memory::initialize {} {
FAT_TABLE -init
::histogram_memory::_initialize
detector_active_height_mm 257.5
detector_active_width_mm 500
detector_active_height_mm 980
detector_active_width_mm 980
# hmm configure FAT_SIMULATED_EVENT_Y0 $y_bb0
# hmm configure FAT_SIMULATED_EVENT_Y1 $ybbmax

View File

@@ -1,5 +1,5 @@
# $Revision: 1.7 $
# $Date: 2008-05-30 00:26:56 $
# $Revision: 1.8 $
# $Date: 2008-06-11 23:05:36 $
# Author: Ferdi Franceschini (ffr@ansto.gov.au)
# Last revision by: $Author: ffr $
@@ -33,6 +33,17 @@ fileeval $cfPath(anticollider)/anticollider.tcl
source gumxml.tcl
########
# Parameters set above the restore command will be clobbered by
# the values in the status.tcl file
# BIG WARNING: DON'T PUT 'restore' IN A CATCH BLOCK BECAUSE IT RETURNS
# AN ERROR IF THERE IS NO ../log/status.tcl FILE.
restore
::utility::mkVar ::anticollider::protect_detector text manager protect_detector false detector true false
::anticollider::protect_detector "true"
########
# Parameters set above the restore command will be clobbered by
# the values in the status.tcl file