diff options
author | taw27 <taw27@bf6ca9ba-c028-0410-8290-897cf20841d1> | 2007-10-19 16:25:08 +0000 |
---|---|---|
committer | taw27 <taw27@bf6ca9ba-c028-0410-8290-897cf20841d1> | 2007-10-19 16:25:08 +0000 |
commit | 45864cb5113ec4dde6afe1d23ea53f75402b9ece (patch) | |
tree | b3d4dad81bcfa34037cb067e1356303b32401df1 /src/control.h | |
parent | 7c4c25f2eda4f0a0780cf2edb087452ceb63f226 (diff) |
Refactor image handling code
Remove itrans-lsq
git-svn-id: svn://cook.msm.cam.ac.uk:745/diff-tomo/dtr@158 bf6ca9ba-c028-0410-8290-897cf20841d1
Diffstat (limited to 'src/control.h')
-rw-r--r-- | src/control.h | 39 |
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 */ |