diff --git a/RTCP/Cobalt/CoInterface/src/CommonLofarAttributes.cc b/RTCP/Cobalt/CoInterface/src/CommonLofarAttributes.cc index f5a9a47d90dbec8f8523ef458dc95eaef5da4927..dbefc02b31c32ea7bbcf90a3d1360bb32317b742 100644 --- a/RTCP/Cobalt/CoInterface/src/CommonLofarAttributes.cc +++ b/RTCP/Cobalt/CoInterface/src/CommonLofarAttributes.cc @@ -20,7 +20,6 @@ #include <lofar_config.h> -#ifdef HAVE_DAL #include "CommonLofarAttributes.h" #include <ctime> @@ -67,6 +66,7 @@ namespace LOFAR return 0.5 * subbandWidth / nrChannels; } +#ifdef HAVE_DAL void writeCommonLofarAttributes(dal::CLA_File& file, const Parset& parset) { file.groupType().value = "Root"; @@ -182,7 +182,7 @@ namespace LOFAR file.notes().value = ""; } +#endif // HAVE_DAL } } -#endif // HAVE_DAL diff --git a/RTCP/Cobalt/CoInterface/src/CommonLofarAttributes.h b/RTCP/Cobalt/CoInterface/src/CommonLofarAttributes.h index 14bb6f9c9ad8c73772cd798f6b7f57ea5c26ce08..e23e8e4597f7a9a9d3c30c1472c7d5152a20e68f 100644 --- a/RTCP/Cobalt/CoInterface/src/CommonLofarAttributes.h +++ b/RTCP/Cobalt/CoInterface/src/CommonLofarAttributes.h @@ -24,7 +24,10 @@ #include <string> #include <vector> #include <CoInterface/Parset.h> + +#ifdef HAVE_DAL #include <dal/lofar/CLA_File.h> +#endif namespace LOFAR { @@ -35,8 +38,10 @@ namespace LOFAR double getFrequencyOffsetPPF(double subbandWidth, unsigned nrChannels); +#ifdef HAVE_DAL void writeCommonLofarAttributes(dal::CLA_File& file, const Parset& parset); +#endif } } diff --git a/RTCP/Cobalt/OutputProc/src/CMakeLists.txt b/RTCP/Cobalt/OutputProc/src/CMakeLists.txt index e43aa9203bbc1707e5f1ab4bec6520394862d672..fada30e4a56cbc36574e9ca216b7733abd404240 100644 --- a/RTCP/Cobalt/OutputProc/src/CMakeLists.txt +++ b/RTCP/Cobalt/OutputProc/src/CMakeLists.txt @@ -18,7 +18,6 @@ lofar_add_library(outputproc MSWriterNull.cc MSWriterFile.cc MeasurementSetFormat.cc - CommonLofarAttributes.cc OutputThread.cc SubbandWriter.cc RSPRawWriter.cc diff --git a/RTCP/Cobalt/OutputProc/src/MSWriterDAL.cc b/RTCP/Cobalt/OutputProc/src/MSWriterDAL.cc index 73b72f7d8d8cb13e4cd69be54c542eaba055bf66..169ad137ec51ffa0aa5456b08e6cb7986b928e0c 100644 --- a/RTCP/Cobalt/OutputProc/src/MSWriterDAL.cc +++ b/RTCP/Cobalt/OutputProc/src/MSWriterDAL.cc @@ -40,7 +40,7 @@ #include <CoInterface/StreamableData.h> #include <CoInterface/LTAFeedback.h> #include <CoInterface/SmartPtr.h> -#include <OutputProc/CommonLofarAttributes.h> +#include <CoInterface/CommonLofarAttributes.h> #include <OutputProc/Package__Version.h> #include <dal/lofar/BF_File.h>