Skip to content

Commit 44dde23

Browse files
committed
base: add ADEiger module.
This module uses libzmq to interact with the detector data stream. Since Pilatus4 support hasn't been released yet and we are interested in using it, we are using the latest commit from the master branch instead of a tagged release. Unfortunately, this commit also adds an unwanted dependency on lz4 for the tests scripts, that are being removed in an unmerged PR [1]. Add a patch to remove this dependency. [1]: areaDetector/ADEiger#91
1 parent 4a3c4a8 commit 44dde23

File tree

3 files changed

+21
-0
lines changed

3 files changed

+21
-0
lines changed

base/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ RUN NEEDS_TIRPC=YES $EPICS_IN_DOCKER/install_modules.sh
6060
COPY cagateway_versions.sh install_cagateway.sh $EPICS_IN_DOCKER
6161
RUN $EPICS_IN_DOCKER/install_cagateway.sh
6262

63+
COPY adeiger-remove-lz4.patch $EPICS_IN_DOCKER
6364
COPY area_detector_versions.sh install_area_detector.sh $EPICS_IN_DOCKER
6465
RUN $EPICS_IN_DOCKER/install_area_detector.sh
6566

base/adeiger-remove-lz4.patch

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
Adapted from: https://github.com/areaDetector/ADEiger/pull/91
2+
diff --git a/eigerApp/src/Makefile b/eigerApp/src/Makefile
3+
index b6cbe2f..db9de56 100755
4+
--- a/eigerApp/src/Makefile
5+
+++ b/eigerApp/src/Makefile
6+
@@ -31,11 +31,6 @@ else
7+
LIB_SYS_LIBS += hdf5_hl
8+
endif
9+
10+
-PROD += test_lz4
11+
-test_lz4_SRCS += test_lz4.cpp
12+
-test_lz4_LIBS += dectrisCompression
13+
-test_lz4_SYS_LIBS += lz4
14+
-
15+
include $(ADCORE)/ADApp/commonLibraryMakefile
16+
17+
#=============================

base/install_area_detector.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ git submodule update --init --depth 1 -j ${JOBS} \
1717
ADSupport \
1818
ADCore
1919

20+
download_from_github areaDetector ADEiger $ADEIGER_VERSION
21+
patch -d ADEiger -Np1 < ${EPICS_IN_DOCKER}/adeiger-remove-lz4.patch
22+
2023
rm -rf .git
2124

2225
echo 'ADSupport/lib/linux*/libHDF5*plugin.so' > .lnls-keep-paths

0 commit comments

Comments
 (0)