Task #3207: Renamed LDA->DAL and removed support for old DAL (now called DAL1)

.gitattributes

@@ -2649,8 +2649,8 @@ RTCP/Storage/include/Storage/FastFileStream.h -text
 RTCP/Storage/include/Storage/Format.h -text
 RTCP/Storage/include/Storage/HDF5Attributes.h -text
 RTCP/Storage/include/Storage/IOPriority.h -text
+RTCP/Storage/include/Storage/MSWriterDAL.h -text
 RTCP/Storage/include/Storage/MSWriterFile.h -text
-RTCP/Storage/include/Storage/MSWriterLDA.h -text
 RTCP/Storage/include/Storage/MSWriterNull.h -text
 RTCP/Storage/include/Storage/MeasurementSetFormat.h -text
 RTCP/Storage/include/Storage/OutputThread.h -text
@@ -2668,8 +2668,8 @@ RTCP/Storage/src/TBB_Writer.cc -text
 RTCP/Storage/src/TBB_Writer_main.cc -text
 RTCP/Storage/src/gnuplotMS.sh -text
 RTCP/Storage/src/plotMS.cc -text
+RTCP/Storage/test/tDAL.cc -text
 RTCP/Storage/test/tFastFileStream.cc -text
-RTCP/Storage/test/tLDA.cc -text
 RTCP/Storage/test/tMeasurementSetFormat.parset-j2000 -text
 RTCP/Storage/test/tMeasurementSetFormat.parset-sun -text
 RTCP/Storage/test/tTBB_StaticMapping.cc -text

CMake/FindLDA.cmake

-# - Try to find LDA.
-# Variables used by this module:
-#  LDA_ROOT_DIR     - LDA root directory
-# Variables defined by this module:
-#  LDA_FOUND        - system has LDA
-#  LDA_INCLUDE_DIR  - the LDA include directory (cached)
-#  LDA_INCLUDE_DIRS - the LDA include directories
-#                       (identical to LDA_INCLUDE_DIR)
-#  LDA_LIBRARY      - the LDA library (cached)
-#  LDA_LIBRARIES    - the LDA libraries
-#                       (identical to LDA_LIBRARY)
-
-# Copyright (C) 2011
-# ASTRON (Netherlands Institute for Radio Astronomy)
-# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
-#
-# This file is part of the LOFAR software suite.
-# The LOFAR software suite is free software: you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as published
-# by the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# The LOFAR software suite is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
-#
-# $Id$
-
-if(NOT LDA_FOUND)
-
-  find_path(LDA_INCLUDE_DIR lda_config.h
-    HINTS ${LDA_ROOT_DIR} PATH_SUFFIXES include/lda)
-  find_library(LDA_LIBRARY lda
-    HINTS ${LDA_ROOT_DIR} PATH_SUFFIXES lib)
-  mark_as_advanced(LDA_INCLUDE_DIR LDA_LIBRARY)
-
-  include(FindPackageHandleStandardArgs)
-  find_package_handle_standard_args(LDA DEFAULT_MSG 
-    LDA_LIBRARY LDA_INCLUDE_DIR)
-
-  set(LDA_INCLUDE_DIRS ${LDA_INCLUDE_DIR})
-  set(LDA_LIBRARIES ${LDA_LIBRARY})
-
-endif(NOT LDA_FOUND)

CMake/variants/variants.lhn001

@@ -2,7 +2,7 @@ option(BUILD_SHARED_LIBS        "Build shared libraries"      ON)
 
 set(CASACORE_ROOT_DIR /opt/cep/casacore)
 set(CASAREST_ROOT_DIR /opt/cep/casarest)
-set(LDA_ROOT_DIR /opt/cep/lda)
+set(DAL_ROOT_DIR /globalhome/lofarsystem/packages/root/lhn/dal)
 set(ENV{HDF5_ROOT} /opt/cep/storage/hdf5)
 
 set(PYRAP_ROOT_DIR /opt/cep/pyrap)

RTCP/Run/src/RTCP.parset

@@ -8,7 +8,7 @@ Observation.Campaign.name = "Development"
 Observation.Campaign.title = "Development"
 
 # ----- Input streams
-Observation.VirtualInstrument.stationList = [CS302]
+Observation.VirtualInstrument.stationList = [S9,S10]
 #Observation.antennaSet=LBA_INNER
 #Observation.antennaSet=LBA_OUTER
 #Observation.antennaSet=LBA_X
@@ -19,7 +19,8 @@ Observation.VirtualInstrument.stationList = [CS302]
 #Observation.antennaSet=HBA_ONE
 #Observation.antennaSet=HBA_DUAL
 #Observation.antennaSet=HBA_JOINED
-Observation.antennaSet=LBA_INNER
+#Observation.antennaSet=LBA_INNER
+Observation.antennaSet=
 
 OLAP.realTime = T # T when reading data from stations, F when reading from disk
 
@@ -32,7 +33,7 @@ OLAP.nrTimesInFrame = 16
 #     [ 3*(0;1;2;3)  ] --> [ 0,1,2,3,0,1,2,3,0,1,2,3 ]
 #     [ 3*(300..303) ] --> [ 300,301,302,303,300,301,302,303,300,301,302,303 ]
 #     [ 2*(5*0)      ] --> [ 0,0,0,0,0,0,0,0,0,0 ]       
-Observation.subbandList  = [100..343]
+Observation.subbandList  = [100..102]
 Observation.sampleClock  = 200
 OLAP.nrBitsPerSample     = 16
 

RTCP/Run/src/deploy/Makefile

@@ -76,8 +76,7 @@ COMMON_FLAGS += -DLOFAR_SVN_UPDATE=ON -DBUILD_TESTING=OFF
 ION_FLAGS +=
 CN_FLAGS +=
 BGFEN_FLAGS += -DUSE_LOG4CPLUS=ON
-#STORAGE_FLAGS += -DLDA_ROOT_DIR=/globalhome/lofarsystem/packages/root/lhn/lda -DUSE_MPI=OFF -DUSE_LOG4CPLUS=ON -DUSE_DAL=ON
-STORAGE_FLAGS += -DLDA_ROOT_DIR=/opt/cep/lda -DUSE_MPI=OFF -DUSE_LOG4CPLUS=ON
+STORAGE_FLAGS += -DDAL_ROOT_DIR=/globalhome/lofarsystem/packages/root/lhn/lda -DUSE_MPI=OFF -DUSE_LOG4CPLUS=ON
 
 # Extra powers for Storage_main
 STORAGE_CAPABILITIES = cap_sys_admin,cap_sys_nice,cap_ipc_lock

RTCP/Storage/CMakeLists.txt

@@ -4,7 +4,7 @@ lofar_package(Storage 1.0 DEPENDS Common ApplCommon Interface MSLofar LofarStMan
 
 include(LofarFindPackage)
 lofar_find_package(Casacore COMPONENTS casa measures ms tables REQUIRED)
-lofar_find_package(LDA REQUIRED)
+lofar_find_package(DAL REQUIRED)
 lofar_find_package(HDF5 REQUIRED)
 
 add_subdirectory(include/Storage)

RTCP/Storage/include/Storage/MSWriterLDA.h → RTCP/Storage/include/Storage/MSWriterDAL.h

-//  MSMriterLDA.h: implementation of MSWriter using the LDA to write HDF5
+//  MSMriterDAL.h: implementation of MSWriter using the DAL to write HDF5
 //
 //  Copyright (C) 2011
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
@@ -18,13 +18,13 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 //
-//  $Id: MSWriterLDA.h 11891 2011-10-14 13:43:51Z gels $
+//  $Id: MSWriterDAL.h 11891 2011-10-14 13:43:51Z gels $
 //
 //////////////////////////////////////////////////////////////////////
 
 
-#ifndef LOFAR_STORAGE_MSWRITERLDA_H
-#define LOFAR_STORAGE_MSWRITERLDA_H
+#ifndef LOFAR_STORAGE_MSWRITERDAL_H
+#define LOFAR_STORAGE_MSWRITERDAL_H
 
 //# Includes
 #include <Common/LofarTypes.h>
@@ -42,11 +42,11 @@ namespace LOFAR
 
   namespace RTCP
   {
-    template<typename T, unsigned DIM> class MSWriterLDA : public MSWriterFile
+    template<typename T, unsigned DIM> class MSWriterDAL : public MSWriterFile
     {
     public:
-      MSWriterLDA(const string &filename, const Parset &parset, unsigned fileno, bool isBigEndian);
-      ~MSWriterLDA();
+      MSWriterDAL(const string &filename, const Parset &parset, unsigned fileno, bool isBigEndian);
+      ~MSWriterDAL();
       virtual void write(StreamableData *data);
     private:
       const Transpose2 &itsTransposeLogic;

RTCP/Storage/src/MSWriterLDA.cc

-//# MSWriterLDA: an implementation of MSWriter using the LDA to write HDF5
+//# MSWriterDAL: an implementation of MSWriter using the DAL to write HDF5
 //#
 //#  Copyright (C) 2011
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
@@ -26,11 +26,11 @@
 #include <Common/SystemUtil.h>
 
 #include <Storage/MSWriter.h>
-#include <Storage/MSWriterLDA.h>
+#include <Storage/MSWriterDAL.h>
 
 #include <lofar/BF_File.h>
 
-using namespace LDA;
+using namespace DAL;
 using namespace std;
 
 #include <Common/Thread/Mutex.h>
@@ -101,7 +101,7 @@ namespace LOFAR
     // uses global locks too anyway.
     static Mutex HDF5Mutex;
 
-    template <typename T,unsigned DIM> MSWriterLDA<T,DIM>::MSWriterLDA (const string &filename, const Parset &parset, unsigned fileno, bool isBigEndian)
+    template <typename T,unsigned DIM> MSWriterDAL<T,DIM>::MSWriterDAL (const string &filename, const Parset &parset, unsigned fileno, bool isBigEndian)
     :
       MSWriterFile(forceextension(string(filename),".raw"),false),
       itsTransposeLogic(parset.transposeLogic()),
@@ -157,11 +157,11 @@ namespace LOFAR
           break;
 
         case INVALID_STOKES:
-          LOG_ERROR("MSWriterLDA asked to write INVALID_STOKES");
+          LOG_ERROR("MSWriterDAL asked to write INVALID_STOKES");
           return;
       }    
 
-      LOG_DEBUG_STR("MSWriterLDA: opening " << filename);
+      LOG_DEBUG_STR("MSWriterDAL: opening " << filename);
 
       // create the top structure
       BF_File file(h5filename, BF_File::CREATE);
@@ -408,11 +408,11 @@ namespace LOFAR
       stokesDS.nofSamples()     .set(dims[0]);
     }
 
-    template <typename T,unsigned DIM> MSWriterLDA<T,DIM>::~MSWriterLDA()
+    template <typename T,unsigned DIM> MSWriterDAL<T,DIM>::~MSWriterDAL()
     {
     }
 
-    template <typename T,unsigned DIM> void MSWriterLDA<T,DIM>::write(StreamableData *data)
+    template <typename T,unsigned DIM> void MSWriterDAL<T,DIM>::write(StreamableData *data)
     {
       SampleData<T,DIM> *sdata = dynamic_cast<SampleData<T,DIM> *>(data);
 
@@ -434,7 +434,7 @@ namespace LOFAR
     }
 
     // specialisation for FinalBeamFormedData
-    template class MSWriterLDA<float,3>;
+    template class MSWriterDAL<float,3>;
 
   } // namespace RTCP
 } // namespace LOFAR

RTCP/Storage/src/OutputThread.cc

@@ -25,7 +25,7 @@
 
 #include <Common/StringUtil.h>
 #include <Storage/MSWriterFile.h>
-#include <Storage/MSWriterLDA.h>
+#include <Storage/MSWriterDAL.h>
 #include <Storage/MSWriterNull.h>
 #include <Storage/MeasurementSetFormat.h>
 #include <Storage/OutputThread.h>
@@ -159,7 +159,7 @@ void OutputThread::createMS()
     // HDF5 writer requested
     switch (itsOutputType) {
       case BEAM_FORMED_DATA:
-        itsWriter = new MSWriterLDA<float,3>(path.c_str(), itsParset, itsStreamNr, itsIsBigEndian);
+        itsWriter = new MSWriterDAL<float,3>(path.c_str(), itsParset, itsStreamNr, itsIsBigEndian);
         break;
       default:
         itsWriter = new MSWriterFile(path, itsOutputType == BEAM_FORMED_DATA);

RTCP/Storage/test/CMakeLists.txt

@@ -3,7 +3,7 @@
 include(LofarCTest)
 
 lofar_add_test(tMeasurementSetFormat tMeasurementSetFormat.cc)
-#lofar_add_test(tLDA tLDA.cc)
+#lofar_add_test(tDAL tDAL.cc)
 lofar_add_test(tFastFileStream tFastFileStream.cc)
 #lofar_add_test(tAH_TestStorage tAH_TestStorage.cc)
 #lofar_add_test(tTBB_StaticMapping tTBB_StaticMapping.cc)

RTCP/Storage/test/tLDA.cc → RTCP/Storage/test/tDAL.cc

-//# tLDA: Test HDF5 routines through LDA
+//# tDAL: Test HDF5 routines through DAL
 //#
 //#  Copyright (C) 2011
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
@@ -22,18 +22,18 @@
 
 #include <lofar_config.h>
 
-#ifdef HAVE_LDA
+#ifdef HAVE_DAL
 
-#include <lda_version.h>
+#include <dal_version.h>
 #include <iostream>
 #include <string>
 
 using namespace std;
-using namespace LDA;
+using namespace DAL;
 
 int main() {
   if (!check_hdf5_versions()) {
-    cerr << "HDF5 version mismatch. LDA was compiled with " << get_lda_hdf5_version() << ", our headers are " << get_current_hdf5_header_version() << ", our library is " << get_current_hdf5_lib_version() << endl;
+    cerr << "HDF5 version mismatch. DAL was compiled with " << get_dal_hdf5_version() << ", our headers are " << get_current_hdf5_header_version() << ", our library is " << get_current_hdf5_lib_version() << endl;
     return 1;
   }
   

lofar_config.h.cmake

@@ -120,9 +120,6 @@
 /* Define if LAM is installed */
 #cmakedefine HAVE_LAM 1
 
-/* Define if LDA is installed */
-#cmakedefine HAVE_LDA
-
 /* Define if LOG4CPLUS is installed */
 #cmakedefine HAVE_LOG4CPLUS 1