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

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