Task #1418: Clarified text and default settings in CalServer.conf

MAC/APL/PAC/Cal_Server/src/CalServer.conf.in

@@ -4,7 +4,8 @@
 
 # Define how many subbands should be calibrated.
 # Normal operation value: 512
-# Note: For testing purposes this could be set to 50 e.g. to produce the ACC more often.
+# Note: For testing purposes this could be set to 50 e.g. to produce the ACC 
+# more often.
 CalServer.N_SUBBANDS=512
 
 # Set name for various configuration files
@@ -16,25 +17,25 @@ CalServer.AntennaArraysFile=AntennaArrays.conf
 #
 # Set ACCTestEnable to 1 to enable reading from file ACCTestFile
 # If ACCTestEnable is set to 0 then the ACC is collected from the RSP hardware.
-# If extension is .bin then read file as binary. Extension .txt reads file as Blitz array.
+# If extension is .bin then read file as binary. Extension .txt reads 
+# file as Blitz array.
 CalServer.ACCTestEnable=0
 CalServer.ACCTestFile=ACC.txt
 
-# For testing purposes it is possible to not run the calibration algorithm
-# but pretend it has run. This will result in zero weights being sent
-# to clients.
-# For now the normal operation is DisableCalibration=1 and DisableACMProxy=0
+# Calibration is not implemented yet, but for testing purposes it is 
+# possible to not run the calibration algorithm but pretend it has run. 
+# This will result in zero weights being sent to clients.
+# ACMProxy is a subtask that asks the RSPDriver to autocorrelate each second 
+# another subband. The task is not used in normal operation; only use 
+# this when really needed!
+# The operational values are DisableCalibration=1 and DisableACMProxy=1
 CalServer.DisableCalibration=1
 CalServer.DisableACMProxy=1
-
+CalServer.DataDirectory=/localhome/data
 
 # ----- Flags to produce interim data files for debugging -----
 #       In normal operation these values should be set to 0
 
-# Directory where the interim datafiles are stored
-# When left empty the files are stored in /opt/lofar/bin !!
-CalServer.DataDirectory=/localhome/data
-
 # Write ACC's to file for debugging. 
 # Note: DisableCalibration should be 0 to produce this file.
 CalServer.WriteACCToFile=0