diff options
| -rw-r--r-- | libcrystfel/src/geometry.c | 1 | ||||
| -rw-r--r-- | src/post-refinement.c | 32 |
2 files changed, 20 insertions, 13 deletions
diff --git a/libcrystfel/src/geometry.c b/libcrystfel/src/geometry.c index f46cea25..24669aef 100644 --- a/libcrystfel/src/geometry.c +++ b/libcrystfel/src/geometry.c @@ -137,7 +137,6 @@ static Reflection *check_reflection(struct image *image, klow = 1.0/(image->lambda - image->lambda*image->bw/2.0); khigh = 1.0/(image->lambda + image->lambda*image->bw/2.0); - /* If the point is looking "backscattery", reject it straight away */ if ( zl < -khigh/2.0 ) return NULL; diff --git a/src/post-refinement.c b/src/post-refinement.c index 2ff408eb..cf7b2576 100644 --- a/src/post-refinement.c +++ b/src/post-refinement.c @@ -147,7 +147,7 @@ double gradient(struct image *image, int k, Reflection *refl, double r) * of excitation error wrt whatever. */ switch ( k ) { - case REF_DIV : + case REF_DIV : gr = 0.0; if ( clamp_low == 0 ) { nom = sqrt(2.0) * ds * sin(image->div/2.0); @@ -162,7 +162,7 @@ double gradient(struct image *image, int k, Reflection *refl, double r) if ( isnan(gr) ) gr = 0.0; /* FIXME: This isn't true (?) */ return gr / 4.0; /* FIXME: Shameless fudge factor */ - case REF_R : + case REF_R : g = 0.0; if ( clamp_low == 0 ) { g += partiality_rgradient(r1, r); @@ -172,24 +172,32 @@ double gradient(struct image *image, int k, Reflection *refl, double r) } return g; - /* Cell parameters and orientation */ - case REF_ASX : + /* Cell parameters and orientation */ + case REF_ASX : return hs * sin(tt) * cos(azix) * g; - case REF_BSX : + + case REF_BSX : return ks * sin(tt) * cos(azix) * g; - case REF_CSX : + + case REF_CSX : return ls * sin(tt) * cos(azix) * g; - case REF_ASY : + + case REF_ASY : return hs * sin(tt) * cos(aziy) * g; - case REF_BSY : + + case REF_BSY : return ks * sin(tt) * cos(aziy) * g; - case REF_CSY : + + case REF_CSY : return ls * sin(tt) * cos(aziy) * g; - case REF_ASZ : + + case REF_ASZ : return hs * cos(tt) * g; - case REF_BSZ : + + case REF_BSZ : return ks * cos(tt) * g; - case REF_CSZ : + + case REF_CSZ : return ls * cos(tt) * g; } |