Bug 1578: Merge HEAD of branch MAC-20100929-1_0-release-branch with trunk

MAC/APL/APLCommon/src/swlevel

@@ -26,8 +26,8 @@
 #
 VERSION="v2.1 20100517"		# loading image 1 before starting RSPdriver
 BINDIR=/opt/lofar/bin
-LOGDIR=${BINDIR}/../log
-ETCDIR=${BINDIR}/../etc
+LOGDIR=/opt/lofar/log
+ETCDIR=/opt/lofar/etc
 LEVELTABLE=${ETCDIR}/swlevel.conf
 
 #
@@ -124,24 +124,23 @@ start_prog()
 		    # tenance etc.
 		    if [ "$user" = "lofarsys" ]; then
 			rm -f $LOGDIR/$prog.log*.? 1>/dev/null 2>&1
-			$BINDIR/$prog 1>/dev/null 2>&1 &
-			usleep 250000
+			$BINDIR/$prog 1>>$LOGDIR//$prog.stdout 2>&1 &
 		    fi
   		else
 		    if [ -n "$asroot" ]; then
 		       sudo rm -f $LOGDIR/$prog.log.? 1>/dev/null 2>&1
 		       if [ "$prog" = "RSPDriver" ]; then
 			   selectImage
-			   sudo -b $BINDIR/$prog 1>/dev/null 2>&1
+			   sudo -b $BINDIR/$prog 1>>$LOGDIR/$prog.stdout 2>&1
 		       else
-		           sudo -b $BINDIR/$prog 1>/dev/null 2>&1
+		           sudo -b $BINDIR/$prog 1>>$LOGDIR/$prog.stdout 2>&1
 		       fi
 		    else
 			rm -f $LOGDIR/$prog.log*.? 1>/dev/null 2>&1
-			$BINDIR/$prog 1>/dev/null 2>&1 &
+			$BINDIR/$prog 1>>$LOGDIR/$prog.stdout 2>&1 &
 		    fi
-		    usleep 250000
 		fi
+		usleep 250000
 		ps -ef | grep -v grep | egrep '[0-9][0-9] [a-zA-Z0-9/_.]*/'${prog}
 	fi
 }
@@ -199,7 +198,7 @@ stop_prog()
 	# when normal kill did not work, kill is with -9
 	for pid in `/sbin/pidof ${prog}`
 	do 
-		sleep 2
+		#sleep 2
 		echo "Hard killing ${prog}(${pid})"
 		$asroot kill -9 $pid 1>/dev/null 2>&1
 	done
@@ -245,20 +244,10 @@ status_prog()
 		fi
 		echo ${levelnr}:${prog}:${pid[*]} | awk -F: '{ printf "%s : %-25s %s\n", $1, $2, $3 }'
 		# Some Checks
-		# AMCServer needs two instances
-		if [ "$prog" == "AMCServer" -a $level -ge 3 ]; then
-		    if [ ${#pid[@]} -lt 2 ]; then 
-		       missing="$missing ${prog}[$levelnr]"
-		    fi
-		    if [ ${#pid[@]} -gt 2 ]; then 
-                       toomany="$toomany ${prog}[$levelnr]"
-		    fi
-		else
-		    # Other controllers must have one instance, only
+		# Controllers must have one instance, only
 		if [ ${#pid[@]} -ge 2 ]; then 
                      toomany="$toomany ${prog}[$levelnr]"
 		fi
-		fi
 		
 		# Check for missing controllers 
 		if [ "$pid" = "DOWN" -o "$pid" = "0" ]; then 
@@ -492,7 +481,5 @@ status_prog
 echo $level > /tmp/level.admin
 chmod ug+rw /tmp/level.admin
 date=`date +%Y-%m-%d\ %H:%M:%S`
-if [ -d /log -a -w /log ]; then
 echo [${date}]:$0 $* >> /log/swlevel.log
-fi  
 exit $level

MAC/Deployment/data/StaticMetaData/AntennaArrays/RS106-AntennaArrays.conf

@@ -364,7 +364,8 @@ HBA
    -12.699    -13.048     -0.008      -12.699    -13.048     -0.008 
     -8.538    -16.082     -0.001       -8.538    -16.082     -0.001 
     -4.375    -19.116      0.006       -4.375    -19.116      0.006 
-]LBA
+]
+LBA
 3 [ 6.985082976 52.874052410 51.632 ]
 96 x 2 x 3 [
     0.0000     0.0000      0.000       0.0000     0.0000      0.000 

MAC/Deployment/data/StaticMetaData/AntennaArrays/RS307-AntennaArrays.conf

@@ -364,7 +364,8 @@ HBA
     -5.620    -17.319      0.043       -5.620    -17.319      0.043 
     -0.546    -18.200      0.035       -0.546    -18.200      0.035 
      4.528    -19.081      0.027        4.528    -19.081      0.027 
-]LBA
+]
+LBA
 3 [ 6.680948207 52.803221976 58.381 ]
 96 x 2 x 3 [
      0.000     0.0000     0.0000        0.000     0.0000     0.0000 

MAC/Deployment/data/StaticMetaData/AntennaArrays/RS503-AntennaArrays.conf

@@ -364,7 +364,8 @@ HBA
    -18.165     -1.234      0.002      -18.165     -1.234      0.002 
    -17.094     -6.270     -0.001      -17.094     -6.270     -0.001 
    -16.022    -11.309     -0.004      -16.022    -11.309     -0.004 
-]LBA
+]
+LBA
 3 [ 6.850858101 52.945043059 47.184 ]
 96 x 2 x 3 [
      0.000     0.0000      0.000        0.000     0.0000      0.000