Handle event expansion even for single-event files

6 files changed, 125 insertions, 13 deletions

diff --git a/libcrystfel/src/image-hdf5.c b/libcrystfel/src/image-hdf5.c
index ccd0bb92..43b20bdf 100644
--- a/libcrystfel/src/image-hdf5.c
+++ b/libcrystfel/src/image-hdf5.c
@@ -1192,7 +1192,11 @@ static int add_to_list(struct ev_list *list, char *ev_str)
 static char *demunge_event(const char *orig)
 {
 	size_t len = strlen(orig);
-	char *slash = malloc(len+3);
+	char *slash;
+
+	if ( len == 0 ) return strdup("//");
+
+	slash = malloc(len+3);
 	if ( slash == NULL ) return NULL;
 	strcpy(slash, orig+1);
 	strcat(slash, "//");
@@ -1490,8 +1494,6 @@ char **image_hdf5_expand_frames(const DataTemplate *dtempl,
 		int *placeholder_sizes;
 		int n_placeholder_dims;
 		int j;
-		char **evs_this_path;
-		int n_evs_this_path;
 		struct panel_template *p = &dtempl->panels[0];
 
 		path = substitute_path(path_evs[i], p->data);
@@ -1545,19 +1547,32 @@ char **image_hdf5_expand_frames(const DataTemplate *dtempl,
 
 		/* Path event ID ends with //, but expand_dims will
 		 * add a slash.  So, remove one slash */
-		path_evs[i][strlen(path_evs[i])-1] = '\0';
-		evs_this_path = expand_dims(placeholder_sizes,
-		                            n_placeholder_dims,
-		                            path_evs[i],
-		                            &n_evs_this_path);
-
-		for ( j=0; j<n_evs_this_path; j++ ) {
-			add_to_list(&full_evs, evs_this_path[j]);
-			free(evs_this_path[j]);
+		if ( n_placeholder_dims > 0 ) {
+
+			char **evs_this_path;
+			int n_evs_this_path;
+
+			path_evs[i][strlen(path_evs[i])-1] = '\0';
+			evs_this_path = expand_dims(placeholder_sizes,
+			                            n_placeholder_dims,
+			                            path_evs[i],
+			                            &n_evs_this_path);
+
+			for ( j=0; j<n_evs_this_path; j++ ) {
+				add_to_list(&full_evs, evs_this_path[j]);
+				free(evs_this_path[j]);
+			}
+
+			free(evs_this_path);
+
+		} else {
+
+			/* Easy case with no dims to expand */
+			add_to_list(&full_evs, path_evs[i]);
+
 		}
 
 		free(placeholder_sizes);
-		free(evs_this_path);
 		free(path);
 		free(path_evs[i]);
 
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 46c71a9e..b33e08db 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -150,3 +150,10 @@ target_link_libraries(ev_enum2 ${COMMON_LIBRARIES} -lhdf5)
 add_test(NAME ev_enum2
   COMMAND ev_enum2 ${CMAKE_CURRENT_SOURCE_DIR}/ev_enum2.h5
   ${CMAKE_CURRENT_SOURCE_DIR}/ev_enum2.geom)
+
+add_executable(ev_enum3 ev_enum3.c)
+target_include_directories(ev_enum3 PRIVATE ${COMMON_INCLUDES})
+target_link_libraries(ev_enum3 ${COMMON_LIBRARIES} -lhdf5)
+add_test(NAME ev_enum3
+  COMMAND ev_enum3 ${CMAKE_CURRENT_SOURCE_DIR}/ev_enum3.h5
+  ${CMAKE_CURRENT_SOURCE_DIR}/ev_enum3.geom)
diff --git a/tests/ev_enum3.c b/tests/ev_enum3.c
new file mode 100644
index 00000000..8af378e7
--- /dev/null
+++ b/tests/ev_enum3.c
@@ -0,0 +1,73 @@
+/*
+ * ev_enum3.c
+ *
+ * Check that event enumeration works
+ *
+ * Copyright © 2020 Deutsches Elektronen-Synchrotron DESY,
+ *                  a research centre of the Helmholtz Association.
+ *
+ * Authors:
+ *   2020 Thomas White <taw@physics.org>
+ *
+ * This file is part of CrystFEL.
+ *
+ * CrystFEL is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * CrystFEL is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with CrystFEL.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+
+#include <stdio.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <image.h>
+
+int main(int argc, char *argv[])
+{
+	char **event_ids;
+	int n_event_ids;
+	DataTemplate *dtempl;
+
+	dtempl = data_template_new_from_file(argv[2]);
+	if ( dtempl == NULL ) {
+		ERROR("Failed to load data template\n");
+		return 1;
+	}
+
+	event_ids = image_expand_frames(dtempl, argv[1], &n_event_ids);
+
+	if ( n_event_ids != 1 ) {
+		printf("n_event_ids = %i\n", n_event_ids);
+		return 1;
+	}
+
+	if ( event_ids == NULL ) {
+		printf("event_ids not NULL\n");
+		return 1;
+	}
+
+	if ( strcmp(event_ids[0], "//") != 0 ) {
+		printf("Event is not '//' ('%s')\n", event_ids[0]);
+		return 1;
+	}
+
+	data_template_free(dtempl);
+
+	return 0;
+}
diff --git a/tests/ev_enum3.geom b/tests/ev_enum3.geom
new file mode 100644
index 00000000..602efdf8
--- /dev/null
+++ b/tests/ev_enum3.geom
@@ -0,0 +1,12 @@
+panel/min_fs = 0
+panel/min_ss = 1
+panel/max_fs = 0
+panel/max_ss = 1
+panel/corner_x = -100
+panel/corner_y = -100
+panel/clen = 50 mm
+panel/res = 1000000
+panel/adu_per_photon = 1
+panel/dim0 = fs
+panel/dim1 = ss
+panel/data = /data/data_array
diff --git a/tests/ev_enum3.h5 b/tests/ev_enum3.h5
new file mode 100644
index 00000000..59238c8c
--- /dev/null
+++ b/tests/ev_enum3.h5
diff --git a/tests/gen-ev-test.py b/tests/gen-ev-test.py
index ddfc273d..7300f604 100644
--- a/tests/gen-ev-test.py
+++ b/tests/gen-ev-test.py
@@ -27,3 +27,8 @@ array = numpy.zeros((100,1,1,2), dtype=float)
 with h5py.File('tests/ev_enum2.h5', 'w') as fh:
     fh.create_dataset('/data/a/data_array', data=array)
     fh.create_dataset('/data/b/data_array', data=array)
+
+array = numpy.zeros((1,1), dtype=float)
+
+with h5py.File('tests/ev_enum3.h5', 'w') as fh:
+    fh.create_dataset('/data/data_array', data=array)