aboutsummaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorThomas White <taw@bitwiz.org.uk>2010-02-20 17:09:54 +0100
committerThomas White <taw@bitwiz.org.uk>2010-02-20 17:12:11 +0100
commitfc78b8c7c8c8b8c240a2861142627cc3877c26e7 (patch)
tree35bcfa84dec72833f036cc84e8994250024b2b91 /data
parent7f843558638a5ae289d23b9f9c053a431db6ed48 (diff)
Fix get_q, which was distorting reciprocal space previously
Diffstat (limited to 'data')
-rw-r--r--data/diffraction.cl9
1 files changed, 4 insertions, 5 deletions
diff --git a/data/diffraction.cl b/data/diffraction.cl
index b0f7b6b6..bac0c5c7 100644
--- a/data/diffraction.cl
+++ b/data/diffraction.cl
@@ -48,7 +48,7 @@ float4 get_q(int x, int y, float cx, float cy, float res, float clen, float k,
float *ttp, float4 z, int sampling)
{
float rx, ry, r;
- float ttx, tty, tt;
+ float az, tt;
float4 q;
rx = ((float)x - sampling*cx)/(res*sampling);
@@ -56,13 +56,12 @@ float4 get_q(int x, int y, float cx, float cy, float res, float clen, float k,
r = sqrt(pow(rx, 2.0) + pow(ry, 2.0));
- ttx = atan2(rx, clen);
- tty = atan2(ry, clen);
tt = atan2(r, clen);
-
*ttp = tt;
- q = (float4)(k*sin(ttx), k*sin(tty), k-k*cos(tt), 0.0);
+ az = atan2(ry, rx);
+
+ q = (float4)(k*sin(tt)*cos(az), k*sin(tt)*sin(az), k-k*cos(tt), 0.0);
return quat_rot(q, z);
}