aboutsummaryrefslogtreecommitdiff
path: root/libcrystfel
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2014-04-09 15:39:24 +0200
committerThomas White <taw@physics.org>2014-04-09 15:39:24 +0200
commitce84f85af58dc8f103edd9453b287dfe06c93b7c (patch)
tree71e2379a34b9d5c4a6231acca9469105d5214a0c /libcrystfel
parent11f6cfac04d54acf71f7c7a18fc05fc346ac888e (diff)
Avoid breaking API with integrate_all()
Diffstat (limited to 'libcrystfel')
-rw-r--r--libcrystfel/src/integration.c19
-rw-r--r--libcrystfel/src/integration.h7
2 files changed, 21 insertions, 5 deletions
diff --git a/libcrystfel/src/integration.c b/libcrystfel/src/integration.c
index bf8cfadd..46e1451d 100644
--- a/libcrystfel/src/integration.c
+++ b/libcrystfel/src/integration.c
@@ -1799,10 +1799,11 @@ static void apply_resolution_cutoff(Crystal *cr, double res)
}
-void integrate_all(struct image *image, IntegrationMethod meth, double push_res,
- double ir_inn, double ir_mid, double ir_out,
- IntDiag int_diag,
- signed int idh, signed int idk, signed int idl)
+void integrate_all_2(struct image *image, IntegrationMethod meth,
+ double push_res,
+ double ir_inn, double ir_mid, double ir_out,
+ IntDiag int_diag,
+ signed int idh, signed int idk, signed int idl)
{
int i;
@@ -1847,6 +1848,16 @@ void integrate_all(struct image *image, IntegrationMethod meth, double push_res,
}
+void integrate_all(struct image *image, IntegrationMethod meth,
+ double ir_inn, double ir_mid, double ir_out,
+ IntDiag int_diag,
+ signed int idh, signed int idk, signed int idl)
+{
+ integrate_all_2(image, meth, 0.0, ir_inn, ir_mid, ir_out,
+ int_diag, idh, idk, idl);
+}
+
+
IntegrationMethod integration_method(const char *str, int *err)
{
int n, i;
diff --git a/libcrystfel/src/integration.h b/libcrystfel/src/integration.h
index 3fd4e4ac..2c5773c6 100644
--- a/libcrystfel/src/integration.h
+++ b/libcrystfel/src/integration.h
@@ -83,10 +83,15 @@ typedef enum {
extern IntegrationMethod integration_method(const char *t, int *err);
extern void integrate_all(struct image *image, IntegrationMethod meth,
- double push_res,
double ir_inn, double ir_mid, double ir_out,
IntDiag int_diag,
signed int idh, signed int idk, signed int idl);
+extern void integrate_all_2(struct image *image, IntegrationMethod meth,
+ double push_res,
+ double ir_inn, double ir_mid, double ir_out,
+ IntDiag int_diag,
+ signed int idh, signed int idk, signed int idl);
+
#endif /* INTEGRATION_H */