aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2024-04-16 09:55:35 +0200
committerThomas White <taw@physics.org>2024-04-16 09:55:35 +0200
commit62a2fdee1b7e69a1fe1ecb58e286866c41b6bb81 (patch)
treeaa4bc4e62e63cb9f945d0fd9b44d8a27954dba43
parentc7efe51eaf6ebc78b3406ca614e56dc08f824d78 (diff)
Tweak prediction refinement weightings
-rw-r--r--libcrystfel/src/crystfel-mille.c6
-rw-r--r--libcrystfel/src/predict-refine.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/libcrystfel/src/crystfel-mille.c b/libcrystfel/src/crystfel-mille.c
index 381ee60a..3d02e527 100644
--- a/libcrystfel/src/crystfel-mille.c
+++ b/libcrystfel/src/crystfel-mille.c
@@ -266,17 +266,17 @@ void write_mille(Mille *mille, int n, UnitCell *cell,
mille_add_measurement(mille,
nl, local_gradients_fs,
j, global_gradients_fs, labels,
- fs_dev(&rps[i], image->detgeom), 0.22);
+ fs_dev(&rps[i], image->detgeom), 0.3);
/* Add ss measurement */
mille_add_measurement(mille,
nl, local_gradients_ss,
j, global_gradients_ss, labels,
- ss_dev(&rps[i], image->detgeom), 0.22);
+ ss_dev(&rps[i], image->detgeom), 0.3);
/* Add excitation error "measurement" (local-only) */
mille_add_measurement(mille, nl, local_gradients_r,
- 0, NULL, NULL, r_dev(&rps[i]), 1.0);
+ 0, NULL, NULL, r_dev(&rps[i]), 0.2);
}
}
diff --git a/libcrystfel/src/predict-refine.c b/libcrystfel/src/predict-refine.c
index 5fb9b4cc..6da0d3d1 100644
--- a/libcrystfel/src/predict-refine.c
+++ b/libcrystfel/src/predict-refine.c
@@ -46,7 +46,7 @@
/** \file predict-refine.h */
/* Weighting of excitation error term (m^-1) compared to position term (pixels) */
-#define EXC_WEIGHT (0.5e-7)
+#define EXC_WEIGHT (1.0e-7)
double r_dev(struct reflpeak *rp)