aboutsummaryrefslogtreecommitdiff
path: root/libcrystfel
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2015-09-11 15:30:10 +0200
committerThomas White <taw@physics.org>2015-09-15 13:46:57 +0200
commitbd50b94550fbffa47c85eaa0c7708a5fe939cf60 (patch)
tree941f4ec4d631201f903e2e79669c0cbea2c0be6e /libcrystfel
parent9e852fc193e919aed5f0303e4605f857b68c08c4 (diff)
Formatting / fussiness
Diffstat (limited to 'libcrystfel')
-rw-r--r--libcrystfel/src/felix.c12
-rw-r--r--libcrystfel/src/index.c3
2 files changed, 8 insertions, 7 deletions
diff --git a/libcrystfel/src/felix.c b/libcrystfel/src/felix.c
index 2f416693..2f90708d 100644
--- a/libcrystfel/src/felix.c
+++ b/libcrystfel/src/felix.c
@@ -125,7 +125,6 @@ static int read_felix(struct felix_private *gp, struct image *image,
float ubi21, ubi22, ubi23;
float ubi31, ubi32, ubi33;
float mean_ia;
- /* int ngv_unique; /* Used in Felix 0.1 */
int ngv;
char line[1024];
int r;
@@ -178,7 +177,8 @@ static int read_felix(struct felix_private *gp, struct image *image,
&ubi31, &ubi32, &ubi33);
if ( r != 21 ) {
- ERROR("Only %i parameters in .felix file, check version and format.\n", r);
+ ERROR("Only %i parameters in .felix file, "
+ "check version and format.\n", r);
return 1;
}
@@ -554,8 +554,8 @@ int felix_index(struct image *image, IndexingPrivate *ipriv)
}
IndexingPrivate *felix_prepare(IndexingMethod *indm, UnitCell *cell,
- struct detector *det, float *ltl,
- const char *options)
+ struct detector *det, float *ltl,
+ const char *options)
{
struct felix_private *gp;
char *temp_options=NULL;
@@ -701,7 +701,7 @@ IndexingPrivate *felix_prepare(IndexingMethod *indm, UnitCell *cell,
/* Make sure that they at least specified the spacegroup number.*/
- if ( gp->spacegroup == 0 ){
+ if ( gp->spacegroup == 0 ) {
ERROR("Felix requires that you specify the spacegroup number.\n");
ERROR("You should use the argument --felix-options=spacegroup=xx\n");
return NULL;
@@ -710,7 +710,7 @@ IndexingPrivate *felix_prepare(IndexingMethod *indm, UnitCell *cell,
free(temp_options);
free(option);
- return (IndexingPrivate *) gp;
+ return (IndexingPrivate *)gp;
}
diff --git a/libcrystfel/src/index.c b/libcrystfel/src/index.c
index e48f7194..99e40053 100644
--- a/libcrystfel/src/index.c
+++ b/libcrystfel/src/index.c
@@ -110,7 +110,8 @@ IndexingPrivate **prepare_indexing(IndexingMethod *indm, UnitCell *cell,
break;
case INDEXING_FELIX :
- iprivs[n] = felix_prepare(&indm[n], cell, det, ltl, options);
+ iprivs[n] = felix_prepare(&indm[n], cell, det, ltl,
+ options);
break;
default :