Structural mods to nexus.dic following Mark Koenneckes review.

Added support to write 2D polar angle array.

r1540 | ffr | 2007-02-22 16:11:55 +1100 (Thu, 22 Feb 2007) | 3 lines
This commit is contained in:
Ferdi Franceschini
2007-02-22 16:11:55 +11:00
committed by Douglas Clowes
parent d2450cde32
commit b9da38d603
2 changed files with 78 additions and 42 deletions

View File

@@ -46,11 +46,30 @@ set dradius 1.25
set ndect 128
set tubedia 0.0254
set pi 3.1415926
#set angsep [expr $tubedia/$dradius *(180/$pi)]
set angsep 1.25
# stthmin = (180 - (1.25*127))/2
proc polar_angle {dradius det_angle active_length zi zj det_rot y_offset dim0 dim1} {
global tharr
set angsep [expr $det_angle / ($dim1-1)]
set ysep [expr $active_length/($dim0-1)]
set imid [expr ($dim0 -1 )/2.0]
set jmid [expr ($dim1 -1 )/2.0]
for {set i 0} {$i < $dim0} {incr i} {
set height [expr $y_offset - ($i - $imid)*$ysep]
for {set j 0} {$j < $dim1} {incr j} {
set alpha [expr $det_rot - ($j - $jmid)*$angsep]
set pang [expr acos($dradius * cos($alpha)/sqrt($dradius*$dradius + $height*$height))]
set tharr([expr $i*$dim1+$j]) $pang
}
}
}
proc addnxentry {nxobj entryname scanVariable scanVarPos scanVarStep} {
global dradius ndect angsep;
set dim0 [SplitReply [hmm configure dim0]]
set dim1 [SplitReply [hmm configure dim1]]
putcommon $nxobj $entryname $scanVariable
putcrystal $nxobj
putmonitor $nxobj
@@ -58,12 +77,13 @@ putsample $nxobj
set scanVar_value [string trim [lindex [split [$scanVariable] =] 1]]
$nxobj putfloat $scanVariable $scanVar_value
# Add thetamin and stth to tharr(i)
set sampletwotheta [string trim [lindex [split [stth] =] 1]]
for {set i 0} {$i < $ndect} {incr i} {
set tharr($i) [expr ($i-63.5)*$angsep + $sampletwotheta]
}
$nxobj updatedictvar thetadim $ndect
$nxobj putarray dtheta tharr $ndect
# set sampletwotheta [string trim [lindex [split [stth] =] 1]]
# for {set i 0} {$i < $ndect} {incr i} {
# set tharr($i) [expr ($i-63.5)*$angsep + $sampletwotheta]
# }
# $nxobj updatedictvar thetadim $ndect
# $nxobj putarray dtheta tharr $ndect
putpolar_angle $nxobj $dim0 $dim1
$nxobj puttext dtype He-3 position sensitive detector, tube active length=335+/-5mm, tube diameter=25.4 +/- 0.8mm
$nxobj puttext ddesc 128 He-3 proportional counter detector tubes (GE Energy Reuter Stokes Inc. item=RS-P4-0814-217)
$nxobj putfloat dradius $dradius
@@ -103,6 +123,21 @@ proc putmonitor {nxobj} {
$nxobj putfloat mdistance [getVal [sics_bm_distance]]
}
proc putpolar_angle {nxobj dim0 dim1} {
global tharr
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 det_zxp [ SplitReply [detector_zero_xpixel]]
set det_zyp [ SplitReply [detector_zero_ypixel]]
polar_angle $det_radius_mm $det_angle_rad $det_active_ht_mm $det_zxp $det_zyp $det_rot_rad 0 $dim0 $dim1
$nxobj updatedictvar padim0 $dim0
$nxobj updatedictvar padim1 $dim1
$nxobj putgenarray dtheta tharr [expr $dim0 * $dim1]
}
proc putsample {nxobj} {
$nxobj puttext saname [getVal [Sample]]
}