From 3710defb709b7ab33ae7849873c4fb62de96e138 Mon Sep 17 00:00:00 2001
From: Thomas White <taw@physics.org>
Date: Tue, 6 Mar 2012 14:46:13 +0100
Subject: Rename old array functions to get them out of the way of API
 consistency

---
 libcrystfel/src/peaks.c         | 2 +-
 libcrystfel/src/reflist-utils.c | 4 ++--
 libcrystfel/src/reflist.c       | 8 ++++----
 libcrystfel/src/reflist.h       | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'libcrystfel')

diff --git a/libcrystfel/src/peaks.c b/libcrystfel/src/peaks.c
index 55abff27..3c383855 100644
--- a/libcrystfel/src/peaks.c
+++ b/libcrystfel/src/peaks.c
@@ -672,7 +672,7 @@ void integrate_reflections(struct image *image, int polar, int use_closer,
 
 		/* Record intensity and set redundancy to 1 on success */
 		if ( r == 0 ) {
-			set_int(refl, intensity);
+			set_intensity(refl, intensity);
 			set_esd_intensity(refl, sigma);
 			set_redundancy(refl, 1);
 		} else {
diff --git a/libcrystfel/src/reflist-utils.c b/libcrystfel/src/reflist-utils.c
index 8ad33f3f..8f445ff4 100644
--- a/libcrystfel/src/reflist-utils.c
+++ b/libcrystfel/src/reflist-utils.c
@@ -299,13 +299,13 @@ RefList *read_reflections_from_file(FILE *fh)
 			char *v;
 
 			refl = add_refl(out, h, k, l);
-			set_int(refl, intensity);
+			set_intensity(refl, intensity);
 			set_detector_pos(refl, 0.0, fs, ss);
 			set_esd_intensity(refl, sigma);
 			set_redundancy(refl, cts);
 
 			ph = strtod(phs, &v);
-			if ( v != NULL ) set_ph(refl, deg2rad(ph));
+			if ( v != NULL ) set_phase(refl, deg2rad(ph));
 
 			/* The 1/d value is actually ignored. */
 
diff --git a/libcrystfel/src/reflist.c b/libcrystfel/src/reflist.c
index 4bfa113c..69335781 100644
--- a/libcrystfel/src/reflist.c
+++ b/libcrystfel/src/reflist.c
@@ -596,14 +596,14 @@ void set_partial(Reflection *refl, double r1, double r2, double p,
 
 
 /**
- * set_int:
+ * set_intensity:
  * @refl: A %Reflection
  * @intensity: The intensity for the reflection.
  *
  * Set the intensity for the reflection.  Note that retrieval is done with
  * get_intensity().
  **/
-void set_int(Reflection *refl, double intensity)
+void set_intensity(Reflection *refl, double intensity)
 {
 	refl->data.intensity = intensity;
 }
@@ -665,12 +665,12 @@ void set_esd_intensity(Reflection *refl, double esd)
 
 
 /**
- * set_ph:
+ * set_phase:
  * @refl: A %Reflection
  * @phase: New phase for the reflection
  *
  **/
-void set_ph(Reflection *refl, double phase)
+void set_phase(Reflection *refl, double phase)
 {
 	refl->data.phase = phase;
 	refl->data.have_phase = 1;
diff --git a/libcrystfel/src/reflist.h b/libcrystfel/src/reflist.h
index fe1ca2af..401201e5 100644
--- a/libcrystfel/src/reflist.h
+++ b/libcrystfel/src/reflist.h
@@ -96,14 +96,14 @@ extern void set_detector_pos(Reflection *refl, double exerr,
                              double fs, double ss);
 extern void set_partial(Reflection *refl, double r1, double r2, double p,
                         double clamp_low, double clamp_high);
-extern void set_int(Reflection *refl, double intensity);
+extern void set_intensity(Reflection *refl, double intensity);
 extern void set_scalable(Reflection *refl, int scalable);
 extern void set_refinable(Reflection *refl, int refinable);
 extern void set_redundancy(Reflection *refl, int red);
 extern void set_temp1(Reflection *refl, double temp);
 extern void set_temp2(Reflection *refl, double temp);
 extern void set_esd_intensity(Reflection *refl, double esd);
-extern void set_ph(Reflection *refl, double phase);
+extern void set_phase(Reflection *refl, double phase);
 extern void set_symmetric_indices(Reflection *refl,
                                   signed int hs, signed int ks, signed int ls);
 
-- 
cgit v1.2.3