From 9ff36c70a7a27fb6fd86068483a47d9efb606245 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Wed, 1 Jul 2020 11:02:08 +0200 Subject: Handle event expansion even for single-event files --- tests/CMakeLists.txt | 7 +++++ tests/ev_enum3.c | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++ tests/ev_enum3.geom | 12 +++++++++ tests/ev_enum3.h5 | Bin 0 -> 4752 bytes tests/gen-ev-test.py | 5 ++++ 5 files changed, 97 insertions(+) create mode 100644 tests/ev_enum3.c create mode 100644 tests/ev_enum3.geom create mode 100644 tests/ev_enum3.h5 (limited to 'tests') 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 + * + * 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 . + * + */ + +#ifdef HAVE_CONFIG_H +#include +#endif + + +#include +#include +#include +#include + +#include + +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 Binary files /dev/null and b/tests/ev_enum3.h5 differ 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) -- cgit v1.2.3