diff options
| author | Thomas White <taw@physics.org> | 2020-07-31 17:17:40 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2020-07-31 17:18:22 +0200 |
| commit | e08b543d99ff6107c523b92b9cb08b5f337492a7 (patch) | |
| tree | 2f998d0e200e6c8b97f031a8f88a9371120f9d3c /src/indexamajig.c | |
| parent | 531984799b71b0662f09d6c212614fa27ef2b3a9 (diff) | |
Move spectrum loading out of indexamajig/process_image
Diffstat (limited to 'src/indexamajig.c')
| -rw-r--r-- | src/indexamajig.c | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/src/indexamajig.c b/src/indexamajig.c index 98573839..7ef4f35c 100644 --- a/src/indexamajig.c +++ b/src/indexamajig.c @@ -78,7 +78,6 @@ struct indexamajig_arguments int check_prefix; int n_proc; char *cellfile; - char *spectrum_fn; char *indm_str; int basename; int zmq; @@ -208,10 +207,9 @@ static error_t parse_arg(int key, char *arg, struct argp_state *state) break; case 209 : - args->spectrum_fn = strdup(arg); - ERROR("WARNING: Prediction using arbitrary spectrum does not " - "yet work in a useful way.\n"); - break; + ERROR("--spectrum-filename is no longer used.\n"); + ERROR("Specify the radiation spectrum via the geometry file instead.\n"); + return 1; case 210 : args->no_mask_data = 1; @@ -599,7 +597,6 @@ int main(int argc, char *argv[]) args.check_prefix = 1; args.n_proc = 1; args.cellfile = NULL; - args.spectrum_fn = NULL; args.indm_str = NULL; args.basename = 0; args.zmq = 0; @@ -888,18 +885,6 @@ int main(int argc, char *argv[]) args.iargs.cell = NULL; } - /* Load spectrum from file if given */ - if ( args.spectrum_fn != NULL ) { - args.iargs.spectrum = spectrum_load(args.spectrum_fn); - if ( args.iargs.spectrum == NULL ) { - ERROR("Couldn't read spectrum (from %s)\n", args.spectrum_fn); - return 1; - } - free(args.spectrum_fn); - } else { - args.iargs.spectrum = NULL; - } - tmpdir = create_tempdir(args.temp_location); if ( tmpdir == NULL ) return 1; |