BugID: 880

Use LOFARDATAROOT instead of /opt/lofar/data to make tests system independent

CEP/BB/BBSKernel/test/tBandpass.run

@@ -8,8 +8,8 @@ echo "--------------- START $1 ---------------"
 
 # check for input files
 if [[ ! ( -r tBandpass.in_parmdb_$1 && -r tBandpass.in_parset_$1 && -r tBandpass.in_stdout_$1 ) ]]; then
-    echo "$1: FAIL (not all input files found)"
-    return 1
+    echo "$1: not all input files found"
+    return 3
 fi
 
 # construct sky_model ParmDB

CEP/BB/BBSKernel/test/tCorrect.run

@@ -14,7 +14,10 @@ if [ $? != 0 ]; then
 fi
 
 \rm -rf tCorrect_tmp.MS1
-cp -r /opt/lofar/data/BBS2/demo3.MS_p1 tCorrect_tmp.MS1
+if [ ! -d $LOFARDATAROOT/BBS2/demo3.MS_p1 ]; then
+  exit 3
+fi
+cp -r $LOFARDATAROOT/BBS2/demo3.MS_p1 tCorrect_tmp.MS1
 
 $LOFAR_CHECKTOOL ./tCorrect $USER tCorrect_tmp.MS1 tCorrect_tmp.demo_instr tCorrect_tmp.demo_sky
 status=$?

CEP/BB/BBSKernel/test/tMSData.run

@@ -10,15 +10,20 @@ fi
 # Create the ParmDB tables for tMSData.
 $srcdir/makeDemoParmDB tMSData
 
-echo "run1 ..."
-$LOFAR_CHECKTOOL ./tMSData /opt/lofar/data/BBS2/demo3.MS $USER /opt/lofar/data/BBS2/demo3.MS_p1 tMSData_tmp.demo_instr tMSData_tmp.demo_sky 0 100 MODEL_DATA
-status=$?
+status=3
+if [ -d $LOFARDATAROOT/BBS2/demo3.MS -a -d $LOFARDATAROOT/BBS2/demo3.MS_p1 ]; then
+  echo "run1 ..."
+  $LOFAR_CHECKTOOL ./tMSData $LOFARDATAROOT/BBS2/demo3.MS $USER $LOFARDATAROOT/BBS2/demo3.MS_p1 tMSData_tmp.demo_instr tMSData_tmp.demo_sky 0 100 MODEL_DATA
+  status=$?
+fi
 
 echo "run2 ..."
-$LOFAR_CHECKTOOL ./tMSData /opt/lofar/data/BBS2/3C343/10008336.MS $USER /opt/lofar/data/BBS2/3C343/10008336.MS_p1 tMSData_tmp.demo_instr tMSData_tmp.demo_sky 0 14 DATA
-stat=$?
-if [ $stat != 0 ]; then
-  status=$stat
+if [ -d $LOFARDATAROOT/BBS2/3C343/10008336.MS -a -d $LOFARDATAROOT/BBS2/3C343/10008336.MS_p1 ]; then
+  $LOFAR_CHECKTOOL ./tMSData $LOFARDATAROOT/BBS2/3C343/10008336.MS $USER $LOFARDATAROOT/BBS2/3C343/10008336.MS_p1 tMSData_tmp.demo_instr tMSData_tmp.demo_sky 0 14 DATA
+  stat=$?
+  if [ $stat != 0 ]; then
+    status=$stat
+  fi
 fi
 
 # Try to do a test with multiple bands by creating an MS with 2 bands.

CEP/BB/BBSKernel/test/tPerturbed.run

@@ -13,26 +13,30 @@ if [ $? != 0 ]; then
   exit 1
 fi
 
+if [ ! -d $LOFARDATAROOT/BBS2/demo3.MS_p1 ]; then
+  exit 3
+fi
+
 echo "run1 ..."
-$LOFAR_CHECKTOOL ./tPerturbed $USER /opt/lofar/data/BBS2/demo3.MS_p1 tPerturbed_tmp.demo_instr tPerturbed_tmp.demo_sky TOTALGAIN.REALIMAG 'RA:*' 'DEC:*' 'StokesI:*'
+$LOFAR_CHECKTOOL ./tPerturbed $USER $LOFARDATAROOT/BBS2/demo3.MS_p1 tPerturbed_tmp.demo_instr tPerturbed_tmp.demo_sky TOTALGAIN.REALIMAG 'RA:*' 'DEC:*' 'StokesI:*'
 status=$?
 
 echo "run2 ..."
-$LOFAR_CHECKTOOL ./tPerturbed $USER /opt/lofar/data/BBS2/demo3.MS_p1 tPerturbed_tmp.demo_instr tPerturbed_tmp.demo_sky TOTALGAIN 'RA:*' 'DEC:*' 'StokesI:*'
+$LOFAR_CHECKTOOL ./tPerturbed $USER $LOFARDATAROOT/BBS2/demo3.MS_p1 tPerturbed_tmp.demo_instr tPerturbed_tmp.demo_sky TOTALGAIN 'RA:*' 'DEC:*' 'StokesI:*'
 stat=$?
 if [ $stat != 0 ]; then
   status=$stat
 fi
 
 echo "run3 ..."
-$LOFAR_CHECKTOOL ./tPerturbed $USER /opt/lofar/data/BBS2/demo3.MS_p1 tPerturbed_tmp.demo_instr tPerturbed_tmp.demo_sky TOTALGAIN 'gain:*'
+$LOFAR_CHECKTOOL ./tPerturbed $USER $LOFARDATAROOT/BBS2/demo3.MS_p1 tPerturbed_tmp.demo_instr tPerturbed_tmp.demo_sky TOTALGAIN 'gain:*'
 stat=$?
 if [ $stat != 0 ]; then
   status=$stat
 fi
 
 echo "run4 ..."
-$LOFAR_CHECKTOOL ./tPerturbed $USER /opt/lofar/data/BBS2/demo3.MS_p1 tPerturbed_tmp.demo_instr tPerturbed_tmp.demo_sky TOTALGAIN 'RA:*' 'DEC:*' 'StokesI:*'
+$LOFAR_CHECKTOOL ./tPerturbed $USER $LOFARDATAROOT/BBS2/demo3.MS_p1 tPerturbed_tmp.demo_instr tPerturbed_tmp.demo_sky TOTALGAIN 'RA:*' 'DEC:*' 'StokesI:*'
 stat=$?
 if [ $stat != 0 ]; then
   status=$stat

CEP/BB/BBSKernel/test/tPredSolv.run

@@ -13,7 +13,11 @@ if [ $? != 0 ]; then
   exit 1
 fi
 
-$LOFAR_CHECKTOOL ./tPredSolv $USER /opt/lofar/data/BBS2/demo3.MS_p1 tPredSolv_tmp.demo_instr tPredSolv_tmp.demo_sky
+if [ ! -d $LOFARDATAROOT/BBS2/demo3.MS_p1 ]; then
+  exit 3
+fi
+
+$LOFAR_CHECKTOOL ./tPredSolv $USER $LOFARDATAROOT/BBS2/demo3.MS_p1 tPredSolv_tmp.demo_instr tPredSolv_tmp.demo_sky
 status=$?
 exit $status
 

CEP/BB/BBSKernel/test/tPredict.run

@@ -14,7 +14,10 @@ if [ $? != 0 ]; then
 fi
 
 \rm -rf tPredict_tmp.MS1
-cp -r /opt/lofar/data/BBS2/demo3.MS_p1 tPredict_tmp.MS1
+if [ ! -d $LOFARDATAROOT/BBS2/demo3.MS_p1 ]; then
+  exit 3
+fi
+cp -r $LOFARDATAROOT/BBS2/demo3.MS_p1 tPredict_tmp.MS1
 
 $LOFAR_CHECKTOOL ./tPredict $USER tPredict_tmp.MS1 tPredict_tmp.demo_instr tPredict_tmp.demo_sky
 status=$?

CEP/BB/BBSKernel/test/tSubtract.run

@@ -14,7 +14,10 @@ if [ $? != 0 ]; then
 fi
 
 \rm -rf tSubtract_tmp.MS1
-cp -r /opt/lofar/data/BBS2/demo3.MS_p1 tSubtract_tmp.MS1
+if [ ! -d $LOFARDATAROOT/BBS2/demo3.MS_p1 ]; then
+  exit 3
+fi
+cp -r $LOFARDATAROOT/BBS2/demo3.MS_p1 tSubtract_tmp.MS1
 
 $LOFAR_CHECKTOOL ./tSubtract $USER tSubtract_tmp.MS1 tSubtract_tmp.demo_instr tSubtract_tmp.demo_sky
 status=$?