1 files changed, 3 insertions, 36 deletions
diff --git a/src/control.h b/src/control.h
index 6d318e9..a311b09 100644
--- a/src/control.h
+++ b/src/control.h
@@ -37,39 +37,11 @@ typedef enum {
 	PEAKSEARCH_NONE,
 	PEAKSEARCH_THRESHOLD,
 	PEAKSEARCH_ADAPTIVE_THRESHOLD,
-	PEAKSEARCH_LSQ,
 	PEAKSEARCH_ZAEFFERER,
 	PEAKSEARCH_STAT,
 	PEAKSEARCH_CACHED
 } PeakSearchMode;
 
-typedef struct imagerecord_struct {
-
-	uint16_t	*image;
-	double		tilt;		/* Degrees.  Defines where the pattern lies in reciprocal space */
-	double		omega;		/* Degrees.  Defines where the pattern lies in reciprocal space */
-	double		slop;		/* Degrees.  Defines where the pattern lies "on the negative" */
-	
-	FormulationMode fmode;
-	double		pixel_size;
-	double		camera_len;
-	double		lambda;
-	double		resolution;
-	
-	int		width;
-	int		height;
-	int		x_centre;
-	int		y_centre;
-
-} ImageRecord;
-
-typedef struct {
-	ImageRecord	*parent;
-	int		x;
-	int		y;
-	double		intensity;
-} ImageReflection;
-
 typedef struct cctx_struct {
 	
 	/* Modes */
@@ -101,11 +73,10 @@ typedef struct cctx_struct {
 	unsigned int			lambda_set;
 	
 	/* The input images */
-	int				n_images;
-	ImageRecord			*images;
+	struct imagelist_struct		*images;
 	
-	/* Output */
-	struct reflectionlist_struct	*reflectionlist;
+	/* "Output" */
+	struct reflectionlist_struct	*reflectionlist;	/* Measured reflections (and stuff added to get displayed) */
 	struct dw_struct		*dw;
 	struct basis_struct		*cell;			/* Current estimate of the reciprocal unit cell */
 	struct reflectionlist_struct	*cell_lattice;		/* Reflections calculated from 'cell' */
@@ -141,11 +112,7 @@ typedef struct cctx_struct {
 	
 } ControlContext;
 
-extern int control_add_image(ControlContext *ctx, uint16_t *image, int width, int height, double tilt);
 extern ControlContext *control_ctx_new(void);
-extern double control_min_tilt(ControlContext *ctx);
-extern double control_max_tilt(ControlContext *ctx);
-extern ImageRecord *control_image_nearest_tilt(ControlContext *ctx, double tilt);
 
 #endif	/* CONTROL_H */