diff options
| author | Thomas White <taw@physics.org> | 2010-11-22 12:02:34 +0100 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2012-02-22 15:27:06 +0100 |
| commit | c84b3275243f19e6496da6b39766c8b7a8ac435e (patch) | |
| tree | 4bde59bb51fb4cd4ccdcb1b9a44fb8aa0bcfb575 | |
| parent | ab2bc310e5b4285b1e7482662b679d39c45ea86d (diff) | |
Refine profile radius as well
| -rw-r--r-- | src/post-refinement.c | 32 | ||||
| -rw-r--r-- | src/post-refinement.h | 1 |
2 files changed, 33 insertions, 0 deletions
diff --git a/src/post-refinement.c b/src/post-refinement.c index c4ca03cc..4b3f9243 100644 --- a/src/post-refinement.c +++ b/src/post-refinement.c @@ -46,6 +46,24 @@ static double partiality_gradient(double r, double profile_radius) } +/* Returns dp/drad at "r" */ +static double partiality_rgradient(double r, double profile_radius) +{ + double q, dpdq, dqdrad; + + /* Calculate degree of penetration */ + q = (r + profile_radius)/(2.0*profile_radius); + + /* dp/dq */ + dpdq = 6.0*(q-pow(q, 2.0)); + + /* dq/drad */ + dqdrad = 0.5 * (1.0 - r * pow(profile_radius, -2.0)); + + return dpdq * dqdrad; +} + + /* Return the gradient of parameter 'k' given the current status of 'image'. */ double gradient(struct image *image, int k, struct cpeak spot, double I_partial, double r) @@ -79,6 +97,15 @@ double gradient(struct image *image, int k, } return g; + case REF_R : + if ( spot.clamp1 == 0 ) { + g += partiality_rgradient(spot.r1, r); + } + if ( spot.clamp2 == 0 ) { + g += partiality_rgradient(spot.r2, r); + } + return g; + } ERROR("No gradient defined for parameter %i\n", k); @@ -100,6 +127,11 @@ void apply_shift(struct image *image, int k, double shift) image->div += shift; break; + case REF_R : + STATUS("Shifting r by %e\n", shift); + image->profile_radius += shift; + break; + default : ERROR("No shift defined for parameter %i\n", k); abort(); diff --git a/src/post-refinement.h b/src/post-refinement.h index 8dea914d..660530e9 100644 --- a/src/post-refinement.h +++ b/src/post-refinement.h @@ -27,6 +27,7 @@ enum { REF_SCALE, REF_DIV, + REF_R, NUM_PARAMS }; |