diff options
| author | Thomas White <taw@physics.org> | 2016-11-10 17:02:14 +0100 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2018-02-27 17:12:41 +0100 |
| commit | ea1178d014eadb9fe8e24935693a5380b709ef33 (patch) | |
| tree | 39ae4995a2da892917d7796e0f36e5568da1cea0 /libcrystfel/src/predict-refine.c | |
| parent | 77cf2edd09bb01ae331935f467064c751f6e338e (diff) | |
New partiality model from Ginn et al.
Diffstat (limited to 'libcrystfel/src/predict-refine.c')
| -rw-r--r-- | libcrystfel/src/predict-refine.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libcrystfel/src/predict-refine.c b/libcrystfel/src/predict-refine.c index 3246dbec..14a60bc7 100644 --- a/libcrystfel/src/predict-refine.c +++ b/libcrystfel/src/predict-refine.c @@ -91,9 +91,7 @@ static void twod_mapping(double fs, double ss, double *px, double *py, static double r_dev(struct reflpeak *rp) { /* Excitation error term */ - double rlow, rhigh, p; - get_partial(rp->refl, &rlow, &rhigh, &p); - return (rlow+rhigh)/2.0; + return get_exerr(rp->refl); } @@ -425,7 +423,7 @@ static int iterate(struct reflpeak *rps, int n, UnitCell *cell, /* Positional x terms */ for ( k=0; k<num_params; k++ ) { gradients[k] = x_gradient(rv[k], rps[i].refl, cell, - rps[i].panel, image->lambda); + rps[i].panel); } for ( k=0; k<num_params; k++ ) { @@ -457,7 +455,7 @@ static int iterate(struct reflpeak *rps, int n, UnitCell *cell, /* Positional y terms */ for ( k=0; k<num_params; k++ ) { gradients[k] = y_gradient(rv[k], rps[i].refl, cell, - rps[i].panel, image->lambda); + rps[i].panel); } for ( k=0; k<num_params; k++ ) { |