bug 1362: use LDA writer by default if available; and fixed bug in LDA writer

RTCP/Storage/src/MSWriterLDA.cc

@@ -251,6 +251,7 @@ namespace LOFAR
 
       BF_BeamGroup beam = sap.beam(beamNr);
 
+      beam.create();
       beam.groupType()   .set("Beam");
       beam.nofStations() .set(parset.nrStations());
       beam.stationsList().set(parset.allStationNames()); // TODO: SS beamformer, support subsets of allStations

RTCP/Storage/src/OutputThread.cc

@@ -151,15 +151,15 @@ void OutputThread::createMS()
   LOG_INFO_STR(itsLogPrefix << "Writing to " << path);
 
   try {
-#ifdef USE_DAL  
+#ifdef USE_LDA
     if (path.rfind(".h5") == path.length() - strlen(".h5")) {
       // HDF5 writer requested
       switch (itsOutputType) {
         case COHERENT_STOKES:
-          itsWriter = new MSWriterDAL<float,3>(path.c_str(), itsParset, itsOutputType, itsStreamNr, itsIsBigEndian);
+          itsWriter = new MSWriterLDA<float,3>(path.c_str(), itsParset, itsOutputType, itsStreamNr, itsIsBigEndian);
           break;
         case BEAM_FORMED_DATA:
-          itsWriter = new MSWriterDAL<float,4>(path.c_str(), itsParset, itsOutputType, itsStreamNr, itsIsBigEndian);
+          itsWriter = new MSWriterLDA<float,4>(path.c_str(), itsParset, itsOutputType, itsStreamNr, itsIsBigEndian);
           break;
         default:
           THROW(StorageException, "HDF5 not supported for this data type");
@@ -167,15 +167,15 @@ void OutputThread::createMS()
     } else {
       itsWriter = new MSWriterFile(path, itsOutputType == COHERENT_STOKES || itsOutputType == BEAM_FORMED_DATA || itsOutputType == INCOHERENT_STOKES);
     }
-#elif defined USE_LDA
+#elif defined USE_DAL  
     if (path.rfind(".h5") == path.length() - strlen(".h5")) {
       // HDF5 writer requested
       switch (itsOutputType) {
         case COHERENT_STOKES:
-          itsWriter = new MSWriterLDA<float,3>(path.c_str(), itsParset, itsOutputType, itsStreamNr, itsIsBigEndian);
+          itsWriter = new MSWriterDAL<float,3>(path.c_str(), itsParset, itsOutputType, itsStreamNr, itsIsBigEndian);
           break;
         case BEAM_FORMED_DATA:
-          itsWriter = new MSWriterLDA<float,4>(path.c_str(), itsParset, itsOutputType, itsStreamNr, itsIsBigEndian);
+          itsWriter = new MSWriterDAL<float,4>(path.c_str(), itsParset, itsOutputType, itsStreamNr, itsIsBigEndian);
           break;
         default:
           THROW(StorageException, "HDF5 not supported for this data type");