Skip to content

Commit 99d3cd6

Browse files
base: add NDSSCPimega areaDetector plugin.
This plugin computes the geometric restoration for Pimega detectors based on the LNLS sscpimega library, and allows Pimega IOC to provide coherent data to users.
1 parent e79cde5 commit 99d3cd6

File tree

4 files changed

+22
-1
lines changed

4 files changed

+22
-1
lines changed

base/.env

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ RECCASTER_VERSION=1.5
1212
IPAC_VERSION=2.16
1313
AREA_DETECTOR_VERSION=R3-12-1
1414
ADPIMEGA_VERSION=2.5.2-1
15+
NDSSCPIMEGA_VERSION=1.0.0
1516
MOTOR_VERSION=R7-3-1
1617

1718
LIBPIMEGA_VERSION=2.5.2-0
19+
LIBSSCPIMEGA_VERSION=0.8.12-0

base/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,11 @@ RUN apt update -y && \
2424
COPY lnls-get-n-unpack.sh /usr/local/bin/lnls-get-n-unpack
2525

2626
ARG LIBPIMEGA_VERSION
27+
ARG LIBSSCPIMEGA_VERSION
2728

2829
RUN lnls-get-n-unpack -r \
29-
http://gca-jobs:1234/packages/libpimega_${LIBPIMEGA_VERSION}_amd64.tar.gz
30+
http://gca-jobs:1234/packages/libpimega_${LIBPIMEGA_VERSION}_amd64.tar.gz \
31+
http://gca-jobs:1234/packages/libsscpimega_${LIBSSCPIMEGA_VERSION}_amd64.tar.gz
3032

3133
ARG EPICS_BASE_VERSION
3234
ENV EPICS_BASE_PATH /opt/epics/base
@@ -50,6 +52,7 @@ ARG RECCASTER_VERSION
5052
ARG IPAC_VERSION
5153
ARG AREA_DETECTOR_VERSION
5254
ARG ADPIMEGA_VERSION
55+
ARG NDSSCPIMEGA_VERSION
5356
ARG MOTOR_VERSION
5457

5558
WORKDIR ${EPICS_MODULES_PATH}

base/docker-compose.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,7 @@ services:
2323
IPAC_VERSION: ${IPAC_VERSION}
2424
AREA_DETECTOR_VERSION: ${AREA_DETECTOR_VERSION}
2525
ADPIMEGA_VERSION: ${ADPIMEGA_VERSION}
26+
NDSSCPIMEGA_VERSION: ${NDSSCPIMEGA_VERSION}
2627
MOTOR_VERSION: ${MOTOR_VERSION}
2728
LIBPIMEGA_VERSION: ${LIBPIMEGA_VERSION}
29+
LIBSSCPIMEGA_VERSION: ${LIBSSCPIMEGA_VERSION}

base/install_area_detector.sh

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

33
set -ex
44

5+
. /opt/epics/install-functions.sh
6+
57
git clone --depth 1 --branch ${AREA_DETECTOR_VERSION} \
68
https://github.com/areaDetector/areaDetector
79

@@ -97,6 +99,18 @@ git apply --directory ADSupport ${EPICS_MODULES_PATH}/nanohttp_stream.patch
9799
make -j${JOBS}
98100
make clean
99101

102+
cd ..
103+
104+
install_github_module cnpem NDSSCPimega NDSSCPIMEGA $NDSSCPIMEGA_VERSION "
105+
EPICS_BASE = ${EPICS_BASE_PATH}
106+
107+
ASYN=${EPICS_MODULES_PATH}/asyn
108+
AREA_DETECTOR=${EPICS_MODULES_PATH}/areaDetector
109+
ADCORE=${EPICS_MODULES_PATH}/areaDetector/ADCore
110+
"
111+
112+
cd areaDetector
113+
100114
lnls-get-n-unpack -l http://gca-jobs:1234/packages/ad-pimega_${ADPIMEGA_VERSION}.tar.gz
101115

102116
echo "

0 commit comments

Comments
 (0)