diff options
| author | Thomas White <taw@physics.org> | 2010-01-14 10:30:30 +0100 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2010-01-14 10:30:30 +0100 |
| commit | a8efbaa98b4ece01c7fc5de0d1ba1f20fa985a9d (patch) | |
| tree | 4674265e0b9633f9e7121e0599097518a505623d /src/diffraction.c | |
| parent | 1f5167c7b129f029758a92cecd6b037f14dada36 (diff) | |
s/threevec/rvec/
Diffstat (limited to 'src/diffraction.c')
| -rw-r--r-- | src/diffraction.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/diffraction.c b/src/diffraction.c index 94b10d38..be5fb014 100644 --- a/src/diffraction.c +++ b/src/diffraction.c @@ -24,12 +24,12 @@ #include "sfac.h" -static double lattice_factor(struct threevec q, double ax, double ay, double az, +static double lattice_factor(struct rvec q, double ax, double ay, double az, double bx, double by, double bz, double cx, double cy, double cz, int na, int nb, int nc) { - struct threevec Udotq; + struct rvec Udotq; double f1, f2, f3; Udotq.u = ax*q.u + ay*q.v + az*q.w; @@ -65,7 +65,7 @@ static double lattice_factor(struct threevec q, double ax, double ay, double az, /* Look up the structure factor for the nearest Bragg condition */ -static double complex molecule_factor(struct molecule *mol, struct threevec q, +static double complex molecule_factor(struct molecule *mol, struct rvec q, double ax, double ay, double az, double bx, double by, double bz, double cx, double cy, double cz) @@ -87,7 +87,7 @@ static double complex molecule_factor(struct molecule *mol, struct threevec q, } -double water_intensity(struct threevec q, double en, +double water_intensity(struct rvec q, double en, double beam_r, double water_r) { double complex fH, fO; @@ -170,7 +170,7 @@ void get_diffraction(struct image *image, int na, int nb, int nc) double f_lattice; double complex f_molecule; - struct threevec q; + struct rvec q; double complex val; q = image->qvecs[x + image->width*y]; |