aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libcrystfel/src/cell.c5
-rw-r--r--libcrystfel/src/index.c6
-rw-r--r--src/indexamajig.c5
3 files changed, 11 insertions, 5 deletions
diff --git a/libcrystfel/src/cell.c b/libcrystfel/src/cell.c
index a6df931b..38bca61c 100644
--- a/libcrystfel/src/cell.c
+++ b/libcrystfel/src/cell.c
@@ -752,8 +752,11 @@ UnitCell *match_cell(UnitCell *cell, UnitCell *template, int verbose,
/* Test modulus for agreement with moduli of template */
for ( i=0; i<3; i++ ) {
- if ( !within_tolerance(lengths[i], tlen, tols[i]) )
+ if ( !within_tolerance(lengths[i], tlen,
+ tols[i]) )
+ {
continue;
+ }
cand[i][ncand[i]].vec.u = tx;
cand[i][ncand[i]].vec.v = ty;
diff --git a/libcrystfel/src/index.c b/libcrystfel/src/index.c
index 56b34baa..31239179 100644
--- a/libcrystfel/src/index.c
+++ b/libcrystfel/src/index.c
@@ -191,10 +191,12 @@ void index_pattern(struct image *image, UnitCell *cell, IndexingMethod *indm,
new_cell = cell_new_from_cell(cand);
break;
case CELLR_REDUCE :
- new_cell = match_cell(cand, cell, verbose, ltl, 1);
+ new_cell = match_cell(cand, cell, verbose,
+ ltl, 1);
break;
case CELLR_COMPARE :
- new_cell = match_cell(cand, cell, verbose, ltl, 0);
+ new_cell = match_cell(cand, cell, verbose,
+ ltl, 0);
break;
case CELLR_COMPARE_AB :
new_cell = match_cell_ab(cand, cell);
diff --git a/src/indexamajig.c b/src/indexamajig.c
index 7e296759..9cc1206f 100644
--- a/src/indexamajig.c
+++ b/src/indexamajig.c
@@ -560,7 +560,7 @@ int main(int argc, char *argv[])
char *speaks = NULL;
char *scellr = NULL;
char *toler = NULL;
- float tols[4] = {5.0, 5.0, 5.0, 1.5}; /* for a,b,c in % and for the angles in deg */
+ float tols[4] = {5.0, 5.0, 5.0, 1.5}; /* a,b,c,angles (%,%,%,deg) */
int cellr;
int peaks;
int nthreads = 1;
@@ -881,7 +881,8 @@ int main(int argc, char *argv[])
if ( toler != NULL ) {
int ttt;
- ttt = sscanf(toler, "%f,%f,%f,%f", &tols[0], &tols[1], &tols[2], &tols[3] );
+ ttt = sscanf(toler, "%f,%f,%f,%f",
+ &tols[0], &tols[1], &tols[2], &tols[3] );
if ( ttt != 4 ) {
ERROR("Invalid parameters for '--tolerance'\n");
return 1;