aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2013-05-15 16:14:01 +0200
committerThomas White <taw@physics.org>2013-05-15 16:14:01 +0200
commitc00c5f39ebbed88631bebf340011c660193ec2e2 (patch)
treec3022439acd3bfc981f2463ecae57fcefc8013fa
parent54f704a4458eab9c9266fcdcb0d7d4db5ec69048 (diff)
Disable weighting (for now) and update ChangeLog
-rw-r--r--ChangeLog3
-rw-r--r--src/process_hkl.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index dcde9aad..4657aa60 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,11 +5,14 @@ Changes in this development version
- The "Lorentz factor" was added to partial_sim (and partialator).
- CCano was added as a figure of merit to compare_hkl.
- XDS indexing was improved.
+- The calculation of sigma(I) in process_hkl was made more numerically stable.
+- The polarisation correction in process_hkl was fixed.
- A compilation failure (when FFTW3 was unavailable) was fixed.
- docs/stream-format.txt was added.
- scripts/create-xscale was fixed.
- Warnings were added to scripts which MUST be modified before use.
+- polarisation_correction() was added to the API.
CrystFEL version 0.5.0, 19th April 2013
diff --git a/src/process_hkl.c b/src/process_hkl.c
index c2589115..fda02137 100644
--- a/src/process_hkl.c
+++ b/src/process_hkl.c
@@ -220,7 +220,7 @@ static int merge_crystal(RefList *model, struct image *image, Crystal *cr,
refl_intensity = scale * get_intensity(refl);
refl_sigma = scale * get_esd_intensity(refl);
- w = pow(refl_sigma, -2.0);
+ w = 1.0;//pow(refl_sigma, -2.0);
mean = get_intensity(model_version);
sumweight = get_temp1(model_version);