diff options
| author | Thomas White <taw@physics.org> | 2017-07-06 17:22:11 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2017-07-06 17:24:59 +0200 |
| commit | 5292f57d4434c7267e8d945871513d742ff42427 (patch) | |
| tree | d460aa5cef5a501516876850ef243cfc27313d5a /libcrystfel/src/xds.c | |
| parent | 48d4a6b8e82cce81222ec58fdfb488ed79ce0bcf (diff) | |
| parent | dc3395900fc3ce0d3961757628ff83ad6456be19 (diff) | |
Merge branch 'master' into taketwo
Diffstat (limited to 'libcrystfel/src/xds.c')
| -rw-r--r-- | libcrystfel/src/xds.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libcrystfel/src/xds.c b/libcrystfel/src/xds.c index 15826760..8a7daab7 100644 --- a/libcrystfel/src/xds.c +++ b/libcrystfel/src/xds.c @@ -3,12 +3,12 @@ * * Invoke xds for crystal autoindexing * - * Copyright © 2013-2016 Deutsches Elektronen-Synchrotron DESY, + * Copyright © 2013-2017 Deutsches Elektronen-Synchrotron DESY, * a research centre of the Helmholtz Association. * Copyright © 2013 Cornelius Gati * * Authors: - * 2010-2016 Thomas White <taw@physics.org> + * 2010-2017 Thomas White <taw@physics.org> * 2013 Cornelius Gati <cornelius.gati@cfel.de> * * This file is part of CrystFEL. @@ -498,7 +498,7 @@ static int write_inp(struct image *image, struct xds_private *xp) } -int run_xds(struct image *image, IndexingPrivate *priv) +int run_xds(struct image *image, void *priv) { unsigned int opts; int status; @@ -619,8 +619,8 @@ int run_xds(struct image *image, IndexingPrivate *priv) } -IndexingPrivate *xds_prepare(IndexingMethod *indm, UnitCell *cell, - struct detector *det, float *ltl) +void *xds_prepare(IndexingMethod *indm, UnitCell *cell, + struct detector *det, float *ltl) { struct xds_private *xp; int need_cell = 0; @@ -687,11 +687,11 @@ IndexingPrivate *xds_prepare(IndexingMethod *indm, UnitCell *cell, xp->cell = cell; xp->indm = *indm; - return (IndexingPrivate *)xp; + return xp; } -void xds_cleanup(IndexingPrivate *pp) +void xds_cleanup(void *pp) { struct xds_private *xp; |