Merge pull request #799 from ratt-ru/stimela2_updates

Stimela2 updates

Author: SpheMakh

stimela/cargo/base/stimela2/Dockerfile

@@ -18,7 +18,7 @@ RUN docker-apt-install cmake \
     wcslib-dev \
     libhdf5-serial-dev \
     libfftw3-dev \
-    python-numpy \
+    python3-numpy \
     libboost-python-dev \
     libboost-all-dev \
     libpython2.7-dev \
@@ -27,6 +27,38 @@ RUN docker-apt-install cmake \
     casacore-dev \
     wsclean
 
-RUN pip install cult-curgo stimela quartical breizorro 
+RUN docker-apt-install python3-pip
+RUN pip install cult-cargo stimela quartical \
+    aimfast \
+    astro-tigger-lsm \
+    bdsf \
+    breizorro \
+    casaconfig \
+    casadata \
+    casatasks \
+    casatools
+
+RUN docker-apt-install \
+    git \
+    xvfb \
+    curl
+
+RUN pip install -U "git+https://github.com/caracal-pipeline/stimela.git"
+RUN pip install -U "git+https://github.com/caracal-pipeline/cult-cargo.git"
+
 RUN ulimit -p 11000
-RUN stimela
+RUN stimela --help
+
+RUN ln -s /usr/bin/python3 /usr/bin/python
+RUN mkdir -p /opt/casa/data
+COPY casasiteconfig.py /opt/casa
+ENV CASASITECONFIG /opt/casa/casasiteconfig.py
+RUN python -m casaconfig --measurespath /opt/casa/data --update-all
+RUN python -m casaconfig --measurespath /opt/casa/data --current-data
+# point to CASA data
+RUN mkdir -p /usr/local/share/data/
+RUN ln -s /opt/casa/data /usr/local/share/data/casacore
+COPY xvfb.init.d /etc/init.d/xvfb
+RUN chmod 755 /etc/init.d/xvfb
+RUN chmod 777 /var/run
+ENV DISPLAY :99

stimela/cargo/base/stimela2/casasiteconfig.py

@@ -0,0 +1,4 @@
+import casadata
+measurespath = casadata.datapath
+measures_auto_update = False
+data_auto_update = False

stimela/cargo/base/stimela2/xvfb.init.d

@@ -0,0 +1,25 @@
+XVFB=/usr/bin/Xvfb
+XVFBARGS=":99 -screen 0 1024x768x24 -fbdir /var/run -ac"
+RGS=":99 -screen 0 1024x768x24 -fbdir /var/run -ac"
+PIDFILE=/var/run/xvfb.pid
+case "$1" in
+  start)
+      echo -n "Starting virtual X frame buffer: Xvfb"
+      start-stop-daemon --start --quiet --pidfile $PIDFILE --make-pidfile --background --exec $XVFB -- $XVFBARGS
+      echo "."
+      ;;
+  stop)
+      echo -n "Stopping virtual X frame buffer: Xvfb"
+      start-stop-daemon --stop --quiet --pidfile $PIDFILE
+      echo "."
+      ;;
+  restart)
+      $0 stop
+      $0 start
+      ;;
+  *)
+      echo "Usage: /etc/init.d/xvfb {start|stop|restart}"
+      exit 1
+esac
+
+exit 0

stimela/cargo/cab/stimela2/src/run.py

@@ -1,3 +1,4 @@
+#!/usr/bin/env python3
 import os
 import sys
 import shlex