diff options
| author | Thomas White <taw@physics.org> | 2021-03-12 11:26:01 +0100 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2021-03-12 12:01:15 +0100 |
| commit | 0cc8a3db1a6e57f64275deab0da2b31a15fdbb69 (patch) | |
| tree | 73cfb6840c02148e048c4d3e08613443e3caf685 /src | |
| parent | 87d60b8110e68ab42052588f275506eaca4f521f (diff) | |
Clean up after merge
Diffstat (limited to 'src')
| -rw-r--r-- | src/indexamajig.c | 9 | ||||
| -rw-r--r-- | src/process_image.c | 1 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/indexamajig.c b/src/indexamajig.c index 4b12194c..7f73cef6 100644 --- a/src/indexamajig.c +++ b/src/indexamajig.c @@ -849,7 +849,6 @@ int main(int argc, char *argv[]) ERROR("Failed to open input file '%s'\n", args.filename); return 1; } - /* Check prefix (if given) */ if ( args.check_prefix ) { @@ -997,10 +996,10 @@ int main(int argc, char *argv[]) xgandalf_opts, pinkindexer_opts, felix_opts, - args.filename); - - free(args.filename); - + args.filename); + + free(args.filename); + if ( args.iargs.ipriv == NULL ) { ERROR("Failed to set up indexing system\n"); return 1; diff --git a/src/process_image.c b/src/process_image.c index d3355f38..825e57d9 100644 --- a/src/process_image.c +++ b/src/process_image.c @@ -381,7 +381,6 @@ void process_image(const struct index_args *iargs, struct pattern_args *pargs, } } - if ( iargs->fix_profile_r < 0.0 ) { for ( i=0; i<image->n_crystals; i++ ) { if ( refine_radius(image->crystals[i], image) ) { |