diff options
| author | Thomas White <taw@physics.org> | 2018-03-29 16:00:50 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2018-03-29 16:00:50 +0200 |
| commit | 8d9f9cc570a69780d3e3b2c271f03d055066a9be (patch) | |
| tree | 44d7a71e0cbcab2c1c327d761da150bca9c1807a /src/scaling.h | |
| parent | 77cf2edd09bb01ae331935f467064c751f6e338e (diff) | |
| parent | 402b3870e3e1bceb974ad5a402c5e5e898f4c87e (diff) | |
Merge branch 'tom/ginn-partials'
Diffstat (limited to 'src/scaling.h')
| -rw-r--r-- | src/scaling.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/scaling.h b/src/scaling.h index 534043d9..514bee03 100644 --- a/src/scaling.h +++ b/src/scaling.h @@ -3,11 +3,11 @@ * * Scaling * - * Copyright © 2012-2015 Deutsches Elektronen-Synchrotron DESY, + * Copyright © 2012-2017 Deutsches Elektronen-Synchrotron DESY, * a research centre of the Helmholtz Association. * * Authors: - * 2010-2015 Thomas White <taw@physics.org> + * 2010-2017 Thomas White <taw@physics.org> * * This file is part of CrystFEL. * @@ -41,7 +41,12 @@ extern double log_residual(Crystal *cr, const RefList *full, int free, int *pn_used, const char *filename); -extern void scale_all(Crystal **crystals, int n_crystals, int nthreads, - PartialityModel pmodel); +extern int linear_scale(const RefList *list1, const RefList *list2, double *G, + int complain_loudly); + +extern void scale_all(Crystal **crystals, int n_crystals, int nthreads); + +extern void scale_all_to_reference(Crystal **crystals, int n_crystals, + RefList *reference, int nthreads); #endif /* SCALING_H */ |