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

Checked files modified by the merge with:

Browse Source 
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:
Ferdi Franceschini
2007-05-08 15:01:16 +10:00
committed by Douglas Clowes
parent 86b99280d4
commit 55347984ec
11 changed files with 194 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
site_ansto/instrument/config/nexus/nexus_in_common_1.dic
View File

@@ -12,11 +12,13 @@ monochromator=monochromator
detector=detector
padim0=512
padim1=128
column_index_name=horizontal_channel_number
row_index_name=vertical_channel_number
#---------- NXentry level
etitle=/$(entryName),NXentry/SDS title -type NX_CHAR
program_name=/$(entryName),NXentry/SDS program_name -type NX_CHAR \
-attr {nx_schema_release_tag,$Name: not supported by cvs2svn $} -attr {nx_schema_revision_num,$Revision: 1.11 $}
-attr {nx_schema_release_tag,$Name: not supported by cvs2svn $} -attr {nx_schema_revision_num,$Revision: 1.12 $}
erun=/$(entryName),NXentry/SDS run_number -type NX_INT32 -rank 1 -dim {-1}
estart=/$(entryName),NXentry/SDS start_time -type NX_CHAR

12
site_ansto/instrument/config/nexus/nexus_in_hmm_common_1.dic
View File

@@ -2,13 +2,15 @@
# histogram data
dradius=/$(entryName),NXentry/$(inst),NXinstrument/$(detector),NXdetector/SDS distance -type NX_FLOAT32 -attr {units,mm}
dheight=/$(entryName),NXentry/$(inst),NXinstrument/$(detector),NXdetector/SDS detector_height -type NX_FLOAT32 -attr {units,mm} -attr {long_name, active height}
detangle_rad=/$(entryName),NXentry/$(inst),NXinstrument/$(detector),NXdetector/SDS angular_coverage -type NX_FLOAT32 -attr {units,radians}
detangle_degrees=/$(entryName),NXentry/$(inst),NXinstrument/$(detector),NXdetector/SDS angular_coverage -type NX_FLOAT32 -attr {units,degrees}
dtheta=/$(entryName),NXentry/$(inst),NXinstrument/$(detector),NXdetector/SDS polar_angle -type NX_FLOAT32 -LZW -rank 3 -dim {-1,$(padim0),$(padim1)} -attr {units,radians}
dradius=/$(entryName),NXentry/$(inst),NXinstrument/$(detector),NXdetector/SDS radius -type NX_FLOAT32 -attr {units,mm}
dheight=/$(entryName),NXentry/$(inst),NXinstrument/$(detector),NXdetector/SDS height -type NX_FLOAT32 -attr {units,mm}
detangle_rad=/$(entryName),NXentry/$(inst),NXinstrument/$(detector),NXdetector/SDS arc -type NX_FLOAT32 -attr {units,radians}
detangle_degrees=/$(entryName),NXentry/$(inst),NXinstrument/$(detector),NXdetector/SDS arc -type NX_FLOAT32 -attr {units,degrees}
dtheta=/$(entryName),NXentry/$(inst),NXinstrument/$(detector),NXdetector/SDS polar_angle -type NX_FLOAT32 -LZW -rank 2 -dim {-1,$(padim1)} -attr {units,degrees}
dvaxis=/$(entryName),NXentry/$(inst),NXinstrument/$(detector),NXdetector/SDS y_pixel_offset -type NX_FLOAT32 -LZW -rank 1 -dim {$(padim0)} -attr {units,mm}
dhaxis=/$(entryName),NXentry/$(inst),NXinstrument/$(detector),NXdetector/SDS x_pixel_offset -type NX_FLOAT32 -LZW -rank 1 -dim {$(padim1)} -attr {units,mm}
drowindex=/$(entryName),NXentry/$(inst),NXinstrument/$(detector),NXdetector/SDS $(row_index_name) -type NX_INT32 -LZW -rank 1 -dim {$(padim0)}
dcolindex=/$(entryName),NXentry/$(inst),NXinstrument/$(detector),NXdetector/SDS $(column_index_name) -type NX_INT32 -LZW -rank 1 -dim {$(padim1)}
hmcounts=/$(entryName),NXentry/$(inst),NXinstrument/$(detector),NXdetector/SDS \
data -type NX_INT32 -LZW -rank 3 -dim {-1,$(padim0),$(padim1)}

71
site_ansto/instrument/config/nexus/nxscripts_common_1.tcl
View File

@@ -9,7 +9,7 @@
set tmpstr [string map {"$" ""} {$Name: not supported by cvs2svn $}]
set nx_content_release_tag [lindex $tmpstr [expr [llength $tmpstr] - 1]]
set tmpstr [string map {"$" ""} {$Revision: 1.23 $}]
set tmpstr [string map {"$" ""} {$Revision: 1.24 $}]
set nx_content_revision_num [lindex $tmpstr [expr [llength $tmpstr] - 1]]
MakeNXScript
@@ -66,19 +66,9 @@ set tubedia 0.0254
set pi 3.1415926
set angsep 1.25
# stthmin = (180 - (1.25*127))/2
proc det_height_arr {active_height_mm row_zero dim1} {
global det_height
set hsep [expr $active_height_mm/($dim1-1)]
for {set i 0} {$i < $dim1} {incr i} {
set height [expr ($row_zero - $i) *$hsep]
set det_height($i) $height
}
}
proc hmm_save {nxobj entryname point} {
global dradius ndect angsep dictalias hmm_mode;
global dradius ndect angsep dictalias;
set dictalias(hmm) hmcounts
# dim0 is vertical and dim1 is horizontal
set dim0 [SplitReply [hmm configure dim0]];
@@ -88,30 +78,32 @@ proc hmm_save {nxobj entryname point} {
putmonitor $nxobj $point;
putsample $nxobj;
$nxobj putattribute program_name hmm_mode $hmm_mode
$nxobj putattribute program_name hmm_mode [SplitReply [hmm_mode]]
$nxobj putfloat detangle_degrees [SplitReply [detector_angle_deg]]
# put1Dpolar_angle $nxobj $dim0;
$nxobj putfloat dheight [SplitReply [detector_active_height_mm]]
put_det_haxis_arr $nxobj $dim1;
put_det_vaxis_arr $nxobj $dim0;
$nxobj puttext dtype [SplitReply [detector_type]]
$nxobj puttext ddesc [SplitReply [detector_description]]
$nxobj putfloat dradius [SplitReply [detector_radius_mm]]
$nxobj puttext dlayout area
$nxobj puttext dlayout [SplitReply [detector_layout]]
set histo_length [SplitReply [hmm_length]]
$nxobj updatedictvar padim0 $dim0
$nxobj updatedictvar padim1 $dim1
$nxobj putslab $dictalias(hmm) [list $point 0 0] [list 1 $dim0 $dim1 ] hmm [SplitReply [hmm_start]] $histo_length [SplitReply [hmm_bank]]
# put2Dpolar_angle $nxobj $point $dim0 $dim1;
put_polar_angle $nxobj $point $dim0 $dim1;
#TODO replace scandata with generic name
$nxobj makelink scandata hmcounts
$nxobj makelink scanhoraxis dhaxis
$nxobj makelink scanvertaxis dvaxis
$nxobj putattribute dvaxis axis 2;
$nxobj putattribute dhaxis axis 3;
$nxobj makelink scanhoraxis [SplitReply [_hmm_hor_axis_alias]]
$nxobj makelink scanvertaxis [SplitReply [_hmm_vert_axis_alias]]
$nxobj putattribute [SplitReply [_hmm_vert_axis_alias]] axis 2;
$nxobj putattribute [SplitReply [_hmm_hor_axis_alias]] axis 3;
}
proc hmm_addnxscanentry {nxobj entryname point scanVariable scanVarPos scanVarStep start_time} {
global dictalias;
set hor_axis [SplitReply [_hmm_hor_axis]]
set vert_axis [SplitReply [_hmm_vert_axis]]
$nxobj puttext estart $start_time;
$nxobj putattribute program_name run_mode hmscan
@@ -123,7 +115,7 @@ proc hmm_addnxscanentry {nxobj entryname point scanVariable scanVarPos scanVarSt
$nxobj makelink scanvar $dictalias($scanVariable);
$nxobj putattribute $dictalias($scanVariable) axis 1;
$nxobj putattribute hmcounts signal 1;
$nxobj putattribute hmcounts axes $scanVariable:y_pixel_offset:x_pixel_offset;
$nxobj putattribute hmcounts axes $scanVariable:$vert_axis:$hor_axis;
$nxobj puttext eend [sicstime];
}
@@ -173,34 +165,31 @@ proc put_det_haxis_arr {nxobj dim1} {
set angsep [expr $det_angle_rad / ($dim1-1)]
for {set i 0} {$i < $dim1} {incr i} {
set x_arr($i) [expr ($dim1 - 1 - $i)*$angsep*$det_radius_mm]
set col_index($i) [expr int($i)]
set xpixel_offset($i) [expr $i*$angsep*$det_radius_mm]
}
$nxobj putarray dhaxis x_arr $dim1;
$nxobj putarray dhaxis xpixel_offset $dim1;
$nxobj updatedictvar column_index_name [SplitReply [_hmm_hor_channel_name]]
$nxobj putintarray dcolindex col_index $dim1;
}
proc put_det_vaxis_arr {nxobj dim0} {
global det_height
set det_active_ht_mm [SplitReply [detector_active_height_mm]]
set row_zero [ SplitReply [detector_zero_row]]
set det_active_height_mm [SplitReply [detector_active_height_mm]]
set hsep [expr $det_active_height_mm/($dim0-1)]
set det_zero_row [SplitReply [detector_zero_row] ]
set det_last_vert_pixel [SplitReply [detector_last_vert_pixel]]
set row_zero [expr ($dim0 - 1.0)*$det_zero_row/$det_last_vert_pixel]
det_height_arr $det_active_ht_mm $row_zero $dim0
$nxobj putarray dvaxis det_height $dim0
$nxobj putattribute dvaxis axis 3;
}
proc put1Dpolar_angle {nxobj dim0} {
set det_angle_rad [SplitReply [detector_angle_rad]]
set col_zero [ SplitReply [detector_zero_col]]
set col_offset [ SplitReply [detector_ROI_col_offset]]
set det_rot_rad [ expr [SplitReply [stth]]/[SplitReply [deg_per_rad]] ]
set angsep [expr $det_angle_rad / ($dim0-1)]
for {set i 0} {$i < $dim0} {incr i} {
set polar_array($i) [expr $det_rot_rad+(($dim0 - 1 - $i) + $col_zero + $col_offset)*$angsep]
set row_index($i) [expr int($i)]
set ypixel [expr $det_active_height_mm - ($i+$row_zero)*$hsep]
set det_ypixel_offset($i) $ypixel
}
$nxobj putarray polar_angle polar_array $dim0;
}
$nxobj putarray dvaxis det_ypixel_offset $dim0
$nxobj updatedictvar row_index_name vertical_channel_number
$nxobj putintarray drowindex row_index $dim0;
}
proc putsample {nxobj} {
$nxobj puttext saname [getVal [Sample]]

9
site_ansto/instrument/config/scan/scan_common_1.tcl
View File

@@ -51,6 +51,7 @@ variable scanVariable scan_var scanVarStart 0 scanVarStep 1
variable scanVarStart;
variable scanVarStep;
variable scanVariable;
variable scan_pt_start_time
nxcreatefile nexus_hmscan.dic;
nxclosefile;
@@ -64,12 +65,11 @@ variable scanVariable scan_var scanVarStart 0 scanVarStep 1
hmscan_var_name $scanVariable
hmscan_var_start $scanVarStart
hmscan_var_step $scanVarStep
set scan_pt_start_time [sicstime]
::histogram_memory::prepare
}
proc hmm_count {sobj uobj point mode preset} {
variable scan_pt_start_time
set scan_pt_start_time [sicstime]
hmscan_point_current $point;
hmscan_mode $mode;
hmscan_preset $preset;
@@ -126,9 +126,6 @@ variable scanVariable scan_var scanVarStart 0 scanVarStep 1
proc donothing {args} {}
proc bm_count {sobj uobj point mode preset} {
variable scan_pt_start_time
set scan_pt_start_time [sicstime]
bmonscan_point_current $point
bmonscan_mode $mode;
bmonscan_preset $preset;
@@ -144,6 +141,7 @@ variable scanVariable scan_var scanVarStart 0 scanVarStep 1
variable scanVariable;
variable bmoncounts_array;
variable bmoncounts_axis;
variable scan_pt_start_time
set bmoncounts_array [list]
#TODO Parameterise varindex in some way
@@ -161,6 +159,7 @@ variable scanVariable scan_var scanVarStart 0 scanVarStep 1
bmonscan_var_name $scanVariable
bmonscan_var_start $scanVarStart
bmonscan_var_step $scanVarStep
set scan_pt_start_time [sicstime]
#stdscan prepare $sobj $uobj;
}

24
site_ansto/instrument/hipd/config/nexus/nxscripts.tcl
View File

@@ -1,23 +1,17 @@
source $cfPath(nexus)/nxscripts_common_1.tcl
proc put2Dpolar_angle {nxobj point dim0 dim1} {
# The polar angle should be calculated on the
# horizontal spatial bin boundaries.
proc put_polar_angle {nxobj point dim0 dim1} {
global det_height
set det_radius_mm [SplitReply [detector_radius_mm]]
set det_angle_rad [SplitReply [detector_angle_rad]]
set det_active_ht_mm [SplitReply [detector_active_height_mm]]
set det_rot_rad [ expr [SplitReply [stth]]/[SplitReply [deg_per_rad]] ]
set row_zero [ SplitReply [detector_zero_row]]
set row_offset [ SplitReply [detector_ROI_row_offset]]
set col_zero [ SplitReply [detector_zero_col]]
set col_offset [ SplitReply [detector_ROI_col_offset]]
set det_zero_col [ SplitReply [detector_zero_col]]
set det_last_hor_pixel [SplitReply [detector_last_hor_pixel]]
set col_zero [expr ($dim1 -1.0)*$det_zero_col/$det_last_hor_pixel]
set folding 1;
# For 1D use poladim = 1 and rows = 1
# For 2D use poladim = 2 and rows = $dim0
set poladim 2;
set rows $dim0;
set angsep [expr $det_angle_rad / ($dim1-1)]
$nxobj updatedictvar padim0 $rows
$nxobj updatedictvar padim1 $dim1
$nxobj putpolararray dtheta [list $point 0 0] [list 1 $rows $dim1] $folding $poladim $det_radius_mm $angsep $det_active_ht_mm $det_rot_rad $row_zero $row_offset $col_zero $col_offset $dim0 $dim1
set angsep [expr $det_angle_rad / ($dim1-1.0)]
$nxobj putpolararray dtheta [list $point 0] [list 1 $dim1] $angsep $det_active_ht_mm $det_rot_rad $col_zero $dim0 $dim1
}

32
site_ansto/instrument/hipd/script_validator/config/hmm/hmm_configuration.tcl
View File

@@ -18,6 +18,32 @@ proc ::histogram_memory::hmmdictitemval {histomem dictitem} {
proc ::histogram_memory::hmm_initialize {} {
}
::histogram_memory::hmm_initialize
::histogram_memory::hmm_setup transparent 7000000 3 stitch_nyc stitch_nxc oat_ntc_eff
hmm_start 0
proc ::histogram_memory::setmode {mode} {
global cfPath;
hmm_mode $mode
switch $mode {
global cfPath;
pulser {
_hmm_hor_axis polar_angle
_hmm_hor_axis_alias dtheta
_hmm_vert_axis y_pixel_offset
_hmm_vert_axis_alias dvaxis
hmm configure hmconfigscript "returnconfigfile $cfPath(hmm)/anstohm_full_pulser.xml"
}
calibration {
_hmm_hor_axis polar_angle
_hmm_hor_axis_alias dtheta
_hmm_vert_axis y_pixel_offset
_hmm_vert_axis_alias dvaxis
hmm configure hmconfigscript "returnconfigfile $cfPath(hmm)/anstohm_full_calibration.xml"
}
normal -
default {
_hmm_hor_axis polar_angle
_hmm_hor_axis_alias dtheta
_hmm_vert_axis y_pixel_offset
_hmm_vert_axis_alias dvaxis
hmm configure hmconfigscript "returnconfigfile $cfPath(hmm)/anstohm_full_small.xml"
}
}
}

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

@@ -1,5 +1,5 @@
# $Revision: 1.15 $
# $Date: 2007-04-20 01:53:31 $
# $Revision: 1.16 $
# $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
@@ -32,9 +31,18 @@ fileeval $cfPath(nexus)/nxscripts.tcl
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 7000000 3 stitch_nyc stitch_nxc 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 700.0
VarMake detector_angle_deg Float User
@@ -52,12 +60,18 @@ 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 [expr 480 * 8 - 1]
## 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 [expr 480 * 8 - 1]
detector_zero_col [SplitReply [detector_last_hor_pixel]]
## Row offset for region of interest
VarMake detector_ROI_row_offset Float User
detector_ROI_row_offset 0

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

@@ -25,20 +25,36 @@ source $cfPath(hmm)/hmm_configuration_common_1.tcl
# kept on the local file system (not automated presently, manual control only)
# - Or, no configuration at all could be uploaded, the
# histogram server can configure itself using its default config files.
proc setmode {mode} {
proc ::histogram_memory::setmode {mode} {
global cfPath;
switch $mode {
pulser {
hmm configure hmconfigscript "returnconfigfile $cfPath(hmm)/anstohm_full_MESYTEC_PULSER.xml"
hmm_mode $mode
switch $mode {
pulser {
_hmm_hor_channel_name tube_pair_number
_hmm_hor_axis tube_pair_number
_hmm_hor_axis_alias dcolindex
_hmm_vert_axis vertical_channel_number
_hmm_vert_axis_alias drowindex
hmm configure hmconfigscript "returnconfigfile $cfPath(hmm)/anstohm_full_MESYTEC_PULSER.xml"
}
calibration {
_hmm_hor_channel_name tube_pair_number
_hmm_hor_axis tube_pair_number
_hmm_hor_axis_alias dcolindex
_hmm_vert_axis vertical_channel_number
_hmm_vert_axis_alias drowindex
hmm configure hmconfigscript "returnconfigfile $cfPath(hmm)/anstohm_full_nofolding.xml"
}
normal -
default {
_hmm_hor_channel_name horizontal_channel_number
_hmm_hor_axis polar_angle
_hmm_hor_axis_alias dtheta
_hmm_vert_axis vertical_channel_number
_hmm_vert_axis_alias drowindex
hmm configure hmconfigscript "returnconfigfile $cfPath(hmm)/anstohm_full_folding.xml"
}
}
calibration {
hmm configure hmconfigscript "returnconfigfile $cfPath(hmm)/anstohm_full_nofolding.xml"
}
normal -
default {
hmm configure hmconfigscript "returnconfigfile $cfPath(hmm)/anstohm_full_folding.xml"
}
}
}
if {$sim_mode == "true"} {
@@ -94,7 +110,3 @@ proc setmode {mode} {
}
setmode $hmm_mode
::histogram_memory::hmm_initialize
::histogram_memory::hmm_setup transparent 0 3 oat_nyc_eff oat_nxc_eff oat_ntc_eff
hmm_start 0

29
site_ansto/instrument/hrpd/config/nexus/nxscripts.tcl
View File

@@ -1,31 +1,14 @@
source $cfPath(nexus)/nxscripts_common_1.tcl
proc put2Dpolar_angle {nxobj point dim0 dim1} {
global det_height hmm_mode;
set det_radius_mm [SplitReply [detector_radius_mm]]
proc put_polar_angle {nxobj point dim0 dim1} {
global det_height;
set det_angle_rad [SplitReply [detector_angle_rad]]
set det_active_ht_mm [SplitReply [detector_active_height_mm]]
set det_rot_rad [ expr [SplitReply [stth]]/[SplitReply [deg_per_rad]] ]
set row_zero [ SplitReply [detector_zero_row]]
set row_offset [ SplitReply [detector_ROI_row_offset]]
set col_zero [ SplitReply [detector_zero_col]]
set col_offset [ SplitReply [detector_ROI_col_offset]]
set det_zero_col [ SplitReply [detector_zero_col]]
set det_last_hor_pixel [SplitReply [detector_last_hor_pixel]]
set col_zero [expr ($dim1 -1.0)*$det_zero_col/$det_last_hor_pixel]
switch $hmm_mode {
pulser {
set folding 0;
set poladim 2;
}
calibration {
set folding 0;
set poladim 2;
}
normal -
default {
set folding 1;
set poladim 2;
}
}
set angsep [expr $det_angle_rad / ($dim1-1)]
$nxobj putpolararray dtheta [list $point 0 0] [list 1 $dim0 $dim1] $folding $poladim $det_radius_mm $angsep $det_active_ht_mm $det_rot_rad $row_zero $row_offset $col_zero $col_offset $dim0 $dim1
$nxobj putpolararray dtheta [list $point 0] [list 1 $dim1] $angsep $det_active_ht_mm $det_rot_rad $col_zero $dim0 $dim1
}

31
site_ansto/instrument/hrpd/echidna_configuration.tcl
View File

@@ -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

33
site_ansto/instrument/hrpd/script_validator/config/hmm/hmm_configuration.tcl
View File

@@ -18,6 +18,33 @@ proc ::histogram_memory::hmmdictitemval {histomem dictitem} {
proc ::histogram_memory::hmm_initialize {} {
}
::histogram_memory::hmm_initialize
::histogram_memory::hmm_setup transparent 0 3 oat_nyc_eff oat_nxc_eff oat_ntc_eff
hmm_start 0
proc ::histogram_memory::setmode {mode} {
global cfPath;
hmm_mode $mode
switch $mode {
pulser {
_hmm_hor_axis tube_pair_number
_hmm_hor_axis_alias dcolindex
_hmm_vert_axis vertical_channel_number
_hmm_vert_axis_alias drowindex
hmm configure hmconfigscript "returnconfigfile $cfPath(hmm)/anstohm_full_MESYTEC_PULSER.xml"
}
calibration {
_hmm_hor_axis tube_pair_number
_hmm_hor_axis_alias dcolindex
_hmm_vert_axis vertical_channel_number
_hmm_vert_axis_alias drowindex
hmm configure hmconfigscript "returnconfigfile $cfPath(hmm)/anstohm_full_nofolding.xml"
}
normal -
default {
_hmm_hor_axis polar_angle
_hmm_hor_axis_alias dtheta
_hmm_vert_axis vertical_channel_number
_hmm_vert_axis_alias drowindex
hmm configure hmconfigscript "returnconfigfile $cfPath(hmm)/anstohm_full_folding.xml"
}
}
}