diff options
| author | Thomas White <taw@physics.org> | 2013-05-28 16:06:23 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2013-05-28 16:06:23 +0200 |
| commit | 1761a2d0f969f84b61a3fed6ce82ef06e3d838f1 (patch) | |
| tree | 83b173544e5c3900367518f7d905a79dc22a769e | |
| parent | a1e45807914cb145a0dbc781dc5ebb6e295414db (diff) | |
Rename "refine" to "prof2d"
| -rw-r--r-- | libcrystfel/src/integration.c | 10 | ||||
| -rw-r--r-- | libcrystfel/src/integration.h | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/libcrystfel/src/integration.c b/libcrystfel/src/integration.c index 304c41ae..5decd69a 100644 --- a/libcrystfel/src/integration.c +++ b/libcrystfel/src/integration.c @@ -1208,7 +1208,7 @@ static void estimate_resolution(RefList *reflections, Crystal *cr, } -static void integrate_refine(Crystal *cr, struct image *image, int use_closer, +static void integrate_prof2d(Crystal *cr, struct image *image, int use_closer, double min_snr, double ir_inn, double ir_mid, double ir_out, int integrate_saturated) @@ -1461,8 +1461,8 @@ void integrate_all(struct image *image, IntegrationMethod meth, integrate_saturated); return; - case INTEGRATION_REFINE : - integrate_refine(image->crystals[i], image, use_closer, + case INTEGRATION_PROF2D : + integrate_prof2d(image->crystals[i], image, use_closer, min_snr, ir_inn, ir_mid, ir_out, integrate_saturated); return; @@ -1491,8 +1491,8 @@ IntegrationMethod integration_method(const char *str, int *err) if ( strcmp(methods[i], "rings") == 0) { meth = INTEGRATION_DEFAULTS_RINGS; - } else if ( strcmp(methods[i], "refine") == 0) { - meth = INTEGRATION_DEFAULTS_REFINE; + } else if ( strcmp(methods[i], "prof2d") == 0) { + meth = INTEGRATION_DEFAULTS_PROF2D; } else if ( strcmp(methods[i], "none") == 0) { return INTEGRATION_NONE; diff --git a/libcrystfel/src/integration.h b/libcrystfel/src/integration.h index 12e47ff5..36f1d5bd 100644 --- a/libcrystfel/src/integration.h +++ b/libcrystfel/src/integration.h @@ -34,7 +34,7 @@ #endif #define INTEGRATION_DEFAULTS_RINGS (INTEGRATION_RINGS | INTEGRATION_SATURATED) -#define INTEGRATION_DEFAULTS_REFINE (INTEGRATION_REFINE | INTEGRATION_SATURATED) +#define INTEGRATION_DEFAULTS_PROF2D (INTEGRATION_PROF2D | INTEGRATION_SATURATED) /** * IntegrationMethod: @@ -52,7 +52,7 @@ typedef enum { /* The core integration methods themselves */ INTEGRATION_RINGS = 1, - INTEGRATION_REFINE = 2, + INTEGRATION_PROF2D = 2, /* Bits at the top of the IntegrationMethod are flags which modify the * behaviour of the integration. */ |