From cbee076c3608dc19027f8f49c67ff01aef2e5b3f Mon Sep 17 00:00:00 2001 From: Thomas White Date: Wed, 25 Oct 2017 16:29:31 +0200 Subject: Use linear scale when scaling against reference --- src/scaling.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/scaling.h') diff --git a/src/scaling.h b/src/scaling.h index 534043d9..7b055003 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 + * 2010-2017 Thomas White * * This file is part of CrystFEL. * @@ -44,4 +44,7 @@ extern double log_residual(Crystal *cr, const RefList *full, int free, extern void scale_all(Crystal **crystals, int n_crystals, int nthreads, PartialityModel pmodel); +extern void scale_all_to_reference(Crystal **crystals, int n_crystals, + RefList *reference); + #endif /* SCALING_H */ -- cgit v1.2.3 From 07d1ff916b1731143f3ce7d76e4d1d2a5052a9ca Mon Sep 17 00:00:00 2001 From: Thomas White Date: Tue, 27 Feb 2018 13:42:42 +0100 Subject: Residual and scaling fixes --- src/scaling.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/scaling.h') diff --git a/src/scaling.h b/src/scaling.h index 7b055003..85e8c8ab 100644 --- a/src/scaling.h +++ b/src/scaling.h @@ -41,6 +41,8 @@ extern double log_residual(Crystal *cr, const RefList *full, int free, int *pn_used, const char *filename); +extern int linear_scale(RefList *list1, const RefList *list2, double *G); + extern void scale_all(Crystal **crystals, int n_crystals, int nthreads, PartialityModel pmodel); -- cgit v1.2.3 From de9fbc4335a5d2e3896381403f4b1b5b19dcf444 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Tue, 5 Dec 2017 12:16:20 +0100 Subject: const-cleanliness (and a bit of error checking) --- src/scaling.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/scaling.h') diff --git a/src/scaling.h b/src/scaling.h index 85e8c8ab..4d075a3b 100644 --- a/src/scaling.h +++ b/src/scaling.h @@ -41,7 +41,7 @@ extern double log_residual(Crystal *cr, const RefList *full, int free, int *pn_used, const char *filename); -extern int linear_scale(RefList *list1, const RefList *list2, double *G); +extern int linear_scale(const RefList *list1, const RefList *list2, double *G); extern void scale_all(Crystal **crystals, int n_crystals, int nthreads, PartialityModel pmodel); -- cgit v1.2.3 From 4eb0015369115791fc721ca97736d30fc38d8ae1 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Tue, 27 Feb 2018 15:58:00 +0100 Subject: Switch to simpler scaling algorithm --- src/scaling.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/scaling.h') diff --git a/src/scaling.h b/src/scaling.h index 4d075a3b..6ff0a337 100644 --- a/src/scaling.h +++ b/src/scaling.h @@ -43,10 +43,7 @@ extern double log_residual(Crystal *cr, const RefList *full, int free, extern int linear_scale(const RefList *list1, const RefList *list2, double *G); -extern void scale_all(Crystal **crystals, int n_crystals, int nthreads, - PartialityModel pmodel); - extern void scale_all_to_reference(Crystal **crystals, int n_crystals, - RefList *reference); + RefList *reference, int nthreads); #endif /* SCALING_H */ -- cgit v1.2.3 From f77e60c21e9b5f02fa265b258d07010debbfcee3 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Tue, 12 Dec 2017 16:15:38 +0100 Subject: Don't complain loudly about scaling failures during refinement As long as it doesn't end up somewhere bad, it can probe where it likes. --- src/scaling.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/scaling.h') diff --git a/src/scaling.h b/src/scaling.h index 6ff0a337..b345029a 100644 --- a/src/scaling.h +++ b/src/scaling.h @@ -41,7 +41,8 @@ extern double log_residual(Crystal *cr, const RefList *full, int free, int *pn_used, const char *filename); -extern int linear_scale(const RefList *list1, const RefList *list2, double *G); +extern int linear_scale(const RefList *list1, const RefList *list2, double *G, + int complain_loudly); extern void scale_all_to_reference(Crystal **crystals, int n_crystals, RefList *reference, int nthreads); -- cgit v1.2.3 From c8a51805efd3deb068b17b5f79c1afcfd5e8d73d Mon Sep 17 00:00:00 2001 From: Thomas White Date: Fri, 2 Mar 2018 16:38:43 +0100 Subject: Restore old scaling code --- src/scaling.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/scaling.h') diff --git a/src/scaling.h b/src/scaling.h index b345029a..620518ef 100644 --- a/src/scaling.h +++ b/src/scaling.h @@ -44,6 +44,9 @@ extern double log_residual(Crystal *cr, const RefList *full, int free, 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, + PartialityModel pmodel); + extern void scale_all_to_reference(Crystal **crystals, int n_crystals, RefList *reference, int nthreads); -- cgit v1.2.3 From 044b8732cd14584d1c34ab1a21564b20a0d46447 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Fri, 2 Mar 2018 16:41:03 +0100 Subject: Remove unnecessary pmodels --- src/scaling.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/scaling.h') diff --git a/src/scaling.h b/src/scaling.h index 620518ef..514bee03 100644 --- a/src/scaling.h +++ b/src/scaling.h @@ -44,8 +44,7 @@ extern double log_residual(Crystal *cr, const RefList *full, int free, 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, - PartialityModel pmodel); +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); -- cgit v1.2.3