diff --git a/site_ansto/instrument/hipd/config/nexus/nxscripts.tcl b/site_ansto/instrument/hipd/config/nexus/nxscripts.tcl index 29e24f44..1845cac3 100644 --- a/site_ansto/instrument/hipd/config/nexus/nxscripts.tcl +++ b/site_ansto/instrument/hipd/config/nexus/nxscripts.tcl @@ -1,17 +1 @@ source $cfPath(nexus)/nxscripts_common_1.tcl -# 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_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_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 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 -} diff --git a/site_ansto/instrument/hrpd/config/nexus/nxscripts.tcl b/site_ansto/instrument/hrpd/config/nexus/nxscripts.tcl index 7dd85497..1845cac3 100644 --- a/site_ansto/instrument/hrpd/config/nexus/nxscripts.tcl +++ b/site_ansto/instrument/hrpd/config/nexus/nxscripts.tcl @@ -1,14 +1 @@ source $cfPath(nexus)/nxscripts_common_1.tcl -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 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 angsep [expr $det_angle_rad / ($dim1-1)] - $nxobj putpolararray dtheta [list $point 0] [list 1 $dim1] $angsep $det_active_ht_mm $det_rot_rad $col_zero $dim0 $dim1 -}