aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2019-05-08 13:54:18 +0200
committerThomas White <taw@physics.org>2019-05-14 10:02:50 +0200
commit59770f9bffbd47de5b518244a6dfcfbdfc8dad09 (patch)
tree43cd4f4bc25ca028b6af045737ad8e92426f8594
parentda02f33cf3722fb1533c4277f3b1cfcf079d4b2f (diff)
Move Histogram out of API
It's only used by two test programs
-rw-r--r--libcrystfel/CMakeLists.txt2
-rw-r--r--libcrystfel/doc/index.md1
-rw-r--r--tests/CMakeLists.txt4
-rw-r--r--tests/histogram.c (renamed from libcrystfel/src/histogram.c)0
-rw-r--r--tests/histogram.h (renamed from libcrystfel/src/histogram.h)0
-rw-r--r--tests/integration_check.c3
-rw-r--r--tests/prof2d_check.c3
7 files changed, 6 insertions, 7 deletions
diff --git a/libcrystfel/CMakeLists.txt b/libcrystfel/CMakeLists.txt
index 6d0cd8dc..97ab8de3 100644
--- a/libcrystfel/CMakeLists.txt
+++ b/libcrystfel/CMakeLists.txt
@@ -62,7 +62,6 @@ set(LIBCRYSTFEL_SOURCES
src/xds.c
src/integration.c
src/predict-refine.c
- src/histogram.c
src/events.c
src/felix.c
src/peakfinder8.c
@@ -102,7 +101,6 @@ set(LIBCRYSTFEL_HEADERS
src/xds.h
src/predict-refine.h
src/integration.h
- src/histogram.h
src/events.h
src/asdf.h
src/felix.h
diff --git a/libcrystfel/doc/index.md b/libcrystfel/doc/index.md
index 16868fef..3ffb3dc1 100644
--- a/libcrystfel/doc/index.md
+++ b/libcrystfel/doc/index.md
@@ -39,7 +39,6 @@ API documentation
* Mathematical constructions:
* \ref integer_matrix.h "Integer matrices"
* \ref rational.h "Rational numbers (including rational matrices)"
- * \ref histogram.h "Simple histogram"
* \ref index.h "Top-level indexing system"
* \ref xgandalf.h "XGANDALF indexer interface"
* \ref xds.h "XDS indexer inderface"
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index beb141c3..af22977e 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -28,7 +28,7 @@ target_include_directories(centering_check PRIVATE ${COMMON_INCLUDES})
target_link_libraries(centering_check ${COMMON_LIBRARIES})
add_test(centering_check centering_check)
-add_executable(integration_check integration_check.c)
+add_executable(integration_check integration_check.c histogram.c)
target_include_directories(integration_check PRIVATE ${COMMON_INCLUDES})
target_link_libraries(integration_check PRIVATE ${COMMON_LIBRARIES})
if (CURSES_FOUND)
@@ -47,7 +47,7 @@ target_include_directories(prediction_gradient_check PRIVATE ${COMMON_INCLUDES})
target_link_libraries(prediction_gradient_check ${COMMON_LIBRARIES})
add_test(prediction_gradient_check prediction_gradient_check)
-add_executable(prof2d_check prof2d_check.c)
+add_executable(prof2d_check prof2d_check.c histogram.c)
target_include_directories(prof2d_check PRIVATE ${COMMON_INCLUDES})
target_link_libraries(prof2d_check PRIVATE ${COMMON_LIBRARIES})
if (CURSES_FOUND)
diff --git a/libcrystfel/src/histogram.c b/tests/histogram.c
index 69acd987..69acd987 100644
--- a/libcrystfel/src/histogram.c
+++ b/tests/histogram.c
diff --git a/libcrystfel/src/histogram.h b/tests/histogram.h
index 2b9d4928..2b9d4928 100644
--- a/libcrystfel/src/histogram.h
+++ b/tests/histogram.h
diff --git a/tests/integration_check.c b/tests/integration_check.c
index 65241612..a6ceb2c4 100644
--- a/tests/integration_check.c
+++ b/tests/integration_check.c
@@ -36,7 +36,8 @@
#include <image.h>
#include <utils.h>
-#include <histogram.h>
+
+#include "histogram.h"
#include "../libcrystfel/src/integration.c"
diff --git a/tests/prof2d_check.c b/tests/prof2d_check.c
index 8b9de871..803e60c4 100644
--- a/tests/prof2d_check.c
+++ b/tests/prof2d_check.c
@@ -36,7 +36,8 @@
#include <image.h>
#include <utils.h>
-#include <histogram.h>
+
+#include "histogram.h"
#include "../libcrystfel/src/integration.c"