diff options
author | Thomas White <taw@physics.org> | 2021-03-19 14:19:24 +0100 |
---|---|---|
committer | Thomas White <taw@physics.org> | 2021-03-19 14:19:24 +0100 |
commit | 6a4d681da9ac355b3b8d73861a6dcb5bc42ef2ba (patch) | |
tree | b7978720281c9c02db4529e79f7c92b1009e00c4 /libcrystfel/src/index.h | |
parent | efb6ec7b3899a90f8e1a977895e23042c35040f7 (diff) | |
parent | 99c7fa94b9aecf7b22d57410edb5a8665a5f10f7 (diff) |
Merge branch 'tom/fromfile'
Diffstat (limited to 'libcrystfel/src/index.h')
-rw-r--r-- | libcrystfel/src/index.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/libcrystfel/src/index.h b/libcrystfel/src/index.h index 60e61630..88b9b67e 100644 --- a/libcrystfel/src/index.h +++ b/libcrystfel/src/index.h @@ -73,7 +73,7 @@ typedef enum { INDEXING_FELIX = 4, /**< Invoke Felix program */ INDEXING_XDS = 5, /**< Invoke XDS program (NB not nXDS) */ INDEXING_SIMULATION = 6, /**< Dummy value for simulated data */ - INDEXING_DEBUG = 7, /**< Results injector for debugging */ + INDEXING_FILE = 7, /**< Results injector for debugging */ INDEXING_ASDF = 8, /**< Use built-in ASDF algorithm */ INDEXING_TAKETWO = 9, /**< Use built-in TakeTwo algorithm */ INDEXING_XGANDALF = 10, /**< Use XGANDALF (via optional library) */ @@ -152,16 +152,19 @@ typedef struct felix_options FelixOptions; typedef struct taketwo_options TakeTwoOptions; typedef struct xgandalf_options XGandalfOptions; typedef struct pinkIndexer_options PinkIndexerOptions; +typedef struct fromfile_options FromFileOptions; extern struct argp felix_argp; extern struct argp pinkIndexer_argp; extern struct argp taketwo_argp; extern struct argp xgandalf_argp; +extern struct argp fromfile_argp; extern void default_method_options(TakeTwoOptions **ttopts, XGandalfOptions **xgandalf_opts, PinkIndexerOptions **pinkIndexer_opts, - FelixOptions **felix_opts); + FelixOptions **felix_opts, + FromFileOptions **fromfile_opts); extern IndexingPrivate *setup_indexing(const char *methods, UnitCell *cell, @@ -172,7 +175,8 @@ extern IndexingPrivate *setup_indexing(const char *methods, struct taketwo_options *ttopts, struct xgandalf_options *xgandalf_opts, struct pinkIndexer_options *pinkIndexer_opts, - struct felix_options *felix_opts); + struct felix_options *felix_opts, + struct fromfile_options *fromfile_opts); extern const IndexingMethod *indexing_methods(IndexingPrivate *p, int *n); |