DirAx stuff

git-svn-id: svn://cook.msm.cam.ac.uk:745/diff-tomo/dtr@139 bf6ca9ba-c028-0410-8290-897cf20841d1

1 files changed, 10 insertions, 10 deletions

diff --git a/src/reflections.c b/src/reflections.c
index 56871f0..dc3ce2f 100644
--- a/src/reflections.c
+++ b/src/reflections.c
@@ -39,7 +39,7 @@ ReflectionList *reflectionlist_new() {
 
 }
 
-void reflection_clear_markers(ReflectionList *reflectionlist) {
+void reflectionlist_clear_markers(ReflectionList *reflectionlist) {
 
 	Reflection *reflection = reflectionlist->reflections;
 	Reflection *prev = NULL;
@@ -70,7 +70,7 @@ void reflection_clear_markers(ReflectionList *reflectionlist) {
 	reflectionlist->last_reflection = prev;
 	
 }
-void reflection_clear(ReflectionList *reflectionlist) {
+void reflectionlist_clear(ReflectionList *reflectionlist) {
 
 	Reflection *reflection = reflectionlist->reflections;
 	do {
@@ -83,8 +83,8 @@ void reflection_clear(ReflectionList *reflectionlist) {
 
 }
 
-void reflection_free(ReflectionList *reflectionlist) {
-	reflection_clear(reflectionlist);
+void reflectionlist_free(ReflectionList *reflectionlist) {
+	reflectionlist_clear(reflectionlist);
 	free(reflectionlist);
 }
 
@@ -101,7 +101,7 @@ Reflection *reflection_add(ReflectionList *reflectionlist, double x, double y, d
 		reflectionlist->list_capped = 1;
 	}
 	
-	nearest = reflection_find_nearest_type(reflectionlist, x, y, z, type);
+	nearest = reflectionlist_find_nearest_type(reflectionlist, x, y, z, type);
 	if ( nearest && distance3d(x, y, z, nearest->x, nearest->y, nearest->z) < 0.1e9 ) return NULL;
 	
 	new_reflection = malloc(sizeof(Reflection));
@@ -226,7 +226,7 @@ void reflection_add_from_reflection(ReflectionList *reflectionlist, Reflection *
 	reflectionlist->n_reflections++;
 }
 
-double reflection_largest_g(ReflectionList *reflectionlist) {
+double reflectionlist_largest_g(ReflectionList *reflectionlist) {
 
 	double max = 0.0;
 	Reflection *reflection;
@@ -245,7 +245,7 @@ double reflection_largest_g(ReflectionList *reflectionlist) {
 
 }
 
-Reflection *reflection_find_nearest(ReflectionList *reflectionlist, double x, double y, double z) {
+Reflection *reflectionlist_find_nearest(ReflectionList *reflectionlist, double x, double y, double z) {
 
 	double max = +INFINITY;
 	Reflection *reflection;
@@ -268,7 +268,7 @@ Reflection *reflection_find_nearest(ReflectionList *reflectionlist, double x, do
 
 }
 
-Reflection *reflection_find_nearest_longer_unknown(ReflectionList *reflectionlist, double x, double y, double z, double min_distance) {
+Reflection *reflectionlist_find_nearest_longer_unknown(ReflectionList *reflectionlist, double x, double y, double z, double min_distance) {
 
 	double max = +INFINITY;
 	Reflection *reflection;
@@ -291,7 +291,7 @@ Reflection *reflection_find_nearest_longer_unknown(ReflectionList *reflectionlis
 
 }
 
-Reflection *reflection_find_nearest_type(ReflectionList *reflectionlist, double x, double y, double z, ReflectionType type) {
+Reflection *reflectionlist_find_nearest_type(ReflectionList *reflectionlist, double x, double y, double z, ReflectionType type) {
 
 	double max = +INFINITY;
 	Reflection *reflection;
@@ -316,7 +316,7 @@ Reflection *reflection_find_nearest_type(ReflectionList *reflectionlist, double
 }
 
 /* This destroys the lfom values in the input list */
-ReflectionList *reflection_sort_lfom(ReflectionList *in) {
+ReflectionList *reflectionlist_sort_lfom(ReflectionList *in) {
 
 	ReflectionList *out;
 	Reflection *best;