Skip to content

Commit bf49151

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 9e2b4d8 commit bf49151

File tree

4 files changed

+28
-1
lines changed

4 files changed

+28
-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.1-0
15+
NDSSCPIMEGA_VERSION=1.0.0-0
1516
MOTOR_VERSION=R7-3-1
1617

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

base/Dockerfile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ FROM debian:${DEBIAN_VERSION}
55
ARG JOBS
66

77
ARG LIBPIMEGA_VERSION
8+
ARG LIBSSCPIMEGA_VERSION
89

910
ENV DEBIAN_FRONTEND noninteractive
1011

@@ -23,7 +24,9 @@ RUN apt update -y && \
2324
wget \
2425
ca-certificates
2526

26-
RUN TAR_PACKAGES="http://gca-jobs:1234/packages/libpimega_${LIBPIMEGA_VERSION}_amd64.tar.gz" && \
27+
RUN TAR_PACKAGES="\
28+
http://gca-jobs:1234/packages/libpimega_${LIBPIMEGA_VERSION}_amd64.tar.gz \
29+
http://gca-jobs:1234/packages/libsscpimega_${LIBSSCPIMEGA_VERSION}_amd64.tar.gz" && \
2730
for url in $TAR_PACKAGES; do \
2831
download_dir=$(mktemp -d) && \
2932
wget $url -P $download_dir && \
@@ -51,6 +54,7 @@ ARG RECCASTER_VERSION
5154
ARG IPAC_VERSION
5255
ARG AREA_DETECTOR_VERSION
5356
ARG ADPIMEGA_VERSION
57+
ARG NDSSCPIMEGA_VERSION
5458
ARG MOTOR_VERSION
5559

5660
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: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,25 @@ git apply --directory ADSupport ${EPICS_MODULES_PATH}/nanohttp_stream.patch
9797
make -j${JOBS}
9898
make clean
9999

100+
cd ..
101+
102+
wget http://gca-jobs:1234/packages/ndsscpimega_${NDSSCPIMEGA_VERSION}.tar.gz -P /tmp
103+
tar --no-same-owner -xvf /tmp/ndsscpimega_${NDSSCPIMEGA_VERSION}.tar.gz
104+
105+
echo "
106+
EPICS_BASE = ${EPICS_BASE_PATH}
107+
108+
ASYN=${EPICS_MODULES_PATH}/asyn
109+
AREA_DETECTOR=${EPICS_MODULES_PATH}/areaDetector
110+
ADCORE=${EPICS_MODULES_PATH}/areaDetector/ADCore
111+
" > NDSSCPimega/configure/RELEASE
112+
113+
make -C NDSSCPimega
114+
115+
echo "NDSSCPIMEGA=${EPICS_MODULES_PATH}/NDSSCPimega" >> ${EPICS_MODULES_PATH}/../RELEASE
116+
117+
cd areaDetector
118+
100119
wget http://gca-jobs:1234/packages/ad-pimega_${ADPIMEGA_VERSION}.tar.gz -P /tmp
101120
tar --no-same-owner -xvf /tmp/ad-pimega_${ADPIMEGA_VERSION}.tar.gz
102121

0 commit comments

Comments
 (0)