aboutsummaryrefslogtreecommitdiff
path: root/src/cell_explorer.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/cell_explorer.c')
-rw-r--r--src/cell_explorer.c204
1 files changed, 116 insertions, 88 deletions
diff --git a/src/cell_explorer.c b/src/cell_explorer.c
index 4ae406ce..1f67ec56 100644
--- a/src/cell_explorer.c
+++ b/src/cell_explorer.c
@@ -3,11 +3,11 @@
*
* Examine cell parameter histograms
*
- * Copyright © 2014-2020 Deutsches Elektronen-Synchrotron DESY,
+ * Copyright © 2014-2021 Deutsches Elektronen-Synchrotron DESY,
* a research centre of the Helmholtz Association.
*
* Authors:
- * 2014,2017 Thomas White <taw@physics.org>
+ * 2014-2020 Thomas White <taw@physics.org>
*
* This file is part of CrystFEL.
*
@@ -48,6 +48,7 @@
#include "cell-utils.h"
#include "multihistogram.h"
+#include "version.h"
static void show_help(const char *s)
@@ -1927,98 +1928,44 @@ static void indexing_method_list(CellWindow *w, GtkWidget *vbox)
}
-int main(int argc, char *argv[])
+static int add_stream(CellWindow *w, const char *stream_filename,
+ int *pmax_cells, int *pn_total_chunks)
{
- int c;
Stream *st;
- int max_cells = 0;
- char *stream_filename;
- GtkWidget *box, *vbox;
- char title[1024];
- char *bn;
- CellWindow w;
int n_chunks = 0;
- int i;
-
- /* Long options */
- const struct option longopts[] = {
- {"help", 0, NULL, 'h'},
- {"version", 0, NULL, 1 },
- {0, 0, NULL, 0}
- };
+ int n_cells = 0;
+ int max_cells = *pmax_cells;
- /* Short options */
- while ((c = getopt_long(argc, argv, "h",
- longopts, NULL)) != -1) {
-
- switch (c) {
-
- case 'h' :
- show_help(argv[0]);
- return 0;
-
- case 1 :
- printf("CrystFEL: " CRYSTFEL_VERSIONSTRING "\n");
- printf(CRYSTFEL_BOILERPLATE"\n");
- return 0;
-
- default :
- return 1;
-
- }
+ fprintf(stderr, "%s\r", stream_filename);
- }
-
- /* This isn't great, but necessary to make the command-line UI and file
- * formats consistent with the other programs, which all use the C
- * locale. Better would be to have all the programs call
- * setlocale(LC_ALL, "") and use the C locale temporarily when reading
- * or writing a stream, reflection file, geometry file etc. */
- gtk_disable_setlocale();
-
- gtk_init(&argc, &argv);
-
- if ( argc != (optind+1) ) {
- fprintf(stderr, "Please provide exactly one stream filename.\n");
- return 1;
- }
- stream_filename = strdup(argv[optind]);
- st = open_stream_for_read(stream_filename);
+ st = stream_open_for_read(stream_filename);
if ( st == NULL ) {
- fprintf(stderr, "Failed to open '%s'\n", stream_filename);
- return 1;
+ fprintf(stderr, "Failed to open '%s' (skipping)\n",
+ stream_filename);
+ return 0;
}
-
- gsl_set_error_handler_off();
-
- w.cells = NULL;
- w.indms = NULL;
- w.n_cells = 0;
do {
- struct image cur;
+ struct image *image;
int i;
- cur.det = NULL;
-
- if ( read_chunk_2(st, &cur, STREAM_READ_UNITCELL) != 0 ) {
- break;
- }
+ image = stream_read_chunk(st, 0);
+ if ( image == NULL ) break;
- for ( i=0; i<cur.n_crystals; i++ ) {
+ for ( i=0; i<image->n_crystals; i++ ) {
Crystal *cr;
- cr = cur.crystals[i];
+ cr = image->crystals[i];
- if ( w.n_cells == max_cells ) {
+ if ( w->n_cells == max_cells ) {
UnitCell **cells_new;
IndexingMethod *indms_new;
size_t nsz;
nsz = (max_cells+1024)*sizeof(UnitCell *);
- cells_new = realloc(w.cells, nsz);
+ cells_new = realloc(w->cells, nsz);
if ( cells_new == NULL ) {
fprintf(stderr, "Failed to allocate "
"memory for cells.\n");
@@ -2026,7 +1973,7 @@ int main(int argc, char *argv[])
}
nsz = (max_cells+1024)*sizeof(IndexingMethod);
- indms_new = realloc(w.indms, nsz);
+ indms_new = realloc(w->indms, nsz);
if ( indms_new == NULL ) {
fprintf(stderr, "Failed to allocate "
"memory for methods.\n");
@@ -2034,30 +1981,31 @@ int main(int argc, char *argv[])
}
max_cells += 1024;
- w.cells = cells_new;
- w.indms = indms_new;
+ *pmax_cells = max_cells;
+ w->cells = cells_new;
+ w->indms = indms_new;
}
- w.cells[w.n_cells] = crystal_get_cell(cr);
- if ( !right_handed(w.cells[w.n_cells]) ) {
+ w->cells[w->n_cells] = cell_new_from_cell(crystal_get_cell(cr));
+ if ( !right_handed(w->cells[w->n_cells]) ) {
ERROR("WARNING: Left-handed cell encountered\n");
}
- w.indms[w.n_cells] = cur.indexed_by;
- w.n_cells++;
-
- crystal_free(cr);
+ w->indms[w->n_cells] = image->indexed_by;
+ w->n_cells++;
+ n_cells++;
}
n_chunks++;
if ( n_chunks % 1000 == 0 ) {
- fprintf(stderr, "Loaded %i cells from %i chunks\r",
- w.n_cells, n_chunks);
+ fprintf(stderr, "%s: Loaded %i cells from %i chunks\r",
+ stream_filename, n_cells, n_chunks);
}
+ image_free(image);
+
} while ( 1 );
- fprintf(stderr, "Loaded %i cells from %i chunks\n", w.n_cells, n_chunks);
fprintf(stderr, "\n");
@@ -2072,7 +2020,88 @@ int main(int argc, char *argv[])
ERROR("To simplify matters, it's best to re-run indexamajig.\n");
ERROR("------------------\n");
}
- close_stream(st);
+
+ stream_close(st);
+
+ *pn_total_chunks += n_chunks;
+ return 0;
+}
+
+
+int main(int argc, char *argv[])
+{
+ int c;
+ int max_cells = 0;
+ int n_chunks = 0;
+ GtkWidget *box, *vbox;
+ char title[1024];
+ CellWindow w;
+ int i;
+ char *name_for_title;
+
+ /* Long options */
+ const struct option longopts[] = {
+ {"help", 0, NULL, 'h'},
+ {"version", 0, NULL, 1 },
+ {0, 0, NULL, 0}
+ };
+
+ /* Short options */
+ while ((c = getopt_long(argc, argv, "h",
+ longopts, NULL)) != -1) {
+
+ switch (c) {
+
+ case 'h' :
+ show_help(argv[0]);
+ return 0;
+
+ case 1 :
+ printf("CrystFEL: %s\n",
+ crystfel_version_string());
+ printf("%s\n",
+ crystfel_licence_string());
+ return 0;
+
+ default :
+ return 1;
+
+ }
+
+ }
+
+ /* This isn't great, but necessary to make the command-line UI and file
+ * formats consistent with the other programs, which all use the C
+ * locale. Better would be to have all the programs call
+ * setlocale(LC_ALL, "") and use the C locale temporarily when reading
+ * or writing a stream, reflection file, geometry file etc. */
+ gtk_disable_setlocale();
+
+ gtk_init(&argc, &argv);
+
+ if ( argc < optind ) {
+ fprintf(stderr, "Please provide at least one stream filename.\n");
+ return 1;
+ }
+
+ name_for_title = safe_basename(argv[optind]);
+
+ gsl_set_error_handler_off();
+
+ w.cells = NULL;
+ w.indms = NULL;
+ w.n_cells = 0;
+
+ while ( optind < argc ) {
+ if ( add_stream(&w, argv[optind++],
+ &max_cells, &n_chunks) )
+ {
+ return 1;
+ }
+ }
+
+ fprintf(stderr, "Loaded %i cells from %i total chunks\n",
+ w.n_cells, n_chunks);
w.cols_on[0] = 1;
for ( i=1; i<8; i++ ) w.cols_on[i] = 2;
@@ -2096,9 +2125,8 @@ int main(int argc, char *argv[])
reset_axes(w.hist_ga);
w.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
- bn = safe_basename(stream_filename);
- snprintf(title, 1023, "%s - Unit Cell Explorer", bn);
- free(bn);
+ snprintf(title, 1023, "%s - Unit Cell Explorer",
+ name_for_title);
gtk_window_set_title(GTK_WINDOW(w.window), title);
g_signal_connect(G_OBJECT(w.window), "destroy", G_CALLBACK(destroy_sig),
&w);
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-11 01:11:44 +0000