Skip to content

Commit 9af49c9

Browse files
committed
base: add support for ADEiger module.
ZeroMQ library development package is required in the build stage of ADEiger module. There are some unreleased features we would like to use, regarding Pilatus4 support, what makes necessary a checkout after initializing the submodule. The EDEIGER_VERSION points to the latest commit, but should point to R3-6 when the version were tagged.
1 parent 739c53d commit 9af49c9

File tree

4 files changed

+10
-0
lines changed

4 files changed

+10
-0
lines changed

CHANGES.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
### New features
66

7+
* base: add support for ADEiger module. by @gustavosr8 in
8+
https://github.com/cnpem/epics-in-docker/pull/141
79
* base: add lakeshore340 module. by @guirodrigueslima in
810
https://github.com/cnpem/epics-in-docker/pull/123
911

base/Dockerfile

Lines changed: 1 addition & 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 \

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=58916bb98d643fe2772203359487a63b469c51e0

base/install_area_detector.sh

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

20+
git submodule update --init -j ${JOBS} \
21+
ADEiger
22+
23+
git -C ADEiger checkout ${ADEIGER_VERSION}
24+
2025
rm -rf .git
2126

2227
echo 'ADSupport/lib/linux*/libHDF5*plugin.so' > .lnls-keep-paths
@@ -26,6 +31,7 @@ cd configure
2631
module_releases="
2732
AREA_DETECTOR=${EPICS_MODULES_PATH}/areaDetector
2833
ADARAVIS=${EPICS_MODULES_PATH}/areaDetector/ADAravis
34+
ADEIGER=${EPICS_MODULES_PATH}/areaDetector/ADEiger
2935
ADGENICAM=${EPICS_MODULES_PATH}/areaDetector/ADGenICam
3036
ADSIMDETECTOR=${EPICS_MODULES_PATH}/areaDetector/ADSimDetector
3137
ADSUPPORT=${EPICS_MODULES_PATH}/areaDetector/ADSupport

0 commit comments

Comments
 (0)