aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2017-12-12 16:59:55 +0100
committerThomas White <taw@physics.org>2018-02-27 17:12:42 +0100
commit6a305fecf59ef6471fea2809c726c98497b908b6 (patch)
treefa36f1456050b1b1054423fedb5a20c72b69820d /src
parentf77e60c21e9b5f02fa265b258d07010debbfcee3 (diff)
New rejection criteria
Diffstat (limited to 'src')
-rw-r--r--src/merge.c2
-rw-r--r--src/scaling.c8
2 files changed, 5 insertions, 5 deletions
diff --git a/src/merge.c b/src/merge.c
index 099bad2d..96e192f8 100644
--- a/src/merge.c
+++ b/src/merge.c
@@ -50,7 +50,7 @@
/* Minimum partiality of a reflection for it to be merged */
-#define MIN_PART_MERGE (0.05)
+#define MIN_PART_MERGE (0.3)
struct merge_queue_args
diff --git a/src/scaling.c b/src/scaling.c
index 9eec8a99..cd257e48 100644
--- a/src/scaling.c
+++ b/src/scaling.c
@@ -238,12 +238,12 @@ int linear_scale(const RefList *list1, const RefList *list2, double *G,
if ( isinf(Ih1) ) { n_inf1++; continue; }
if ( isnan(Ih2) ) { n_nan2++; continue; }
if ( isinf(Ih2) ) { n_inf2++; continue; }
- if ( get_partiality(refl2) < 0.1 ) { n_part++; continue; }
- if ( Ih1 <= 0.0 ) { n_ih1++; continue; }
+ if ( get_partiality(refl2) < 0.3 ) { n_part++; continue; }
+ //if ( Ih1 <= 0.0 ) { n_ih1++; continue; }
if ( Ih2 <= 0.0 ) { n_ih2++; continue; }
- if ( Ih1 <= 3.0*esd1 ) { n_esd1++; continue; }
+ //if ( Ih1 <= 3.0*esd1 ) { n_esd1++; continue; }
if ( Ih2 <= 3.0*esd2 ) { n_esd2++; continue; }
- if ( get_redundancy(refl1) < 2 ) continue;
+ //if ( get_redundancy(refl1) < 2 ) continue;
if ( n == max_n ) {
max_n *= 2;