Skip to content

Commit

Permalink
base: add NDSSCPimega areaDetector plugin.
Browse files Browse the repository at this point in the history
This plugin computes the geometric restoration for PiMega detectors
based on the LNLS ssc-pimega library, and allows Pimega IOC to provide
coherent data to users.

Even though ADPimega is not yet supported, this plugin can still be used
with ADSimDetector for debugging purposes. Furthermore, it makes it
possible to build ADPimega (and its IOC) out of epics-in-docker, but
still using NDSSCPimega from base.

ssc-pimega repository does not have tag for version 0.8.13. Thus, commit
hash is used instead.
  • Loading branch information
henriquesimoes authored and ericonr committed Nov 29, 2023
1 parent 9a63e04 commit 185c6b4
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 0 deletions.
3 changes: 3 additions & 0 deletions base/.env
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ IPAC_VERSION=2.16
CAPUTLOG_VERSION=R4.0

AREA_DETECTOR_VERSION=R3-12-1
NDSSCPIMEGA_VERSION=1.0.0

MOTOR_VERSION=R7-3-1
PMAC_VERSION=2-6-1

LIBSSCPIMEGA_VERSION=fb8acf533a7c01b5266bf32d60d1a5f923e19523
3 changes: 3 additions & 0 deletions base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,12 @@ ARG IPAC_VERSION
ARG CAPUTLOG_VERSION

ARG AREA_DETECTOR_VERSION
ARG NDSSCPIMEGA_VERSION
ARG MOTOR_VERSION
ARG PMAC_VERSION

ARG LIBSSCPIMEGA_VERSION

WORKDIR ${EPICS_MODULES_PATH}
COPY install_modules.sh .
RUN ./install_modules.sh
Expand Down
2 changes: 2 additions & 0 deletions base/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,7 @@ services:
IPAC_VERSION: ${IPAC_VERSION}
CAPUTLOG_VERSION: ${CAPUTLOG_VERSION}
AREA_DETECTOR_VERSION: ${AREA_DETECTOR_VERSION}
NDSSCPIMEGA_VERSION: ${NDSSCPIMEGA_VERSION}
MOTOR_VERSION: ${MOTOR_VERSION}
PMAC_VERSION: ${PMAC_VERSION}
LIBSSCPIMEGA_VERSION: ${LIBSSCPIMEGA_VERSION}
15 changes: 15 additions & 0 deletions base/install_area_detector.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

set -ex

. /opt/epics/install-functions.sh

git clone --depth 1 --branch ${AREA_DETECTOR_VERSION} \
https://github.com/areaDetector/areaDetector

Expand Down Expand Up @@ -96,3 +98,16 @@ git apply --directory ADSupport ${EPICS_MODULES_PATH}/nanohttp_stream.patch

make -j${JOBS}
make clean

cd ..

download_github_module cnpem ssc-pimega $LIBSSCPIMEGA_VERSION
make -C ssc-pimega/c install

install_github_module cnpem NDSSCPimega NDSSCPIMEGA $NDSSCPIMEGA_VERSION "
EPICS_BASE = ${EPICS_BASE_PATH}
ASYN=${EPICS_MODULES_PATH}/asyn
AREA_DETECTOR=${EPICS_MODULES_PATH}/areaDetector
ADCORE=${EPICS_MODULES_PATH}/areaDetector/ADCore
"

0 comments on commit 185c6b4

Please sign in to comment.