aboutsummaryrefslogtreecommitdiff
path: root/libcrystfel/src/crystfel-mille.c
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2023-09-18 16:43:58 +0200
committerThomas White <taw@physics.org>2023-09-18 16:43:58 +0200
commit1ae9a458265df2bae2a4d05089e83390ae30084a (patch)
treebf68604d451365e6b85766bd9dc2758dac306fd2 /libcrystfel/src/crystfel-mille.c
parent042f9ca307bda09e35769f9eaa87da44877e34e5 (diff)
Build EXC_WEIGHT into r_dev
This avoids weird weighting factors everywhere and much confusion. Since Millepede doesn't have an easy way of weighting measurements (only via altering the ESD values), treating it as a units conversion seems to be easier.
Diffstat (limited to 'libcrystfel/src/crystfel-mille.c')
-rw-r--r--libcrystfel/src/crystfel-mille.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libcrystfel/src/crystfel-mille.c b/libcrystfel/src/crystfel-mille.c
index 6a80e323..1f19d3dc 100644
--- a/libcrystfel/src/crystfel-mille.c
+++ b/libcrystfel/src/crystfel-mille.c
@@ -200,8 +200,8 @@ void write_mille(Mille *mille, int n, UnitCell *cell,
Minvs[rps[i].peak->pn], 0, 0, 0,
&local_gradients_fs[j],
&local_gradients_ss[j]);
- local_gradients_r[j] = EXC_WEIGHT * r_gradient(rvl[j], rps[i].refl,
- cell, image->lambda);
+ local_gradients_r[j] = r_gradient(rvl[j], rps[i].refl,
+ cell, image->lambda);
}
/* Global gradients for each hierarchy level, starting at the
@@ -249,7 +249,7 @@ void write_mille(Mille *mille, int n, UnitCell *cell,
/* Add excitation error "measurement" (local-only) */
mille_add_measurement(mille, nl, local_gradients_r,
- 0, NULL, NULL, r_dev(&rps[i])*EXC_WEIGHT, 1.0);
+ 0, NULL, NULL, r_dev(&rps[i]), 1.0);
}
}