aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPascal Hogan-Lamarre <pascal.hogan@gmail.com>2020-09-16 22:45:56 -0400
committerPascal Hogan-Lamarre <pascal.hogan@gmail.com>2020-09-16 22:45:56 -0400
commit5c50243916af143a0d7c10792eacdfb97608a107 (patch)
treeac37900b9f68b22c0a959d5e23d557b7857184a6
parentc97685fbeca127373ffb0a6cc1f2222e12a91f1e (diff)
if-conditions to prevent modifying the resolution limit value read in the solution file
-rw-r--r--libcrystfel/src/integration.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/libcrystfel/src/integration.c b/libcrystfel/src/integration.c
index 3d8258c1..8a3c581e 100644
--- a/libcrystfel/src/integration.c
+++ b/libcrystfel/src/integration.c
@@ -1687,9 +1687,14 @@ void integrate_all_5(struct image *image, IntegrationMethod meth,
saved_R * 5);
}
- res = estimate_resolution(crystal_get_cell(image->crystals[i]),
+ if ( image->indexed_by != INDEXING_FILE ){
+ res = estimate_resolution(crystal_get_cell(image->crystals[i]),
image->features);
- crystal_set_resolution_limit(image->crystals[i], res);
+ crystal_set_resolution_limit(image->crystals[i], res);
+ }
+ else{
+ res = crystal_get_resolution_limit(image->crystals[i]);
+ }
list = predict_to_res(image->crystals[i], res+push_res);
crystal_set_reflections(image->crystals[i], list);