From 30a43a9ccadfb72432264fdb6a5bca8540b06e86 Mon Sep 17 00:00:00 2001 From: Valerio Mariani Date: Tue, 3 Feb 2015 13:57:50 +0100 Subject: Remove --element option from inxexamajig --- src/im-sandbox.c | 1 - src/indexamajig.c | 11 +---------- src/process_image.h | 1 - 3 files changed, 1 insertion(+), 12 deletions(-) (limited to 'src') diff --git a/src/im-sandbox.c b/src/im-sandbox.c index 61cfa459..ba709f6f 100644 --- a/src/im-sandbox.c +++ b/src/im-sandbox.c @@ -516,7 +516,6 @@ static void run_work(const struct index_args *iargs, free(iargs->indm); free(iargs->ipriv); free_detector_geometry(iargs->det); - free(iargs->element); free(iargs->hdf5_peak_path); free_copy_hdf5_field_list(iargs->copyme); cell_free(iargs->cell); diff --git a/src/indexamajig.c b/src/indexamajig.c index e3daa1c9..44f067e2 100644 --- a/src/indexamajig.c +++ b/src/indexamajig.c @@ -125,9 +125,6 @@ static void show_help(const char *s) " --check-hdf5-snr Check SNR for peaks from --peaks=hdf5.\n" " --peak-radius= Integration radii for peak search.\n" " --int-radius= Set the integration radii. Default: 4,5,7.\n" -"-e, --image= Use this image from the HDF5 file.\n" -" Example: /data/data0.\n" -" Default: The first one found.\n" " --push-res= Integrate higher than apparent resolution cutoff.\n" " --highres= Absolute resolution cutoff in Angstroms.\n" "\n" @@ -217,7 +214,6 @@ int main(int argc, char *argv[]) iargs.det = NULL; iargs.peaks = PEAK_ZAEF; iargs.beam = &beam; - iargs.element = NULL; iargs.hdf5_peak_path = strdup("/processing/hitfinder/peakinfo"); iargs.cxi_hdf5_peaks = 0; iargs.copyme = NULL; @@ -256,7 +252,6 @@ int main(int argc, char *argv[]) {"pdb", 1, NULL, 'p'}, {"prefix", 1, NULL, 'x'}, {"threshold", 1, NULL, 't'}, - {"image", 1, NULL, 'e'}, {"beam", 1, NULL, 'b'}, /* Long-only options with no arguments */ @@ -303,7 +298,7 @@ int main(int argc, char *argv[]) }; /* Short options */ - while ((c = getopt_long(argc, argv, "hi:o:z:p:x:j:g:t:e:vb:", + while ((c = getopt_long(argc, argv, "hi:o:z:p:x:j:g:t:vb:", longopts, NULL)) != -1) { switch (c) { @@ -355,10 +350,6 @@ int main(int argc, char *argv[]) iargs.threshold = strtof(optarg, NULL); break; - case 'e' : - iargs.element = strdup(optarg); - break; - case 2 : speaks = strdup(optarg); break; diff --git a/src/process_image.h b/src/process_image.h index 8dba8a85..a0bd6a83 100644 --- a/src/process_image.h +++ b/src/process_image.h @@ -62,7 +62,6 @@ struct index_args int peaks; /* Peak detection method */ float tols[4]; struct beam_params *beam; - char *element; char *hdf5_peak_path; int cxi_hdf5_peaks; float pk_inn; -- cgit v1.2.3