aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2019-08-30 16:15:25 +0200
committerThomas White <taw@physics.org>2019-09-02 13:14:32 +0200
commit79a84416f85a478206867dd8eee7ef157928057f (patch)
tree681815ec270b366fd8a04c6bdf12b978840dcab3
parent1df82f92bb366bac6bb2e7e6e04506b2d22dab0e (diff)
Don't need separate wavelength for polarisation correction
Can use kpred
-rw-r--r--libcrystfel/src/geometry.c2
-rw-r--r--libcrystfel/src/geometry.h2
-rw-r--r--src/partialator.c2
-rw-r--r--src/process_hkl.c3
4 files changed, 4 insertions, 5 deletions
diff --git a/libcrystfel/src/geometry.c b/libcrystfel/src/geometry.c
index b99fdd04..13fcbe3b 100644
--- a/libcrystfel/src/geometry.c
+++ b/libcrystfel/src/geometry.c
@@ -1018,7 +1018,7 @@ err:
}
-void polarisation_correction(RefList *list, UnitCell *cell, double lambda,
+void polarisation_correction(RefList *list, UnitCell *cell,
struct polarisation p)
{
Reflection *refl;
diff --git a/libcrystfel/src/geometry.h b/libcrystfel/src/geometry.h
index 4bd1624f..db3c0fe8 100644
--- a/libcrystfel/src/geometry.h
+++ b/libcrystfel/src/geometry.h
@@ -110,7 +110,7 @@ extern double r_gradient(UnitCell *cell, int k, Reflection *refl,
struct image *image);
extern void update_predictions(Crystal *cryst);
extern struct polarisation parse_polarisation(const char *text);
-extern void polarisation_correction(RefList *list, UnitCell *cell, double lambda,
+extern void polarisation_correction(RefList *list, UnitCell *cell,
struct polarisation p);
extern double sphere_fraction(double rlow, double rhigh, double pr);
diff --git a/src/partialator.c b/src/partialator.c
index ef6d0f80..ee577595 100644
--- a/src/partialator.c
+++ b/src/partialator.c
@@ -1436,7 +1436,7 @@ int main(int argc, char *argv[])
cr_refl = apply_max_adu(cr_refl, max_adu);
polarisation_correction(cr_refl, crystal_get_cell(cr),
- image->lambda, polarisation);
+ polarisation);
if ( !no_free ) select_free_reflections(cr_refl, rng);
diff --git a/src/process_hkl.c b/src/process_hkl.c
index 5e17f31c..4ace75f4 100644
--- a/src/process_hkl.c
+++ b/src/process_hkl.c
@@ -271,8 +271,7 @@ static int merge_crystal(RefList *model, struct image *image, Crystal *cr,
new_refl = crystal_get_reflections(cr);
/* First, correct for polarisation */
- polarisation_correction(new_refl, crystal_get_cell(cr),
- image->lambda, p);
+ polarisation_correction(new_refl, crystal_get_cell(cr), p);
if ( reference != NULL ) {
if ( do_scale ) {