Skip to content
Snippets Groups Projects
Commit 1eedb3ab authored by Sylvester Joosten's avatar Sylvester Joosten
Browse files

Merge branch '56-use-athena-instead-of-reference_detector' into 'master'

Resolve "use Athena instead of reference_detector"

Closes #56

See merge request !48
parents 89c9b1e2 e04d7cc2
No related branches found
No related tags found
1 merge request!48Resolve "use Athena instead of reference_detector"
...@@ -5,7 +5,7 @@ variables: ...@@ -5,7 +5,7 @@ variables:
JUGGLER_VERSION: "v1.6.0" JUGGLER_VERSION: "v1.6.0"
NPDET_VERSION: "v0.5.0" NPDET_VERSION: "v0.5.0"
EICD_VERSION: "v0.1.0" EICD_VERSION: "v0.1.0"
DETECTOR_VERSION: "v0.2.0" DETECTOR_VERSION: "v0.1.0"
IP6_VERSION: "v0.2.0" IP6_VERSION: "v0.2.0"
## Spack github version ## Spack github version
......
...@@ -32,25 +32,25 @@ RUN cd /tmp ...@@ -32,25 +32,25 @@ RUN cd /tmp
&& rm -rf build juggler && rm -rf build juggler
## also install detector/ip geometries into opt ## also install detector/ip geometries into opt
## FIXME: need to add proper compact file install directly to the reference detector ## FIXME: need to add proper compact file install directly to the athena detector
## build ## build
ARG DETECTOR_VERSION="master" ARG DETECTOR_VERSION="master"
ARG IP6_VERSION="master" ARG IP6_VERSION="master"
ARG ACCELERATOR_VERSION="master" ARG ACCELERATOR_VERSION="master"
RUN cd /tmp \ RUN cd /tmp \
&& DETECTOR_PREFIX=/opt/detector \ && DETECTOR_PREFIX=/opt/detector \
&& DETECTOR_DATA=$DETECTOR_PREFIX/share/reference_detector \ && DETECTOR_DATA=$DETECTOR_PREFIX/share/athena \
&& mkdir -p /opt/detector/share/reference_detector \ && mkdir -p /opt/detector/share/athena \
&& echo "INSTALLING REFERENCE DETECTOR" \ && echo "INSTALLING REFERENCE DETECTOR" \
&& git clone -b ${DETECTOR_VERSION} \ && git clone -b ${DETECTOR_VERSION} \
https://eicweb.phy.anl.gov/EIC/detectors/reference_detector.git \ https://eicweb.phy.anl.gov/EIC/detectors/athena.git \
&& cmake -B build -S reference_detector -DCMAKE_CXX_STANDARD=17 \ && cmake -B build -S athena -DCMAKE_CXX_STANDARD=17 \
-DCMAKE_INSTALL_PREFIX=${DETECTOR_PREFIX} \ -DCMAKE_INSTALL_PREFIX=${DETECTOR_PREFIX} \
&& cmake --build build -j12 -- install \ && cmake --build build -j12 -- install \
&& cp -r reference_detector/compact \ && cp -r athena/compact \
reference_detector/reference_detector.xml \ athena/athena.xml \
${DETECTOR_DATA} \ ${DETECTOR_DATA} \
&& rm -rf build reference_detector \ && rm -rf build athena \
&& echo "INSTALLING IP6 GEOMETRY" \ && echo "INSTALLING IP6 GEOMETRY" \
&& git clone -b ${IP6_VERSION} \ && git clone -b ${IP6_VERSION} \
https://eicweb.phy.anl.gov/EIC/detectors/ip6.git \ https://eicweb.phy.anl.gov/EIC/detectors/ip6.git \
...@@ -63,4 +63,3 @@ RUN cd /tmp ...@@ -63,4 +63,3 @@ RUN cd /tmp
&& echo "ADDING SETUP SCRIPT" \ && echo "ADDING SETUP SCRIPT" \
&& echo "export LD_LIBRARY_PATH=/opt/detector/lib:\$LD_LIBRARY_PATH" \ && echo "export LD_LIBRARY_PATH=/opt/detector/lib:\$LD_LIBRARY_PATH" \
> /opt/detector/setup.sh > /opt/detector/setup.sh
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment