Merge tmss fixes. Adjust for production roll-out

README

@@ -25,6 +25,9 @@ Additionally, make sure to run in the docker-launch-msplots.sh script with envir
 whatever you defined for PYAUTOPLOT_TAG). Therefore copy the default inspection-plots-observations.sh script and modify
 the --export=TAG=latest line, e.g:
 
+
+Also in docker/Dockerfile checkout the right branch. TODO: Automate this
+
 ----------------------------------------------------
 
 #!/bin/bash

docker/Dockerfile

@@ -186,7 +186,7 @@ RUN apt-get update -y && \
 
 RUN A=$CX; git clone https://git.astron.nl/ao/sdco/pyautoplot.git ${INSTALLDIR}/pyautoplot && \
     cd ${INSTALLDIR}/pyautoplot && \
-    git checkout tmss && \
+    git checkout master && \
     python3 setup.py install
 
 

launch/dynspec-observation-quick.sh

+#!/bin/bash
+
+function remote_parset_lookup() {
+    parset_host=$1
+    sas_id=$2
+    parset_key=$3
+
+    ssh $parset_host "grep $parset_key /localhome/lofarsystem/parsets/rtcp-$sas_id.parset" 2>/dev/null;
+}
+
+
+function sas_id_project() {
+    sas_id=$1
+    remote_parset_lookup lofarsys@cbm001 $sas_id 'Observation.Campaign.name'|sed -e's/=/ /g' -e 's/"/ /g'|awk '{ print $2 }';
+}
+
+OBSID=$1
+PROJECT=`sas_id_project ${OBSID}`
+
+if [ ! -d /data/dynspec/${PROJECT} ]; then mkdir /data/dynspec/${PROJECT}; fi
+
+exec sbatch \
+    --partition=cpu \
+    --ntasks=1 --cpus-per-task=1 \
+    --job-name="dynspec-quick-$OBSID" \
+    --output=/data/log/dynspec-quick-$OBSID.log \
+    --export=TAG=latest \
+    /data/home/lofarsys/dynspec/scripts/docker-dynspec-quick.sh "${OBSID}" "${PROJECT}"

launch/dynspec-observation-rebin.sh

+#!/bin/bash
+
+function remote_parset_lookup() {
+    parset_host=$1
+    sas_id=$2
+    parset_key=$3
+
+    ssh $parset_host "grep $parset_key /localhome/lofarsystem/parsets/rtcp-$sas_id.parset" 2>/dev/null;
+}
+
+
+function sas_id_project() {
+    sas_id=$1
+    remote_parset_lookup lofarsys@cbm001 $sas_id 'Observation.Campaign.name'|sed -e's/=/ /g' -e 's/"/ /g'|awk '{ print $2 }';
+}
+
+OBSID=$1
+PROJECT=`sas_id_project ${OBSID}`
+
+if [ ! -d /data/dynspec/${PROJECT} ]; then mkdir /data/dynspec/${PROJECT}; fi
+
+exec sbatch \
+    --partition=cpu \
+    --ntasks=1 --cpus-per-task=1 \
+    --job-name="dynspec-rebin-$OBSID" \
+    --output=/data/log/dynspec-rebin-$OBSID.log \
+    --export=TAG=latest \
+    /data/home/lofarsys/dynspec/scripts/docker-dynspec-rebin.sh "${OBSID}" "${PROJECT}"

launch/inspection-dynspec-observation.sh

+#!/bin/bash
+
+echo "Launching Pyautoplot..."
+/usr/local/bin/inspection-plots-observation.sh $@
+
+echo "Launching QuickLook..."
+/data/home/lofarsys/dynspec/scripts/dynspec-observation-quick.sh $@
+
+echo "Launching Rebin..."
+/data/home/lofarsys/dynspec/scripts/dynspec-observation-rebin.sh $@

launch/inspection-plots-observation.sh

+#!/bin/bash
+OBSID=$1
+
+exec sbatch \
+    --partition=cpu \
+    --nice=500 --time=1-0 \
+    --qos=inspectionplots \
+    --ntasks=49 --cpus-per-task=2 \
+    --ntasks-per-node=7 \
+    --job-name="inspection-$OBSID" \
+    --output=/data/log/inspection-plots-$OBSID.log \
+    --export=TAG=latest \
+    docker-launch-msplots.sh "$@"

scripts/launch-msplots.sh

@@ -13,12 +13,11 @@
 # depending on the TAG environment variable (if it exists and doesn't say 'latest'). For normal use, leave TESTLINE an
 # empty string (""). Note that TESTLINE doesn't necessarily propagate to programs/scripts called from within this one.
 #TESTLINE="-test"
-TESTLINE="-tmss"
-#TESTLINE=""
+TESTLINE=""
 
 # Normally, one would want to use pyautoplot:latest (PYAUTOPLOT_TAG=latest). This can be overriden however
-PYAUTOPLOT_TAG=tmss
-#PYAUTOPLOT_TAG=latest
+#PYAUTOPLOT_TAG=test
+PYAUTOPLOT_TAG=latest
 
 HOSTNAME=`hostname`
 PATH="$PATH:/opt/cep/pyautoplot/bin"