Skip to content

Commit 6580469

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 6580469

File tree

5 files changed

+26
-0
lines changed

5 files changed

+26
-0
lines changed

CHANGES.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ for that release.
3333
https://github.com/cnpem/epics-in-docker/pull/146
3434
* base: add rgamv2 module and image. by @guirodrigueslima in
3535
https://github.com/cnpem/epics-in-docker/pull/143
36+
* base: add ADEiger module. by @gustavosr8 in
37+
https://github.com/cnpem/epics-in-docker/pull/141
3638

3739
## v0.14.1
3840

base/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ RUN apt update -y && \
2626
libsnmp-dev \
2727
libssl-dev \
2828
libtirpc-dev \
29+
libzmq3-dev \
2930
re2c \
3031
unzip \
3132
wget \
@@ -60,6 +61,7 @@ RUN NEEDS_TIRPC=YES $EPICS_IN_DOCKER/install_modules.sh
6061
COPY cagateway_versions.sh install_cagateway.sh $EPICS_IN_DOCKER
6162
RUN $EPICS_IN_DOCKER/install_cagateway.sh
6263

64+
COPY adeiger-remove-lz4.patch $EPICS_IN_DOCKER
6365
COPY area_detector_versions.sh install_area_detector.sh $EPICS_IN_DOCKER
6466
RUN $EPICS_IN_DOCKER/install_area_detector.sh
6567

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/area_detector_versions.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
AREA_DETECTOR_VERSION=R3-14
22
NDSSCPIMEGA_VERSION=1.0.0
33
LIBSSCPIMEGA_VERSION=fb8acf533a7c01b5266bf32d60d1a5f923e19523
4+
ADEIGER_VERSION=083243fd71b38a8c7d0bbd99d300077f4d65e441

base/install_area_detector.sh

Lines changed: 4 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
@@ -26,6 +29,7 @@ cd configure
2629
module_releases="
2730
AREA_DETECTOR=${EPICS_MODULES_PATH}/areaDetector
2831
ADARAVIS=${EPICS_MODULES_PATH}/areaDetector/ADAravis
32+
ADEIGER=${EPICS_MODULES_PATH}/areaDetector/ADEiger
2933
ADGENICAM=${EPICS_MODULES_PATH}/areaDetector/ADGenICam
3034
ADSIMDETECTOR=${EPICS_MODULES_PATH}/areaDetector/ADSimDetector
3135
ADSUPPORT=${EPICS_MODULES_PATH}/areaDetector/ADSupport

0 commit comments

Comments
 (0)