From f56ce1b9c6d6b5c9b365354585d32c5ead4869d6 Mon Sep 17 00:00:00 2001
From: Thomas White <taw@physics.org>
Date: Wed, 23 Mar 2011 15:23:36 +0100
Subject: More s/x/fs/, s/y/ss/

---
 src/detector.c | 10 +++++-----
 src/detector.h |  2 +-
 src/image.h    |  4 ++--
 src/reflist.c  | 16 ++++++++--------
 src/reflist.h  |  4 ++--
 5 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/detector.c b/src/detector.c
index 156cd188..522c4aa5 100644
--- a/src/detector.c
+++ b/src/detector.c
@@ -265,15 +265,15 @@ void record_image(struct image *image, int do_poisson)
 }
 
 
-struct panel *find_panel(struct detector *det, int x, int y)
+struct panel *find_panel(struct detector *det, int fs, int ss)
 {
 	int p;
 
 	for ( p=0; p<det->n_panels; p++ ) {
-		if ( (x >= det->panels[p].min_fs)
-		  && (x <= det->panels[p].max_fs)
-		  && (y >= det->panels[p].min_ss)
-		  && (y <= det->panels[p].max_ss) ) {
+		if ( (fs >= det->panels[p].min_fs)
+		  && (fs <= det->panels[p].max_fs)
+		  && (ss >= det->panels[p].min_ss)
+		  && (ss <= det->panels[p].max_ss) ) {
 			return &det->panels[p];
 		}
 	}
diff --git a/src/detector.h b/src/detector.h
index 6570ef50..03e0b2ad 100644
--- a/src/detector.h
+++ b/src/detector.h
@@ -84,7 +84,7 @@ extern int in_bad_region(struct detector *det, double fs, double ss);
 
 extern void record_image(struct image *image, int do_poisson);
 
-extern struct panel *find_panel(struct detector *det, int x, int y);
+extern struct panel *find_panel(struct detector *det, int fs, int ss);
 
 extern struct detector *get_detector_geometry(const char *filename);
 
diff --git a/src/image.h b/src/image.h
index b61bb396..964ed124 100644
--- a/src/image.h
+++ b/src/image.h
@@ -115,8 +115,8 @@ extern void image_add_feature(ImageFeatureList *flist, double x, double y,
 extern void image_remove_feature(ImageFeatureList *flist, int idx);
 
 extern struct imagefeature *image_feature_closest(ImageFeatureList *flist,
-                                                  double x, double y, double *d,
-                                                  int *idx);
+                                                  double fs, double ss,
+                                                  double *d, int *idx);
 
 extern int image_feature_count(ImageFeatureList *flist);
 extern struct imagefeature *image_get_feature(ImageFeatureList *flist, int idx);
diff --git a/src/reflist.c b/src/reflist.c
index 30d9f696..05caa96d 100644
--- a/src/reflist.c
+++ b/src/reflist.c
@@ -32,8 +32,8 @@ struct _refldata {
 	int clamp2; /* Clamp status for r2 */
 
 	/* Location in image */
-	double x;
-	double y;
+	double fs;
+	double ss;
 
 	/* The distance from the exact Bragg position to the coordinates
 	 * given above. */
@@ -191,10 +191,10 @@ double get_excitation_error(const Reflection *refl)
 }
 
 
-void get_detector_pos(const Reflection *refl, double *x, double *y)
+void get_detector_pos(const Reflection *refl, double *fs, double *ss)
 {
-	*x = refl->data.x;
-	*y = refl->data.y;
+	*fs = refl->data.fs;
+	*ss = refl->data.ss;
 }
 
 
@@ -268,11 +268,11 @@ void copy_data(Reflection *to, const Reflection *from)
 }
 
 
-void set_detector_pos(Reflection *refl, double exerr, double x, double y)
+void set_detector_pos(Reflection *refl, double exerr, double fs, double ss)
 {
 	refl->data.excitation_error = exerr;
-	refl->data.x = x;
-	refl->data.y = y;
+	refl->data.fs = fs;
+	refl->data.ss = ss;
 }
 
 
diff --git a/src/reflist.h b/src/reflist.h
index 462a19af..0f8741cf 100644
--- a/src/reflist.h
+++ b/src/reflist.h
@@ -33,7 +33,7 @@ extern Reflection *next_found_refl(Reflection *refl);
 
 /* Get */
 extern double get_excitation_error(const Reflection *refl);
-extern void get_detector_pos(const Reflection *refl, double *x, double *y);
+extern void get_detector_pos(const Reflection *refl, double *fs, double *ss);
 extern void get_indices(const Reflection *refl,
                         signed int *h, signed int *k, signed int *l);
 extern double get_partiality(const Reflection *refl);
@@ -49,7 +49,7 @@ extern double get_phase(const Reflection *refl);
 /* Set */
 extern void copy_data(Reflection *to, const Reflection *from);
 extern void set_detector_pos(Reflection *refl, double exerr,
-                             double x, double y);
+                             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);
-- 
cgit v1.2.3