aboutsummaryrefslogtreecommitdiff
path: root/libcrystfel/src/image.h
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2020-06-03 17:16:59 +0200
committerThomas White <taw@physics.org>2020-07-29 18:53:33 +0200
commit6e5d500a2786131c7304b6c001142e524791bc12 (patch)
tree0225c8f3dea1545332ef9294693ffc6b3263097b /libcrystfel/src/image.h
parent2037afa4693d4032606d98eb67522fabb58a42ea (diff)
Remove "struct detector" completely, part I
record_image has been moved to pattern_sim.c
Diffstat (limited to 'libcrystfel/src/image.h')
-rw-r--r--libcrystfel/src/image.h23
1 files changed, 1 insertions, 22 deletions
diff --git a/libcrystfel/src/image.h b/libcrystfel/src/image.h
index 44ce24ac..0235e0c2 100644
--- a/libcrystfel/src/image.h
+++ b/libcrystfel/src/image.h
@@ -35,19 +35,15 @@
#ifndef IMAGE_H
#define IMAGE_H
-struct detector;
-
#include <stdint.h>
#include <complex.h>
#include <sys/types.h>
struct imagefeature;
-struct sample;
struct image;
#include "utils.h"
#include "cell.h"
-#include "detector.h"
#include "reflist.h"
#include "crystal.h"
#include "index.h"
@@ -101,17 +97,6 @@ enum imagefile_type
typedef struct _imagefeaturelist ImageFeatureList;
-struct beam_params
-{
- double photon_energy; /**< eV per photon */
- char *photon_energy_from; /**< HDF5 dataset name */
- double photon_energy_scale; /**< Scale factor for photon energy, if it
- * comes from an image header */
- double bandwidth; /**< FWHM bandwidth as a fraction of
- * wavelength */
-};
-
-
struct image
{
/** The image data, by panel */
@@ -138,14 +123,8 @@ struct image
/** Number of times the indexer was tried before succeeding */
int n_indexing_tries;
- /** The detector structure
- * @{ */
+ /** The detector structure */
struct detgeom *detgeom;
- struct detector *det; /* FIXME: Deprecated */
- /** @} */
-
- /** The nominal beam parameters (or where to get them) */
- struct beam_params *beam; /* FIXME: Deprecated */
/** \name The filename and event ID for the image
* @{ */