Checked files modified by the merge with:
cvs diff -u -rRELEASE-1_2-MERGEPOINT -rHEAD <filepath> and found no modifications on the trunk between the release 1.2 mergepoint and cvs HEAD r1946 | ffr | 2007-05-08 15:01:16 +1000 (Tue, 08 May 2007) | 4 lines
This commit is contained in:
committed by
Douglas Clowes
parent
86b99280d4
commit
55347984ec
@@ -1,5 +1,5 @@
|
||||
# $Revision: 1.22 $
|
||||
# $Date: 2007-04-20 01:53:31 $
|
||||
# $Revision: 1.23 $
|
||||
# $Date: 2007-05-08 05:01:16 $
|
||||
# Author: Ferdi Franceschini (ffr@ansto.gov.au)
|
||||
# Last revision by: $Author: ffr $
|
||||
|
||||
@@ -17,13 +17,12 @@ source server_config.tcl
|
||||
########################################
|
||||
# INSTRUMENT SPECIFIC CONFIGURATION
|
||||
|
||||
#set hmm_mode pulser
|
||||
#set hmm_mode calibration
|
||||
set hmm_mode normal
|
||||
|
||||
fileeval $cfPath(motors)/motor_configuration.tcl
|
||||
|
||||
########
|
||||
########
|
||||
# Parameters set above the restore command will be clobbered by
|
||||
# the values in the status.tcl file
|
||||
restore
|
||||
|
||||
fileeval $cfPath(plc)/plc.tcl
|
||||
fileeval $cfPath(counter)/counter.tcl
|
||||
@@ -33,8 +32,18 @@ fileeval $cfPath(scan)/scan.tcl
|
||||
source $cfPath(hipadaba)/hipadaba_configuration.tcl
|
||||
source gumxml.tcl
|
||||
|
||||
#::histogram_memory::setmode pulser
|
||||
#::histogram_memory::setmode calibration
|
||||
::histogram_memory::setmode normal
|
||||
::histogram_memory::hmm_initialize
|
||||
::histogram_memory::hmm_setup transparent 0 3 oat_nyc_eff oat_nxc_eff oat_ntc_eff
|
||||
hmm_start 0
|
||||
|
||||
MakeStateMon hmscan
|
||||
|
||||
VarMake detector_layout Text Mugger
|
||||
detector_layout cylinder
|
||||
|
||||
VarMake detector_radius_mm Int User
|
||||
detector_radius_mm 1250
|
||||
VarMake detector_angle_deg Float User
|
||||
@@ -52,10 +61,16 @@ VarMake crystal_wavelength_A Float User
|
||||
|
||||
VarMake bmon_distance Float User
|
||||
|
||||
## Column number at beam centre
|
||||
## Number of last pixel on vertical axis
|
||||
VarMake detector_last_vert_pixel Float User
|
||||
detector_last_vert_pixel 511
|
||||
## Number of last pixel on horizontal axis
|
||||
VarMake detector_last_hor_pixel Float User
|
||||
detector_last_hor_pixel 127
|
||||
## Row number at beam centre
|
||||
VarMake detector_zero_row Float User
|
||||
detector_zero_row 255.5
|
||||
## Row number at beam centre for a detector rotation of 0 degrees
|
||||
## Column number at beam centre for a detector rotation of 0 degrees
|
||||
VarMake detector_zero_col Float User
|
||||
detector_zero_col 124
|
||||
## Row offset for region of interest
|
||||
|
||||
Reference in New Issue
Block a user