diff options
| author | Thomas White <taw@physics.org> | 2021-03-12 11:24:25 +0100 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2021-03-12 11:24:25 +0100 |
| commit | 52290007860c1fa0908e57f5cb84426f978e5398 (patch) | |
| tree | c9245ba561924f04810979647beeb9f70eda4d23 /src | |
| parent | e21cc1f84a8cb2b0627e99383c882e59efda4920 (diff) | |
| parent | 7eba31cb084460c3e993818a60a0e6bcca592a55 (diff) | |
Merge branch 'pascal/electrons'
Diffstat (limited to 'src')
| -rw-r--r-- | src/indexamajig.c | 8 | ||||
| -rw-r--r-- | src/process_image.c | 1 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/indexamajig.c b/src/indexamajig.c index 6980c4b7..4b12194c 100644 --- a/src/indexamajig.c +++ b/src/indexamajig.c @@ -849,7 +849,7 @@ int main(int argc, char *argv[]) ERROR("Failed to open input file '%s'\n", args.filename); return 1; } - free(args.filename); + /* Check prefix (if given) */ if ( args.check_prefix ) { @@ -996,7 +996,11 @@ int main(int argc, char *argv[]) taketwo_opts, xgandalf_opts, pinkindexer_opts, - felix_opts); + felix_opts, + 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 825e57d9..d3355f38 100644 --- a/src/process_image.c +++ b/src/process_image.c @@ -381,6 +381,7 @@ 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) ) { |