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

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
}