aboutsummaryrefslogtreecommitdiff
path: root/libcrystfel/src
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2012-04-19 12:10:13 +0200
committerThomas White <taw@physics.org>2012-04-19 12:10:13 +0200
commit605ed411cc56da3bbf6d33a441c3d16adcfeb3a1 (patch)
treeb1669fb886b8548756db1ae0c750602a17946837 /libcrystfel/src
parentcac83d4925f3543b4dfc4ce881824fea225cef7e (diff)
Simplify prediction criterion
Diffstat (limited to 'libcrystfel/src')
-rw-r--r--libcrystfel/src/geometry.c23
1 files changed, 6 insertions, 17 deletions
diff --git a/libcrystfel/src/geometry.c b/libcrystfel/src/geometry.c
index 6b01c51c..e416a883 100644
--- a/libcrystfel/src/geometry.c
+++ b/libcrystfel/src/geometry.c
@@ -125,15 +125,15 @@ static Reflection *check_reflection(struct image *image,
double rlow, rhigh; /* "Excitation error" */
signed int p; /* Panel number */
double xda, yda; /* Position on detector */
- int close, inside;
double part; /* Partiality */
int clamp_low, clamp_high;
double klow, khigh; /* Wavenumber */
Reflection *refl;
double cet, cez;
- /* "low" gives the largest Ewald sphere,
- * "high" gives the smallest Ewald sphere. */
+ /* "low" gives the largest Ewald sphere (wavelength short => k large)
+ * "high" gives the smallest Ewald sphere (wavelength long => k small)
+ */
klow = 1.0/(image->lambda - image->lambda*image->bw/2.0);
khigh = 1.0/(image->lambda + image->lambda*image->bw/2.0);
@@ -156,20 +156,9 @@ static Reflection *check_reflection(struct image *image,
return NULL;
}
- /* Is the reciprocal lattice point close to either extreme of
- * the sphere, maybe just outside the "Ewald volume"? */
- close = (fabs(rlow) < image->profile_radius)
- || (fabs(rhigh) < image->profile_radius);
-
- /* Is the reciprocal lattice point somewhere between the
- * extremes of the sphere, i.e. inside the "Ewald volume"? */
- inside = signbit(rlow) ^ signbit(rhigh);
-
- /* Can't be both inside and close */
- if ( inside ) close = 0;
-
- /* Neither? Skip it. */
- if ( !(close || inside) ) return NULL;
+ if ( (signbit(rlow) == signbit(rhigh))
+ && (fabs(rlow) > image->profile_radius)
+ && (fabs(rhigh) > image->profile_radius) ) return NULL;
/* If the "lower" Ewald sphere is a long way away, use the
* position at which the Ewald sphere would just touch the