From 0f7989f5e3158012d7a2b2fed32aa29fc98d99ed Mon Sep 17 00:00:00 2001
From: Joris van Zwieten <zwieten@astron.nl>
Date: Fri, 15 Sep 2006 15:34:15 +0000
Subject: [PATCH] BugID: 873 - updated #include BBS/* to #include BBSKernel/*
---
CEP/BB/BBSKernel/configure.in | 1 +
.../include/BBSKernel/BBSTestLogger.h | 2 +-
CEP/BB/BBSKernel/include/BBSKernel/FlagsMap.h | 2 +-
.../include/BBSKernel/MNS/MeqBaseDFTPS.h | 2 +-
.../include/BBSKernel/MNS/MeqBaseLinPS.h | 8 ++--
.../include/BBSKernel/MNS/MeqDFTPS.h | 2 +-
.../BBSKernel/include/BBSKernel/MNS/MeqDiag.h | 4 +-
.../BBSKernel/include/BBSKernel/MNS/MeqExpr.h | 8 ++--
.../include/BBSKernel/MNS/MeqFunklet.h | 4 +-
.../include/BBSKernel/MNS/MeqGaussSource.h | 2 +-
.../include/BBSKernel/MNS/MeqJonesCMul2.h | 2 +-
.../include/BBSKernel/MNS/MeqJonesCMul3.h | 2 +-
.../include/BBSKernel/MNS/MeqJonesExpr.h | 6 +--
.../include/BBSKernel/MNS/MeqJonesInvert.h | 2 +-
.../include/BBSKernel/MNS/MeqJonesMMap.h | 4 +-
.../include/BBSKernel/MNS/MeqJonesMul2.h | 2 +-
.../include/BBSKernel/MNS/MeqJonesMul3.h | 2 +-
.../include/BBSKernel/MNS/MeqJonesNode.h | 4 +-
.../include/BBSKernel/MNS/MeqJonesResult.h | 2 +-
.../include/BBSKernel/MNS/MeqJonesSum.h | 2 +-
.../BBSKernel/include/BBSKernel/MNS/MeqLMN.h | 2 +-
.../include/BBSKernel/MNS/MeqMatrix.h | 2 +-
.../BBSKernel/MNS/MeqMatrixComplexArr.h | 2 +-
.../BBSKernel/MNS/MeqMatrixComplexSca.h | 2 +-
.../include/BBSKernel/MNS/MeqMatrixRealArr.h | 2 +-
.../include/BBSKernel/MNS/MeqMatrixRealSca.h | 2 +-
.../include/BBSKernel/MNS/MeqMatrixTmp.h | 8 ++--
.../BBSKernel/include/BBSKernel/MNS/MeqParm.h | 4 +-
.../include/BBSKernel/MNS/MeqParmExpr.h | 2 +-
.../include/BBSKernel/MNS/MeqParmFunklet.h | 4 +-
.../include/BBSKernel/MNS/MeqParmSingle.h | 2 +-
.../include/BBSKernel/MNS/MeqPointSource.h | 2 +-
.../BBSKernel/include/BBSKernel/MNS/MeqPolc.h | 2 +-
.../include/BBSKernel/MNS/MeqPolcLog.h | 2 +-
.../include/BBSKernel/MNS/MeqRequest.h | 6 +--
.../include/BBSKernel/MNS/MeqResult.h | 4 +-
.../include/BBSKernel/MNS/MeqResultVec.h | 2 +-
.../include/BBSKernel/MNS/MeqSource.h | 2 +-
.../include/BBSKernel/MNS/MeqSourceList.h | 2 +-
.../include/BBSKernel/MNS/MeqStatExpr.h | 4 +-
.../include/BBSKernel/MNS/MeqStatUVW.h | 6 +--
.../include/BBSKernel/MNS/MeqStation.h | 2 +-
.../include/BBSKernel/MNS/MeqTabular.h | 2 +-
CEP/BB/BBSKernel/include/BBSKernel/ParmData.h | 4 +-
.../BBSKernel/include/BBSKernel/Prediffer.h | 34 ++++++++--------
.../BBSKernel/include/BBSKernel/SolveProp.h | 2 +-
CEP/BB/BBSKernel/include/BBSKernel/Solver.h | 4 +-
CEP/BB/BBSKernel/src/BBSKernel.cc | 2 +-
.../BBSKernel/src/BBSKernelProcessControl.cc | 2 +-
CEP/BB/BBSKernel/src/BBSTestLogger.cc | 2 +-
CEP/BB/BBSKernel/src/BBSTestLogger.h | 2 +-
CEP/BB/BBSKernel/src/BBSrun.cc | 4 +-
CEP/BB/BBSKernel/src/Fitter.cc | 2 +-
CEP/BB/BBSKernel/src/FlagsMap.cc | 2 +-
CEP/BB/BBSKernel/src/FlagsMap.h | 2 +-
CEP/BB/BBSKernel/src/MMap.cc | 2 +-
CEP/BB/BBSKernel/src/MMapMSInfo.cc | 2 +-
CEP/BB/BBSKernel/src/MNS/MeqBaseDFTPS.cc | 4 +-
CEP/BB/BBSKernel/src/MNS/MeqBaseDFTPS.h | 2 +-
CEP/BB/BBSKernel/src/MNS/MeqBaseLinPS.cc | 4 +-
CEP/BB/BBSKernel/src/MNS/MeqBaseLinPS.h | 8 ++--
CEP/BB/BBSKernel/src/MNS/MeqDFTPS.cc | 12 +++---
CEP/BB/BBSKernel/src/MNS/MeqDFTPS.h | 2 +-
CEP/BB/BBSKernel/src/MNS/MeqDiag.cc | 4 +-
CEP/BB/BBSKernel/src/MNS/MeqDiag.h | 4 +-
CEP/BB/BBSKernel/src/MNS/MeqDomain.cc | 2 +-
CEP/BB/BBSKernel/src/MNS/MeqExpr.cc | 8 ++--
CEP/BB/BBSKernel/src/MNS/MeqExpr.h | 8 ++--
CEP/BB/BBSKernel/src/MNS/MeqFunklet.cc | 8 ++--
CEP/BB/BBSKernel/src/MNS/MeqFunklet.h | 4 +-
CEP/BB/BBSKernel/src/MNS/MeqGaussSource.cc | 2 +-
CEP/BB/BBSKernel/src/MNS/MeqGaussSource.h | 2 +-
CEP/BB/BBSKernel/src/MNS/MeqJonesCMul2.cc | 10 ++---
CEP/BB/BBSKernel/src/MNS/MeqJonesCMul2.h | 2 +-
CEP/BB/BBSKernel/src/MNS/MeqJonesCMul3.cc | 10 ++---
CEP/BB/BBSKernel/src/MNS/MeqJonesCMul3.h | 2 +-
CEP/BB/BBSKernel/src/MNS/MeqJonesExpr.cc | 2 +-
CEP/BB/BBSKernel/src/MNS/MeqJonesExpr.h | 6 +--
CEP/BB/BBSKernel/src/MNS/MeqJonesInvert.cc | 8 ++--
CEP/BB/BBSKernel/src/MNS/MeqJonesInvert.h | 2 +-
CEP/BB/BBSKernel/src/MNS/MeqJonesMMap.cc | 2 +-
CEP/BB/BBSKernel/src/MNS/MeqJonesMMap.h | 4 +-
CEP/BB/BBSKernel/src/MNS/MeqJonesMul2.cc | 10 ++---
CEP/BB/BBSKernel/src/MNS/MeqJonesMul2.h | 2 +-
CEP/BB/BBSKernel/src/MNS/MeqJonesMul3.cc | 10 ++---
CEP/BB/BBSKernel/src/MNS/MeqJonesMul3.h | 2 +-
CEP/BB/BBSKernel/src/MNS/MeqJonesNode.cc | 4 +-
CEP/BB/BBSKernel/src/MNS/MeqJonesNode.h | 4 +-
CEP/BB/BBSKernel/src/MNS/MeqJonesResult.h | 2 +-
CEP/BB/BBSKernel/src/MNS/MeqJonesSum.cc | 6 +--
CEP/BB/BBSKernel/src/MNS/MeqJonesSum.h | 2 +-
CEP/BB/BBSKernel/src/MNS/MeqLMN.cc | 10 ++---
CEP/BB/BBSKernel/src/MNS/MeqLMN.h | 2 +-
CEP/BB/BBSKernel/src/MNS/MeqLMNAn.cc | 10 ++---
CEP/BB/BBSKernel/src/MNS/MeqMatrix.cc | 12 +++---
CEP/BB/BBSKernel/src/MNS/MeqMatrix.h | 2 +-
.../BBSKernel/src/MNS/MeqMatrixComplexArr.cc | 10 ++---
.../BBSKernel/src/MNS/MeqMatrixComplexArr.h | 2 +-
.../BBSKernel/src/MNS/MeqMatrixComplexSca.cc | 8 ++--
.../BBSKernel/src/MNS/MeqMatrixComplexSca.h | 2 +-
CEP/BB/BBSKernel/src/MNS/MeqMatrixRealArr.cc | 10 ++---
CEP/BB/BBSKernel/src/MNS/MeqMatrixRealArr.h | 2 +-
CEP/BB/BBSKernel/src/MNS/MeqMatrixRealSca.cc | 8 ++--
CEP/BB/BBSKernel/src/MNS/MeqMatrixRealSca.h | 2 +-
CEP/BB/BBSKernel/src/MNS/MeqMatrixRep.cc | 2 +-
CEP/BB/BBSKernel/src/MNS/MeqMatrixTmp.cc | 6 +--
CEP/BB/BBSKernel/src/MNS/MeqMatrixTmp.h | 8 ++--
CEP/BB/BBSKernel/src/MNS/MeqParm.cc | 2 +-
CEP/BB/BBSKernel/src/MNS/MeqParm.h | 4 +-
CEP/BB/BBSKernel/src/MNS/MeqParmExpr.cc | 6 +--
CEP/BB/BBSKernel/src/MNS/MeqParmExpr.h | 2 +-
CEP/BB/BBSKernel/src/MNS/MeqParmFunklet.cc | 8 ++--
CEP/BB/BBSKernel/src/MNS/MeqParmFunklet.h | 4 +-
CEP/BB/BBSKernel/src/MNS/MeqParmSingle.cc | 4 +-
CEP/BB/BBSKernel/src/MNS/MeqParmSingle.h | 2 +-
CEP/BB/BBSKernel/src/MNS/MeqPhaseRef.cc | 2 +-
CEP/BB/BBSKernel/src/MNS/MeqPointSource.cc | 2 +-
CEP/BB/BBSKernel/src/MNS/MeqPointSource.h | 2 +-
CEP/BB/BBSKernel/src/MNS/MeqPolc.cc | 8 ++--
CEP/BB/BBSKernel/src/MNS/MeqPolc.h | 2 +-
CEP/BB/BBSKernel/src/MNS/MeqPolcAn.cc | 8 ++--
CEP/BB/BBSKernel/src/MNS/MeqPolcLog.cc | 8 ++--
CEP/BB/BBSKernel/src/MNS/MeqPolcLog.h | 2 +-
CEP/BB/BBSKernel/src/MNS/MeqRequest.cc | 2 +-
CEP/BB/BBSKernel/src/MNS/MeqRequest.h | 6 +--
CEP/BB/BBSKernel/src/MNS/MeqResult.cc | 8 ++--
CEP/BB/BBSKernel/src/MNS/MeqResult.h | 4 +-
CEP/BB/BBSKernel/src/MNS/MeqResultVec.cc | 2 +-
CEP/BB/BBSKernel/src/MNS/MeqResultVec.h | 2 +-
CEP/BB/BBSKernel/src/MNS/MeqSource.cc | 2 +-
CEP/BB/BBSKernel/src/MNS/MeqSource.h | 2 +-
CEP/BB/BBSKernel/src/MNS/MeqSourceList.cc | 8 ++--
CEP/BB/BBSKernel/src/MNS/MeqSourceList.h | 2 +-
CEP/BB/BBSKernel/src/MNS/MeqStatExpr.cc | 10 ++---
CEP/BB/BBSKernel/src/MNS/MeqStatExpr.h | 4 +-
CEP/BB/BBSKernel/src/MNS/MeqStatUVW.cc | 10 ++---
CEP/BB/BBSKernel/src/MNS/MeqStatUVW.h | 6 +--
CEP/BB/BBSKernel/src/MNS/MeqStation.cc | 2 +-
CEP/BB/BBSKernel/src/MNS/MeqStation.h | 2 +-
CEP/BB/BBSKernel/src/MNS/MeqTabular.cc | 8 ++--
CEP/BB/BBSKernel/src/MNS/MeqTabular.h | 2 +-
CEP/BB/BBSKernel/src/ParmData.cc | 2 +-
CEP/BB/BBSKernel/src/ParmData.h | 4 +-
CEP/BB/BBSKernel/src/ParmWriter.cc | 6 +--
CEP/BB/BBSKernel/src/Prediffer.cc | 40 +++++++++----------
CEP/BB/BBSKernel/src/Prediffer.h | 34 ++++++++--------
CEP/BB/BBSKernel/src/Quality.cc | 2 +-
CEP/BB/BBSKernel/src/SolveProp.h | 2 +-
CEP/BB/BBSKernel/src/Solver.cc | 4 +-
CEP/BB/BBSKernel/src/Solver.h | 4 +-
CEP/BB/BBSKernel/src/StepProp.cc | 2 +-
CEP/BB/BBSKernel/src/StrategyProp.cc | 2 +-
152 files changed, 354 insertions(+), 353 deletions(-)
diff --git a/CEP/BB/BBSKernel/configure.in b/CEP/BB/BBSKernel/configure.in
index 4fb0374a1bf..fc0c638ab9c 100644
--- a/CEP/BB/BBSKernel/configure.in
+++ b/CEP/BB/BBSKernel/configure.in
@@ -59,6 +59,7 @@ lofar_INTERNAL(LCS/Transport/,Transport,,1,Transport/TH_Mem.h)
lofar_INTERNAL(LCS/ACC/PLC,PLC,,1,PLC/ACCmain.h)
lofar_INTERNAL(CEP/BB/ParmDB,ParmDB,,1,ParmDB/ParmDB.h)
lofar_INTERNAL(CEP/BB/MS,MS,,1,MS/MSDesc.h,bbms)
+lofar_INTERNAL(CEP/BB/BBSControl,BBSControl,,1,BBSControl/BBSStep.h)
lofar_EXTERNAL(boost,1,boost/logic/tribool.hpp,boost_thread-gcc-mt)
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/BBSTestLogger.h b/CEP/BB/BBSKernel/include/BBSKernel/BBSTestLogger.h
index 2b6df2ed7d9..df56e215930 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/BBSTestLogger.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/BBSTestLogger.h
@@ -34,7 +34,7 @@
#include <Common/lofar_vector.h>
#include <Transport/TH_MPI.h>
#include <fstream>
-#include <BBS/ParmData.h>
+#include <BBSKernel/ParmData.h>
#include <Common/Timer.h>
#include <casa/OS/Timer.h>
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/FlagsMap.h b/CEP/BB/BBSKernel/include/BBSKernel/FlagsMap.h
index c2112440335..e4f430c7a57 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/FlagsMap.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/FlagsMap.h
@@ -24,7 +24,7 @@
#define BBS_FLAGSMAP_H
//# Includes
-#include <BBS/MMap.h>
+#include <BBSKernel/MMap.h>
namespace LOFAR
{
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqBaseDFTPS.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqBaseDFTPS.h
index 122abfe5bc6..fc10b9f8f52 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqBaseDFTPS.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqBaseDFTPS.h
@@ -27,7 +27,7 @@
// Baseline DFT of a point source.
//# Includes
-#include <BBS/MNS/MeqExpr.h>
+#include <BBSKernel/MNS/MeqExpr.h>
namespace LOFAR
{
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqBaseLinPS.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqBaseLinPS.h
index 562dbecd6ec..71a930f080c 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqBaseLinPS.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqBaseLinPS.h
@@ -27,10 +27,10 @@
// Baseline prediction of a point source with linear polarisation.
//# Includes
-#include <BBS/MNS/MeqJonesExpr.h>
-#include <BBS/MNS/MeqLMN.h>
-#include <BBS/MNS/MeqPointSource.h>
-#include <BBS/MNS/MeqDFTPS.h>
+#include <BBSKernel/MNS/MeqJonesExpr.h>
+#include <BBSKernel/MNS/MeqLMN.h>
+#include <BBSKernel/MNS/MeqPointSource.h>
+#include <BBSKernel/MNS/MeqDFTPS.h>
namespace LOFAR
{
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqDFTPS.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqDFTPS.h
index 4cb817e02cd..c0ecd8112f2 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqDFTPS.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqDFTPS.h
@@ -27,7 +27,7 @@
// The DFT for a point source.
//# Includes
-#include <BBS/MNS/MeqExpr.h>
+#include <BBSKernel/MNS/MeqExpr.h>
#include <Common/lofar_vector.h>
namespace LOFAR
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqDiag.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqDiag.h
index 744c75c6f2b..0b680e8587f 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqDiag.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqDiag.h
@@ -27,8 +27,8 @@
// The Jones expression for a diagonal matrix
//# Includes
-#include <BBS/MNS/MeqJonesExpr.h>
-#include <BBS/MNS/MeqExpr.h>
+#include <BBSKernel/MNS/MeqJonesExpr.h>
+#include <BBSKernel/MNS/MeqExpr.h>
namespace LOFAR
{
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqExpr.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqExpr.h
index 7cbe0f89470..fc803763558 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqExpr.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqExpr.h
@@ -27,10 +27,10 @@
// The base class of an expression
//# Includes
-#include <BBS/MNS/MeqRequestId.h>
-#include <BBS/MNS/MeqRequest.h>
-#include <BBS/MNS/MeqResult.h>
-#include <BBS/MNS/MeqResultVec.h>
+#include <BBSKernel/MNS/MeqRequestId.h>
+#include <BBSKernel/MNS/MeqRequest.h>
+#include <BBSKernel/MNS/MeqResult.h>
+#include <BBSKernel/MNS/MeqResultVec.h>
#include <vector>
#ifdef EXPR_GRAPH
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqFunklet.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqFunklet.h
index 11b7b8666eb..d47cf07181e 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqFunklet.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqFunklet.h
@@ -27,8 +27,8 @@
// Parameter function with coeffients valid for a given domain
//# Includes
-#include <BBS/MNS/MeqDomain.h>
-#include <BBS/MNS/MeqMatrix.h>
+#include <BBSKernel/MNS/MeqDomain.h>
+#include <BBSKernel/MNS/MeqMatrix.h>
#include <ParmDB/ParmValue.h>
#include <Common/lofar_vector.h>
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqGaussSource.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqGaussSource.h
index 5577212c35d..76055d5bed6 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqGaussSource.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqGaussSource.h
@@ -27,7 +27,7 @@
// Class holding a gaussian source
//# Includes
-#include <BBS/MNS/MeqSource.h>
+#include <BBSKernel/MNS/MeqSource.h>
#include <Common/lofar_string.h>
namespace LOFAR
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesCMul2.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesCMul2.h
index f063edd0f5b..c0a2204b0f4 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesCMul2.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesCMul2.h
@@ -26,7 +26,7 @@
// Calculate left*conj(right)
//# Includes
-#include <BBS/MNS/MeqJonesExpr.h>
+#include <BBSKernel/MNS/MeqJonesExpr.h>
namespace LOFAR
{
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesCMul3.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesCMul3.h
index 557768318c8..b063498a66c 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesCMul3.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesCMul3.h
@@ -27,7 +27,7 @@
// Calculate left*mid*conj(right)
//# Includes
-#include <BBS/MNS/MeqJonesExpr.h>
+#include <BBSKernel/MNS/MeqJonesExpr.h>
namespace LOFAR
{
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesExpr.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesExpr.h
index ee9717907d1..5ad7517f917 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesExpr.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesExpr.h
@@ -27,9 +27,9 @@
// The base class of a Jones matrix expression.
//# Includes
-#include <BBS/MNS/MeqExpr.h>
-#include <BBS/MNS/MeqJonesResult.h>
-#include <BBS/MNS/MeqRequest.h>
+#include <BBSKernel/MNS/MeqExpr.h>
+#include <BBSKernel/MNS/MeqJonesResult.h>
+#include <BBSKernel/MNS/MeqRequest.h>
#include <Common/LofarLogger.h>
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesInvert.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesInvert.h
index b086acc9584..7075fc610a7 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesInvert.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesInvert.h
@@ -27,7 +27,7 @@
// The inverse of a Jones matrix expression.
//# Includes
-#include <BBS/MNS/MeqJonesExpr.h>
+#include <BBSKernel/MNS/MeqJonesExpr.h>
namespace LOFAR
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesMMap.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesMMap.h
index f6ad6d72521..6fc8083417c 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesMMap.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesMMap.h
@@ -27,8 +27,8 @@
// Get part of the data from the Mapped MS.
//# Includes
-#include <BBS/MNS/MeqJonesExpr.h>
-#include <BBS/MMapMSInfo.h>
+#include <BBSKernel/MNS/MeqJonesExpr.h>
+#include <BBSKernel/MMapMSInfo.h>
namespace LOFAR
{
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesMul2.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesMul2.h
index cecdb0bae2d..4554d280b0a 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesMul2.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesMul2.h
@@ -26,7 +26,7 @@
// Calculate left*right
//# Includes
-#include <BBS/MNS/MeqJonesExpr.h>
+#include <BBSKernel/MNS/MeqJonesExpr.h>
namespace LOFAR
{
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesMul3.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesMul3.h
index 5f51d6c1d03..ed999a2cfbb 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesMul3.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesMul3.h
@@ -27,7 +27,7 @@
// Calculate left*mid*right
//# Includes
-#include <BBS/MNS/MeqJonesExpr.h>
+#include <BBSKernel/MNS/MeqJonesExpr.h>
namespace LOFAR
{
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesNode.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesNode.h
index 85739fef4d5..0212d344e4f 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesNode.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesNode.h
@@ -27,8 +27,8 @@
// A node in a Jones matrix expression.
//# Includes
-#include <BBS/MNS/MeqJonesExpr.h>
-#include <BBS/MNS/MeqExpr.h>
+#include <BBSKernel/MNS/MeqJonesExpr.h>
+#include <BBSKernel/MNS/MeqExpr.h>
namespace LOFAR
{
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesResult.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesResult.h
index 8aadacee203..16f64e0a5cc 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesResult.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesResult.h
@@ -27,7 +27,7 @@
// The result of the 4 expressions in a Jones matrix for a domain.
//# Includes
-#include <BBS/MNS/MeqResultVec.h>
+#include <BBSKernel/MNS/MeqResultVec.h>
// This class represents the result in a Jones matrix of a domain for
// which the expressions have been evaluated.
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesSum.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesSum.h
index c96509ca2c2..f1db5854269 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesSum.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesSum.h
@@ -27,7 +27,7 @@
// A sum of MeqJonesExpr
//# Includes
-#include <BBS/MNS/MeqJonesExpr.h>
+#include <BBSKernel/MNS/MeqJonesExpr.h>
#include <vector>
namespace LOFAR
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqLMN.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqLMN.h
index 119ff89392e..0d1bcf99b7b 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqLMN.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqLMN.h
@@ -27,7 +27,7 @@
// Class holding the LMN values of a point source
//# Includes
-#include <BBS/MNS/MeqExpr.h>
+#include <BBSKernel/MNS/MeqExpr.h>
#include <Common/lofar_string.h>
namespace LOFAR
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqMatrix.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqMatrix.h
index f57291e271a..be22bc571ee 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqMatrix.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqMatrix.h
@@ -27,7 +27,7 @@
// Matrix for Mns
//# Includes
-#include <BBS/MNS/MeqMatrixRep.h>
+#include <BBSKernel/MNS/MeqMatrixRep.h>
//# Forward Declarations
namespace casa
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqMatrixComplexArr.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqMatrixComplexArr.h
index c6ab7d93ec3..14ce67e733a 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqMatrixComplexArr.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqMatrixComplexArr.h
@@ -27,7 +27,7 @@
// Temporary matrix for Mns
//# Includes
-#include <BBS/MNS/MeqMatrixRep.h>
+#include <BBSKernel/MNS/MeqMatrixRep.h>
#include <Common/lofar_complex.h>
#include <Common/lofar_stack.h>
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqMatrixComplexSca.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqMatrixComplexSca.h
index e6ba3187119..1487ebd3b46 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqMatrixComplexSca.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqMatrixComplexSca.h
@@ -27,7 +27,7 @@
// Temporary matrix for Mns
//# Includes
-#include <BBS/MNS/MeqMatrixRep.h>
+#include <BBSKernel/MNS/MeqMatrixRep.h>
#include <Common/lofar_complex.h>
namespace LOFAR
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqMatrixRealArr.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqMatrixRealArr.h
index 62673f65dc2..2c94c1799d4 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqMatrixRealArr.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqMatrixRealArr.h
@@ -27,7 +27,7 @@
// Temporary matrix for Mns
//# Includes
-#include <BBS/MNS/MeqMatrixRep.h>
+#include <BBSKernel/MNS/MeqMatrixRep.h>
namespace LOFAR
{
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqMatrixRealSca.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqMatrixRealSca.h
index 7a4f7c09e2d..675c0f04e0e 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqMatrixRealSca.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqMatrixRealSca.h
@@ -27,7 +27,7 @@
// Temporary matrix for Mns
//# Includes
-#include <BBS/MNS/MeqMatrixRep.h>
+#include <BBSKernel/MNS/MeqMatrixRep.h>
namespace LOFAR
{
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqMatrixTmp.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqMatrixTmp.h
index 88ebadaa0a9..78fb6c2f5ef 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqMatrixTmp.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqMatrixTmp.h
@@ -27,10 +27,10 @@
// Temporary matrix for Mns
//# Includes
-#include <BBS/MNS/MeqMatrixRep.h>
-#include <BBS/MNS/MeqMatrix.h>
-#include <BBS/MNS/MeqMatrixRealSca.h>
-#include <BBS/MNS/MeqMatrixComplexSca.h>
+#include <BBSKernel/MNS/MeqMatrixRep.h>
+#include <BBSKernel/MNS/MeqMatrix.h>
+#include <BBSKernel/MNS/MeqMatrixRealSca.h>
+#include <BBSKernel/MNS/MeqMatrixComplexSca.h>
namespace LOFAR
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqParm.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqParm.h
index 6b32358fc1d..0b24f2e7c07 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqParm.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqParm.h
@@ -27,8 +27,8 @@
// The base class for a parameter
//# Includes
-#include <BBS/MNS/MeqExpr.h>
-#include <BBS/MNS/MeqResult.h>
+#include <BBSKernel/MNS/MeqExpr.h>
+#include <BBSKernel/MNS/MeqResult.h>
#include <ParmDB/ParmValue.h>
#include <Common/lofar_string.h>
#include <Common/lofar_map.h>
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqParmExpr.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqParmExpr.h
index 42cd4882360..e35c7d4ab8b 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqParmExpr.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqParmExpr.h
@@ -27,7 +27,7 @@
// A parm which is an expression of other parms.
//# Includes
-#include <BBS/MNS/MeqExpr.h>
+#include <BBSKernel/MNS/MeqExpr.h>
#include <ParmDB/ParmDB.h>
namespace LOFAR
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqParmFunklet.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqParmFunklet.h
index 9acfc1badf0..9ce6929cc0c 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqParmFunklet.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqParmFunklet.h
@@ -27,8 +27,8 @@
// A stored parameter with funklet coefficients
//# Includes
-#include <BBS/MNS/MeqParm.h>
-#include <BBS/MNS/MeqFunklet.h>
+#include <BBSKernel/MNS/MeqParm.h>
+#include <BBSKernel/MNS/MeqFunklet.h>
#include <ParmDB/ParmDB.h>
#include <Common/lofar_vector.h>
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqParmSingle.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqParmSingle.h
index 4dd865d5062..fe7f7c4133f 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqParmSingle.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqParmSingle.h
@@ -27,7 +27,7 @@
// The class for a single parameter
//# Includes
-#include <BBS/MNS/MeqParm.h>
+#include <BBSKernel/MNS/MeqParm.h>
namespace LOFAR
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqPointSource.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqPointSource.h
index 95420d39a59..0ca047ad77d 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqPointSource.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqPointSource.h
@@ -27,7 +27,7 @@
// Class holding a point source
//# Includes
-#include <BBS/MNS/MeqSource.h>
+#include <BBSKernel/MNS/MeqSource.h>
#include <Common/lofar_string.h>
namespace LOFAR
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqPolc.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqPolc.h
index e98179bb1b0..3c3992e360b 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqPolc.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqPolc.h
@@ -27,7 +27,7 @@
// Ordinary polynomial with coefficients valid for a given domain
//# Includes
-#include <BBS/MNS/MeqFunklet.h>
+#include <BBSKernel/MNS/MeqFunklet.h>
namespace LOFAR
{
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqPolcLog.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqPolcLog.h
index d32029ce32d..0e15d3d3b89 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqPolcLog.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqPolcLog.h
@@ -55,7 +55,7 @@
// example.
//# Includes
-#include <BBS/MNS/MeqFunklet.h>
+#include <BBSKernel/MNS/MeqFunklet.h>
namespace LOFAR
{
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqRequest.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqRequest.h
index ca2204b594d..c92d023e934 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqRequest.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqRequest.h
@@ -27,9 +27,9 @@
// The request for an evaluation of an expression
//# Includes
-#include <BBS/MNS/MeqRequestId.h>
-#include <BBS/MNS/MeqDomain.h>
-#include <BBS/MNS/MeqMatrix.h>
+#include <BBSKernel/MNS/MeqRequestId.h>
+#include <BBSKernel/MNS/MeqDomain.h>
+#include <BBSKernel/MNS/MeqMatrix.h>
#include <Common/lofar_vector.h>
namespace LOFAR
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqResult.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqResult.h
index a7e40feabdc..662d6a60cc5 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqResult.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqResult.h
@@ -27,8 +27,8 @@
// The result of an expression for a domain.
//# Includes
-#include <BBS/MNS/MeqMatrix.h>
-#include <BBS/MNS/Pool.h>
+#include <BBSKernel/MNS/MeqMatrix.h>
+#include <BBSKernel/MNS/Pool.h>
#include <Common/LofarLogger.h>
#include <Common/lofar_map.h>
#include <Common/lofar_iostream.h>
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqResultVec.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqResultVec.h
index 7173b25965a..ee7d6819bfd 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqResultVec.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqResultVec.h
@@ -27,7 +27,7 @@
// A result vector containing multiple results.
//# Includes
-#include <BBS/MNS/MeqResult.h>
+#include <BBSKernel/MNS/MeqResult.h>
#include <Common/lofar_iostream.h>
#include <Common/lofar_vector.h>
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqSource.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqSource.h
index d4a9d643384..19fe9443e47 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqSource.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqSource.h
@@ -27,7 +27,7 @@
// Abstract base class for holding a source
//# Includes
-#include <BBS/MNS/MeqExpr.h>
+#include <BBSKernel/MNS/MeqExpr.h>
#include <Common/lofar_string.h>
namespace LOFAR
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqSourceList.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqSourceList.h
index cb59574835d..7451fdde258 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqSourceList.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqSourceList.h
@@ -27,7 +27,7 @@
// List of sources
//# Includes
-#include <BBS/MNS/MeqPointSource.h>
+#include <BBSKernel/MNS/MeqPointSource.h>
#include <ParmDB/ParmDB.h>
#include <Common/lofar_vector.h>
#include <Common/lofar_map.h>
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqStatExpr.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqStatExpr.h
index 5a3cb3f576b..8add9699015 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqStatExpr.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqStatExpr.h
@@ -27,8 +27,8 @@
// The Jones expression for a station
//# Includes
-#include <BBS/MNS/MeqJonesExpr.h>
-#include <BBS/MNS/MeqExpr.h>
+#include <BBSKernel/MNS/MeqJonesExpr.h>
+#include <BBSKernel/MNS/MeqExpr.h>
namespace LOFAR
{
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqStatUVW.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqStatUVW.h
index bfdfdc4d80a..dbd18c787e4 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqStatUVW.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqStatUVW.h
@@ -27,9 +27,9 @@
// The station UVW coordinates for a time domain
//# Includes
-#include <BBS/MNS/MeqResult.h>
-#include <BBS/MNS/MeqRequest.h>
-#include <BBS/MNS/MeqStation.h>
+#include <BBSKernel/MNS/MeqResult.h>
+#include <BBSKernel/MNS/MeqRequest.h>
+#include <BBSKernel/MNS/MeqStation.h>
#include <Common/lofar_map.h>
#include <measures/Measures/MeasFrame.h>
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqStation.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqStation.h
index f984aa574b9..603c4cdec01 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqStation.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqStation.h
@@ -27,7 +27,7 @@
// Class holding the ITRF position expressions of a station
//# Includes
-#include <BBS/MNS/MeqExpr.h>
+#include <BBSKernel/MNS/MeqExpr.h>
#include <Common/lofar_string.h>
namespace LOFAR
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqTabular.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqTabular.h
index d26d2bb3f8a..1e01e97c85a 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqTabular.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqTabular.h
@@ -27,7 +27,7 @@
// A tabular (non-solvable) parameter value.
//# Includes
-#include <BBS/MNS/MeqFunklet.h>
+#include <BBSKernel/MNS/MeqFunklet.h>
namespace LOFAR
{
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/ParmData.h b/CEP/BB/BBSKernel/include/BBSKernel/ParmData.h
index 1de1de7b2ca..54af03cfafe 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/ParmData.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/ParmData.h
@@ -27,8 +27,8 @@
// The properties for solvable parameters
//# Includes
-#include <BBS/MNS/MeqMatrix.h>
-#include <BBS/MNS/MeqFunklet.h>
+#include <BBSKernel/MNS/MeqMatrix.h>
+#include <BBSKernel/MNS/MeqFunklet.h>
#include <Common/LofarTypes.h>
#include <string>
#include <vector>
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/Prediffer.h b/CEP/BB/BBSKernel/include/BBSKernel/Prediffer.h
index 6d2f86a7fc6..aaeda808682 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/Prediffer.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/Prediffer.h
@@ -30,23 +30,23 @@
#include <casa/Arrays/Matrix.h>
#include <scimath/Fitting/LSQFit.h>
-#include <BBS/StrategyProp.h>
-#include <BBS/StepProp.h>
-#include <BBS/SolveProp.h>
-#include <BBS/ParmData.h>
-#include <BBS/MMapMSInfo.h>
-#include <BBS/MNS/MeqDomain.h>
-#include <BBS/MNS/MeqJonesExpr.h>
-#include <BBS/MNS/MeqJonesNode.h>
-#include <BBS/MNS/MeqMatrix.h>
-#include <BBS/MNS/MeqParm.h>
-#include <BBS/MNS/MeqPhaseRef.h>
-#include <BBS/MNS/MeqSourceList.h>
-#include <BBS/MNS/MeqRequest.h>
-#include <BBS/MNS/MeqStation.h>
-#include <BBS/MNS/MeqStatUVW.h>
-#include <BBS/MNS/MeqLMN.h>
-#include <BBS/MNS/MeqDFTPS.h>
+#include <BBSKernel/StrategyProp.h>
+#include <BBSKernel/StepProp.h>
+#include <BBSKernel/SolveProp.h>
+#include <BBSKernel/ParmData.h>
+#include <BBSKernel/MMapMSInfo.h>
+#include <BBSKernel/MNS/MeqDomain.h>
+#include <BBSKernel/MNS/MeqJonesExpr.h>
+#include <BBSKernel/MNS/MeqJonesNode.h>
+#include <BBSKernel/MNS/MeqMatrix.h>
+#include <BBSKernel/MNS/MeqParm.h>
+#include <BBSKernel/MNS/MeqPhaseRef.h>
+#include <BBSKernel/MNS/MeqSourceList.h>
+#include <BBSKernel/MNS/MeqRequest.h>
+#include <BBSKernel/MNS/MeqStation.h>
+#include <BBSKernel/MNS/MeqStatUVW.h>
+#include <BBSKernel/MNS/MeqLMN.h>
+#include <BBSKernel/MNS/MeqDFTPS.h>
#include <ParmDB/ParmDB.h>
#include <ParmDB/ParmValue.h>
#include <MS/MSDesc.h>
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/SolveProp.h b/CEP/BB/BBSKernel/include/BBSKernel/SolveProp.h
index 365315b7a22..b4dbae313a7 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/SolveProp.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/SolveProp.h
@@ -26,7 +26,7 @@
// \file
// Solve properties.
-#include <BBS/MNS/MeqDomain.h>
+#include <BBSKernel/MNS/MeqDomain.h>
#include <Common/lofar_vector.h>
#include <Common/lofar_string.h>
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/Solver.h b/CEP/BB/BBSKernel/include/BBSKernel/Solver.h
index eb8edda60b4..8cb931409b1 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/Solver.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/Solver.h
@@ -27,8 +27,8 @@
// Calculates parameter values using a least squares fitter
#include <scimath/Fitting/LSQaips.h>
-#include <BBS/ParmData.h>
-#include <BBS/Quality.h>
+#include <BBSKernel/ParmData.h>
+#include <BBSKernel/Quality.h>
#include <ParmDB/ParmDB.h>
#include <Common/LofarTypes.h>
#include <Common/lofar_vector.h>
diff --git a/CEP/BB/BBSKernel/src/BBSKernel.cc b/CEP/BB/BBSKernel/src/BBSKernel.cc
index 38d0b130f60..e3667b83c6c 100644
--- a/CEP/BB/BBSKernel/src/BBSKernel.cc
+++ b/CEP/BB/BBSKernel/src/BBSKernel.cc
@@ -25,7 +25,7 @@
#include <Common/LofarLogger.h>
#include <PLC/ACCmain.h>
-#include <BBS/BBSKernelProcessControl.h>
+#include <BBSKernel/BBSKernelProcessControl.h>
using namespace LOFAR::BBS;
diff --git a/CEP/BB/BBSKernel/src/BBSKernelProcessControl.cc b/CEP/BB/BBSKernel/src/BBSKernelProcessControl.cc
index 4f26d049f1c..0554d5405bd 100644
--- a/CEP/BB/BBSKernel/src/BBSKernelProcessControl.cc
+++ b/CEP/BB/BBSKernel/src/BBSKernelProcessControl.cc
@@ -26,7 +26,7 @@
#include <lofar_config.h>
#include <Common/LofarLogger.h>
-#include <BBS/BBSKernelProcessControl.h>
+#include <BBSKernel/BBSKernelProcessControl.h>
namespace LOFAR
{
diff --git a/CEP/BB/BBSKernel/src/BBSTestLogger.cc b/CEP/BB/BBSKernel/src/BBSTestLogger.cc
index adadde26de0..9a5e46b7070 100644
--- a/CEP/BB/BBSKernel/src/BBSTestLogger.cc
+++ b/CEP/BB/BBSKernel/src/BBSTestLogger.cc
@@ -27,7 +27,7 @@
#include <lofar_config.h>
#include <Common/LofarLogger.h>
#include <BBSTestLogger.h>
-#include <BBS/ParmData.h>
+#include <BBSKernel/ParmData.h>
#include <sstream>
namespace LOFAR
diff --git a/CEP/BB/BBSKernel/src/BBSTestLogger.h b/CEP/BB/BBSKernel/src/BBSTestLogger.h
index 2b6df2ed7d9..df56e215930 100644
--- a/CEP/BB/BBSKernel/src/BBSTestLogger.h
+++ b/CEP/BB/BBSKernel/src/BBSTestLogger.h
@@ -34,7 +34,7 @@
#include <Common/lofar_vector.h>
#include <Transport/TH_MPI.h>
#include <fstream>
-#include <BBS/ParmData.h>
+#include <BBSKernel/ParmData.h>
#include <Common/Timer.h>
#include <casa/OS/Timer.h>
diff --git a/CEP/BB/BBSKernel/src/BBSrun.cc b/CEP/BB/BBSKernel/src/BBSrun.cc
index 7af34e91a99..5f65fb6916e 100644
--- a/CEP/BB/BBSKernel/src/BBSrun.cc
+++ b/CEP/BB/BBSKernel/src/BBSrun.cc
@@ -22,8 +22,8 @@
#include <lofar_config.h>
-#include <BBS/Prediffer.h>
-#include <BBS/Solver.h>
+#include <BBSKernel/Prediffer.h>
+#include <BBSKernel/Solver.h>
#include <ParmDB/ParmDB.h>
#include <ParmDB/ParmDBMeta.h>
#include <MS/MSDesc.h>
diff --git a/CEP/BB/BBSKernel/src/Fitter.cc b/CEP/BB/BBSKernel/src/Fitter.cc
index 34d4a842647..ad186b671e9 100644
--- a/CEP/BB/BBSKernel/src/Fitter.cc
+++ b/CEP/BB/BBSKernel/src/Fitter.cc
@@ -20,7 +20,7 @@
//#
//# $Id$
-#include <BBS/Fitter.h>
+#include <BBSKernel/Fitter.h>
#include <Common/LofarLogger.h>
#include <casa/Containers/Record.h>
#include <casa/IO/AipsIO.h>
diff --git a/CEP/BB/BBSKernel/src/FlagsMap.cc b/CEP/BB/BBSKernel/src/FlagsMap.cc
index 94d51ac11ab..47a4f530123 100644
--- a/CEP/BB/BBSKernel/src/FlagsMap.cc
+++ b/CEP/BB/BBSKernel/src/FlagsMap.cc
@@ -21,7 +21,7 @@
//# $Id$
#include <lofar_config.h>
-#include <BBS/FlagsMap.h>
+#include <BBSKernel/FlagsMap.h>
namespace LOFAR
{
diff --git a/CEP/BB/BBSKernel/src/FlagsMap.h b/CEP/BB/BBSKernel/src/FlagsMap.h
index c2112440335..e4f430c7a57 100644
--- a/CEP/BB/BBSKernel/src/FlagsMap.h
+++ b/CEP/BB/BBSKernel/src/FlagsMap.h
@@ -24,7 +24,7 @@
#define BBS_FLAGSMAP_H
//# Includes
-#include <BBS/MMap.h>
+#include <BBSKernel/MMap.h>
namespace LOFAR
{
diff --git a/CEP/BB/BBSKernel/src/MMap.cc b/CEP/BB/BBSKernel/src/MMap.cc
index db791375c0d..11d5511d5b6 100644
--- a/CEP/BB/BBSKernel/src/MMap.cc
+++ b/CEP/BB/BBSKernel/src/MMap.cc
@@ -22,7 +22,7 @@
#include <lofar_config.h>
-#include <BBS/MMap.h>
+#include <BBSKernel/MMap.h>
#include <sys/mman.h>
#include <fcntl.h>
#include <unistd.h>
diff --git a/CEP/BB/BBSKernel/src/MMapMSInfo.cc b/CEP/BB/BBSKernel/src/MMapMSInfo.cc
index 44ef2b06de0..a9b0e2c9a52 100644
--- a/CEP/BB/BBSKernel/src/MMapMSInfo.cc
+++ b/CEP/BB/BBSKernel/src/MMapMSInfo.cc
@@ -20,7 +20,7 @@
//#
//# $Id$
-#include <BBS/MMapMSInfo.h>
+#include <BBSKernel/MMapMSInfo.h>
#include <MS/MSDesc.h>
namespace LOFAR
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqBaseDFTPS.cc b/CEP/BB/BBSKernel/src/MNS/MeqBaseDFTPS.cc
index 298ead81bdb..5a9e6ba2121 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqBaseDFTPS.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqBaseDFTPS.cc
@@ -22,8 +22,8 @@
#include <lofar_config.h>
-#include <BBS/MNS/MeqBaseDFTPS.h>
-#include <BBS/MNS/MeqMatrixTmp.h>
+#include <BBSKernel/MNS/MeqBaseDFTPS.h>
+#include <BBSKernel/MNS/MeqMatrixTmp.h>
#include <Common/LofarLogger.h>
using namespace casa;
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqBaseDFTPS.h b/CEP/BB/BBSKernel/src/MNS/MeqBaseDFTPS.h
index 122abfe5bc6..fc10b9f8f52 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqBaseDFTPS.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqBaseDFTPS.h
@@ -27,7 +27,7 @@
// Baseline DFT of a point source.
//# Includes
-#include <BBS/MNS/MeqExpr.h>
+#include <BBSKernel/MNS/MeqExpr.h>
namespace LOFAR
{
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqBaseLinPS.cc b/CEP/BB/BBSKernel/src/MNS/MeqBaseLinPS.cc
index 19d40ba51ae..214e0109df9 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqBaseLinPS.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqBaseLinPS.cc
@@ -23,8 +23,8 @@
#include <lofar_config.h>
//#include <Common/Timer.h>
-#include <BBS/MNS/MeqBaseLinPS.h>
-#include <BBS/MNS/MeqMatrixTmp.h>
+#include <BBSKernel/MNS/MeqBaseLinPS.h>
+#include <BBSKernel/MNS/MeqMatrixTmp.h>
#include <Common/LofarLogger.h>
using namespace casa;
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqBaseLinPS.h b/CEP/BB/BBSKernel/src/MNS/MeqBaseLinPS.h
index 562dbecd6ec..71a930f080c 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqBaseLinPS.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqBaseLinPS.h
@@ -27,10 +27,10 @@
// Baseline prediction of a point source with linear polarisation.
//# Includes
-#include <BBS/MNS/MeqJonesExpr.h>
-#include <BBS/MNS/MeqLMN.h>
-#include <BBS/MNS/MeqPointSource.h>
-#include <BBS/MNS/MeqDFTPS.h>
+#include <BBSKernel/MNS/MeqJonesExpr.h>
+#include <BBSKernel/MNS/MeqLMN.h>
+#include <BBSKernel/MNS/MeqPointSource.h>
+#include <BBSKernel/MNS/MeqDFTPS.h>
namespace LOFAR
{
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqDFTPS.cc b/CEP/BB/BBSKernel/src/MNS/MeqDFTPS.cc
index 8f1914c4572..c8553d23dfc 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqDFTPS.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqDFTPS.cc
@@ -22,12 +22,12 @@
#include <lofar_config.h>
-#include <BBS/MNS/MeqDFTPS.h>
-#include <BBS/MNS/MeqStatUVW.h>
-#include <BBS/MNS/MeqLMN.h>
-#include <BBS/MNS/MeqRequest.h>
-#include <BBS/MNS/MeqResult.h>
-#include <BBS/MNS/MeqMatrixTmp.h>
+#include <BBSKernel/MNS/MeqDFTPS.h>
+#include <BBSKernel/MNS/MeqStatUVW.h>
+#include <BBSKernel/MNS/MeqLMN.h>
+#include <BBSKernel/MNS/MeqRequest.h>
+#include <BBSKernel/MNS/MeqResult.h>
+#include <BBSKernel/MNS/MeqMatrixTmp.h>
#include <casa/BasicSL/Constants.h>
using namespace casa;
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqDFTPS.h b/CEP/BB/BBSKernel/src/MNS/MeqDFTPS.h
index 4cb817e02cd..c0ecd8112f2 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqDFTPS.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqDFTPS.h
@@ -27,7 +27,7 @@
// The DFT for a point source.
//# Includes
-#include <BBS/MNS/MeqExpr.h>
+#include <BBSKernel/MNS/MeqExpr.h>
#include <Common/lofar_vector.h>
namespace LOFAR
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqDiag.cc b/CEP/BB/BBSKernel/src/MNS/MeqDiag.cc
index 92de9acc84c..c26bbdd915f 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqDiag.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqDiag.cc
@@ -23,8 +23,8 @@
#include <lofar_config.h>
//#include <Common/Profiling/PerfProfile.h>
-#include <BBS/MNS/MeqDiag.h>
-#include <BBS/MNS/MeqExpr.h>
+#include <BBSKernel/MNS/MeqDiag.h>
+#include <BBSKernel/MNS/MeqExpr.h>
namespace LOFAR
{
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqDiag.h b/CEP/BB/BBSKernel/src/MNS/MeqDiag.h
index 744c75c6f2b..0b680e8587f 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqDiag.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqDiag.h
@@ -27,8 +27,8 @@
// The Jones expression for a diagonal matrix
//# Includes
-#include <BBS/MNS/MeqJonesExpr.h>
-#include <BBS/MNS/MeqExpr.h>
+#include <BBSKernel/MNS/MeqJonesExpr.h>
+#include <BBSKernel/MNS/MeqExpr.h>
namespace LOFAR
{
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqDomain.cc b/CEP/BB/BBSKernel/src/MNS/MeqDomain.cc
index 5191166540c..fe3a553c55c 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqDomain.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqDomain.cc
@@ -21,7 +21,7 @@
//# $Id$
#include <lofar_config.h>
-#include <BBS/MNS/MeqDomain.h>
+#include <BBSKernel/MNS/MeqDomain.h>
#include <Common/LofarLogger.h>
namespace LOFAR
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqExpr.cc b/CEP/BB/BBSKernel/src/MNS/MeqExpr.cc
index 428b62eac37..89f07cd712c 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqExpr.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqExpr.cc
@@ -21,10 +21,10 @@
//# $Id$
#include <lofar_config.h>
-#include <BBS/MNS/MeqExpr.h>
-#include <BBS/MNS/MeqResult.h>
-#include <BBS/MNS/MeqMatrixTmp.h>
-#include <BBS/MNS/MeqRequest.h>
+#include <BBSKernel/MNS/MeqExpr.h>
+#include <BBSKernel/MNS/MeqResult.h>
+#include <BBSKernel/MNS/MeqMatrixTmp.h>
+#include <BBSKernel/MNS/MeqRequest.h>
#include <Common/LofarLogger.h>
#include <Common/Exception.h>
//#include <Common/Timer.h>
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqExpr.h b/CEP/BB/BBSKernel/src/MNS/MeqExpr.h
index 7cbe0f89470..fc803763558 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqExpr.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqExpr.h
@@ -27,10 +27,10 @@
// The base class of an expression
//# Includes
-#include <BBS/MNS/MeqRequestId.h>
-#include <BBS/MNS/MeqRequest.h>
-#include <BBS/MNS/MeqResult.h>
-#include <BBS/MNS/MeqResultVec.h>
+#include <BBSKernel/MNS/MeqRequestId.h>
+#include <BBSKernel/MNS/MeqRequest.h>
+#include <BBSKernel/MNS/MeqResult.h>
+#include <BBSKernel/MNS/MeqResultVec.h>
#include <vector>
#ifdef EXPR_GRAPH
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqFunklet.cc b/CEP/BB/BBSKernel/src/MNS/MeqFunklet.cc
index 839db362387..fd94146cd5f 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqFunklet.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqFunklet.cc
@@ -22,10 +22,10 @@
#include <lofar_config.h>
-#include <BBS/MNS/MeqFunklet.h>
-#include <BBS/MNS/MeqPolc.h>
-#include <BBS/MNS/MeqPolcLog.h>
-#include <BBS/MNS/MeqTabular.h>
+#include <BBSKernel/MNS/MeqFunklet.h>
+#include <BBSKernel/MNS/MeqPolc.h>
+#include <BBSKernel/MNS/MeqPolcLog.h>
+#include <BBSKernel/MNS/MeqTabular.h>
#include <Common/LofarLogger.h>
#include <Common/VectorUtil.h>
#include <casa/Arrays/Matrix.h>
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqFunklet.h b/CEP/BB/BBSKernel/src/MNS/MeqFunklet.h
index 11b7b8666eb..d47cf07181e 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqFunklet.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqFunklet.h
@@ -27,8 +27,8 @@
// Parameter function with coeffients valid for a given domain
//# Includes
-#include <BBS/MNS/MeqDomain.h>
-#include <BBS/MNS/MeqMatrix.h>
+#include <BBSKernel/MNS/MeqDomain.h>
+#include <BBSKernel/MNS/MeqMatrix.h>
#include <ParmDB/ParmValue.h>
#include <Common/lofar_vector.h>
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqGaussSource.cc b/CEP/BB/BBSKernel/src/MNS/MeqGaussSource.cc
index 3e360e4c545..9543710f2ac 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqGaussSource.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqGaussSource.cc
@@ -21,7 +21,7 @@
//# $Id$
#include <lofar_config.h>
-#include <BBS/MNS/MeqGaussSource.h>
+#include <BBSKernel/MNS/MeqGaussSource.h>
namespace LOFAR
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqGaussSource.h b/CEP/BB/BBSKernel/src/MNS/MeqGaussSource.h
index 5577212c35d..76055d5bed6 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqGaussSource.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqGaussSource.h
@@ -27,7 +27,7 @@
// Class holding a gaussian source
//# Includes
-#include <BBS/MNS/MeqSource.h>
+#include <BBSKernel/MNS/MeqSource.h>
#include <Common/lofar_string.h>
namespace LOFAR
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqJonesCMul2.cc b/CEP/BB/BBSKernel/src/MNS/MeqJonesCMul2.cc
index b75c337d590..f0c805098ad 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqJonesCMul2.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqJonesCMul2.cc
@@ -22,11 +22,11 @@
#include <lofar_config.h>
-#include <BBS/MNS/MeqJonesCMul2.h>
-#include <BBS/MNS/MeqRequest.h>
-#include <BBS/MNS/MeqJonesResult.h>
-#include <BBS/MNS/MeqMatrix.h>
-#include <BBS/MNS/MeqMatrixTmp.h>
+#include <BBSKernel/MNS/MeqJonesCMul2.h>
+#include <BBSKernel/MNS/MeqRequest.h>
+#include <BBSKernel/MNS/MeqJonesResult.h>
+#include <BBSKernel/MNS/MeqMatrix.h>
+#include <BBSKernel/MNS/MeqMatrixTmp.h>
#include <Common/LofarLogger.h>
using namespace casa;
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqJonesCMul2.h b/CEP/BB/BBSKernel/src/MNS/MeqJonesCMul2.h
index f063edd0f5b..c0a2204b0f4 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqJonesCMul2.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqJonesCMul2.h
@@ -26,7 +26,7 @@
// Calculate left*conj(right)
//# Includes
-#include <BBS/MNS/MeqJonesExpr.h>
+#include <BBSKernel/MNS/MeqJonesExpr.h>
namespace LOFAR
{
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqJonesCMul3.cc b/CEP/BB/BBSKernel/src/MNS/MeqJonesCMul3.cc
index fa5079133f5..841dc66c12d 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqJonesCMul3.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqJonesCMul3.cc
@@ -23,11 +23,11 @@
#include <lofar_config.h>
#include <Common/Timer.h>
-#include <BBS/MNS/MeqJonesCMul3.h>
-#include <BBS/MNS/MeqRequest.h>
-#include <BBS/MNS/MeqJonesResult.h>
-#include <BBS/MNS/MeqMatrix.h>
-#include <BBS/MNS/MeqMatrixTmp.h>
+#include <BBSKernel/MNS/MeqJonesCMul3.h>
+#include <BBSKernel/MNS/MeqRequest.h>
+#include <BBSKernel/MNS/MeqJonesResult.h>
+#include <BBSKernel/MNS/MeqMatrix.h>
+#include <BBSKernel/MNS/MeqMatrixTmp.h>
#include <Common/LofarLogger.h>
#if defined __SSE2__
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqJonesCMul3.h b/CEP/BB/BBSKernel/src/MNS/MeqJonesCMul3.h
index 557768318c8..b063498a66c 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqJonesCMul3.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqJonesCMul3.h
@@ -27,7 +27,7 @@
// Calculate left*mid*conj(right)
//# Includes
-#include <BBS/MNS/MeqJonesExpr.h>
+#include <BBSKernel/MNS/MeqJonesExpr.h>
namespace LOFAR
{
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqJonesExpr.cc b/CEP/BB/BBSKernel/src/MNS/MeqJonesExpr.cc
index d906012aeaa..f7d31ecac27 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqJonesExpr.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqJonesExpr.cc
@@ -22,7 +22,7 @@
#include <lofar_config.h>
-#include <BBS/MNS/MeqJonesExpr.h>
+#include <BBSKernel/MNS/MeqJonesExpr.h>
#include <Common/LofarLogger.h>
//#include <Common/Timer.h>
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqJonesExpr.h b/CEP/BB/BBSKernel/src/MNS/MeqJonesExpr.h
index ee9717907d1..5ad7517f917 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqJonesExpr.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqJonesExpr.h
@@ -27,9 +27,9 @@
// The base class of a Jones matrix expression.
//# Includes
-#include <BBS/MNS/MeqExpr.h>
-#include <BBS/MNS/MeqJonesResult.h>
-#include <BBS/MNS/MeqRequest.h>
+#include <BBSKernel/MNS/MeqExpr.h>
+#include <BBSKernel/MNS/MeqJonesResult.h>
+#include <BBSKernel/MNS/MeqRequest.h>
#include <Common/LofarLogger.h>
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqJonesInvert.cc b/CEP/BB/BBSKernel/src/MNS/MeqJonesInvert.cc
index f40ce8ef535..434f6565c29 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqJonesInvert.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqJonesInvert.cc
@@ -20,10 +20,10 @@
//#
//# $Id$
-#include <BBS/MNS/MeqJonesInvert.h>
-#include <BBS/MNS/MeqRequest.h>
-#include <BBS/MNS/MeqMatrix.h>
-#include <BBS/MNS/MeqMatrixTmp.h>
+#include <BBSKernel/MNS/MeqJonesInvert.h>
+#include <BBSKernel/MNS/MeqRequest.h>
+#include <BBSKernel/MNS/MeqMatrix.h>
+#include <BBSKernel/MNS/MeqMatrixTmp.h>
// Inverse of a 2x2 matrix:
//
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqJonesInvert.h b/CEP/BB/BBSKernel/src/MNS/MeqJonesInvert.h
index b086acc9584..7075fc610a7 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqJonesInvert.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqJonesInvert.h
@@ -27,7 +27,7 @@
// The inverse of a Jones matrix expression.
//# Includes
-#include <BBS/MNS/MeqJonesExpr.h>
+#include <BBSKernel/MNS/MeqJonesExpr.h>
namespace LOFAR
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqJonesMMap.cc b/CEP/BB/BBSKernel/src/MNS/MeqJonesMMap.cc
index 455a86a9e74..0a42f6b389a 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqJonesMMap.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqJonesMMap.cc
@@ -21,7 +21,7 @@
//# $Id$
#include <lofar_config.h>
-#include <BBS/MNS/MeqJonesMMap.h>
+#include <BBSKernel/MNS/MeqJonesMMap.h>
#include <Common/LofarLogger.h>
namespace LOFAR
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqJonesMMap.h b/CEP/BB/BBSKernel/src/MNS/MeqJonesMMap.h
index f6ad6d72521..6fc8083417c 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqJonesMMap.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqJonesMMap.h
@@ -27,8 +27,8 @@
// Get part of the data from the Mapped MS.
//# Includes
-#include <BBS/MNS/MeqJonesExpr.h>
-#include <BBS/MMapMSInfo.h>
+#include <BBSKernel/MNS/MeqJonesExpr.h>
+#include <BBSKernel/MMapMSInfo.h>
namespace LOFAR
{
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqJonesMul2.cc b/CEP/BB/BBSKernel/src/MNS/MeqJonesMul2.cc
index bdfde500029..1b9d88ba2ba 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqJonesMul2.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqJonesMul2.cc
@@ -22,11 +22,11 @@
#include <lofar_config.h>
-#include <BBS/MNS/MeqJonesMul2.h>
-#include <BBS/MNS/MeqRequest.h>
-#include <BBS/MNS/MeqJonesResult.h>
-#include <BBS/MNS/MeqMatrix.h>
-#include <BBS/MNS/MeqMatrixTmp.h>
+#include <BBSKernel/MNS/MeqJonesMul2.h>
+#include <BBSKernel/MNS/MeqRequest.h>
+#include <BBSKernel/MNS/MeqJonesResult.h>
+#include <BBSKernel/MNS/MeqMatrix.h>
+#include <BBSKernel/MNS/MeqMatrixTmp.h>
#include <Common/LofarLogger.h>
using namespace casa;
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqJonesMul2.h b/CEP/BB/BBSKernel/src/MNS/MeqJonesMul2.h
index cecdb0bae2d..4554d280b0a 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqJonesMul2.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqJonesMul2.h
@@ -26,7 +26,7 @@
// Calculate left*right
//# Includes
-#include <BBS/MNS/MeqJonesExpr.h>
+#include <BBSKernel/MNS/MeqJonesExpr.h>
namespace LOFAR
{
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqJonesMul3.cc b/CEP/BB/BBSKernel/src/MNS/MeqJonesMul3.cc
index b002479b408..88533b5591e 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqJonesMul3.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqJonesMul3.cc
@@ -22,11 +22,11 @@
#include <lofar_config.h>
-#include <BBS/MNS/MeqJonesMul3.h>
-#include <BBS/MNS/MeqRequest.h>
-#include <BBS/MNS/MeqJonesResult.h>
-#include <BBS/MNS/MeqMatrix.h>
-#include <BBS/MNS/MeqMatrixTmp.h>
+#include <BBSKernel/MNS/MeqJonesMul3.h>
+#include <BBSKernel/MNS/MeqRequest.h>
+#include <BBSKernel/MNS/MeqJonesResult.h>
+#include <BBSKernel/MNS/MeqMatrix.h>
+#include <BBSKernel/MNS/MeqMatrixTmp.h>
#include <Common/LofarLogger.h>
using namespace casa;
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqJonesMul3.h b/CEP/BB/BBSKernel/src/MNS/MeqJonesMul3.h
index 5f51d6c1d03..ed999a2cfbb 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqJonesMul3.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqJonesMul3.h
@@ -27,7 +27,7 @@
// Calculate left*mid*right
//# Includes
-#include <BBS/MNS/MeqJonesExpr.h>
+#include <BBSKernel/MNS/MeqJonesExpr.h>
namespace LOFAR
{
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqJonesNode.cc b/CEP/BB/BBSKernel/src/MNS/MeqJonesNode.cc
index 9a14dc5abb2..996335f76b8 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqJonesNode.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqJonesNode.cc
@@ -22,8 +22,8 @@
#include <lofar_config.h>
-#include <BBS/MNS/MeqJonesNode.h>
-#include <BBS/MNS/MeqExpr.h>
+#include <BBSKernel/MNS/MeqJonesNode.h>
+#include <BBSKernel/MNS/MeqExpr.h>
namespace LOFAR
{
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqJonesNode.h b/CEP/BB/BBSKernel/src/MNS/MeqJonesNode.h
index 85739fef4d5..0212d344e4f 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqJonesNode.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqJonesNode.h
@@ -27,8 +27,8 @@
// A node in a Jones matrix expression.
//# Includes
-#include <BBS/MNS/MeqJonesExpr.h>
-#include <BBS/MNS/MeqExpr.h>
+#include <BBSKernel/MNS/MeqJonesExpr.h>
+#include <BBSKernel/MNS/MeqExpr.h>
namespace LOFAR
{
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqJonesResult.h b/CEP/BB/BBSKernel/src/MNS/MeqJonesResult.h
index 8aadacee203..16f64e0a5cc 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqJonesResult.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqJonesResult.h
@@ -27,7 +27,7 @@
// The result of the 4 expressions in a Jones matrix for a domain.
//# Includes
-#include <BBS/MNS/MeqResultVec.h>
+#include <BBSKernel/MNS/MeqResultVec.h>
// This class represents the result in a Jones matrix of a domain for
// which the expressions have been evaluated.
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqJonesSum.cc b/CEP/BB/BBSKernel/src/MNS/MeqJonesSum.cc
index dee25c651cb..e45e8b23a26 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqJonesSum.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqJonesSum.cc
@@ -22,9 +22,9 @@
#include <lofar_config.h>
-#include <BBS/MNS/MeqJonesSum.h>
-#include <BBS/MNS/MeqJonesResult.h>
-#include <BBS/MNS/MeqMatrixTmp.h>
+#include <BBSKernel/MNS/MeqJonesSum.h>
+#include <BBSKernel/MNS/MeqJonesResult.h>
+#include <BBSKernel/MNS/MeqMatrixTmp.h>
namespace LOFAR
{
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqJonesSum.h b/CEP/BB/BBSKernel/src/MNS/MeqJonesSum.h
index c96509ca2c2..f1db5854269 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqJonesSum.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqJonesSum.h
@@ -27,7 +27,7 @@
// A sum of MeqJonesExpr
//# Includes
-#include <BBS/MNS/MeqJonesExpr.h>
+#include <BBSKernel/MNS/MeqJonesExpr.h>
#include <vector>
namespace LOFAR
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqLMN.cc b/CEP/BB/BBSKernel/src/MNS/MeqLMN.cc
index 4fa3eb2e55c..c0425aa30de 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqLMN.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqLMN.cc
@@ -22,11 +22,11 @@
#include <lofar_config.h>
-#include <BBS/MNS/MeqLMN.h>
-#include <BBS/MNS/MeqSource.h>
-#include <BBS/MNS/MeqPhaseRef.h>
-#include <BBS/MNS/MeqRequest.h>
-#include <BBS/MNS/MeqMatrixTmp.h>
+#include <BBSKernel/MNS/MeqLMN.h>
+#include <BBSKernel/MNS/MeqSource.h>
+#include <BBSKernel/MNS/MeqPhaseRef.h>
+#include <BBSKernel/MNS/MeqRequest.h>
+#include <BBSKernel/MNS/MeqMatrixTmp.h>
#include <Common/LofarLogger.h>
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqLMN.h b/CEP/BB/BBSKernel/src/MNS/MeqLMN.h
index 119ff89392e..0d1bcf99b7b 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqLMN.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqLMN.h
@@ -27,7 +27,7 @@
// Class holding the LMN values of a point source
//# Includes
-#include <BBS/MNS/MeqExpr.h>
+#include <BBSKernel/MNS/MeqExpr.h>
#include <Common/lofar_string.h>
namespace LOFAR
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqLMNAn.cc b/CEP/BB/BBSKernel/src/MNS/MeqLMNAn.cc
index e8750d6836e..40738fec1fe 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqLMNAn.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqLMNAn.cc
@@ -23,11 +23,11 @@
#include <lofar_config.h>
#include <Common/Profiling/PerfProfile.h>
-#include <BBS/MNS/MeqLMN.h>
-#include <BBS/MNS/MeqPointSource.h>
-#include <BBS/MNS/MeqPhaseRef.h>
-#include <BBS/MNS/MeqRequest.h>
-#include <BBS/MNS/MeqMatrixTmp.h>
+#include <BBSKernel/MNS/MeqLMN.h>
+#include <BBSKernel/MNS/MeqPointSource.h>
+#include <BBSKernel/MNS/MeqPhaseRef.h>
+#include <BBSKernel/MNS/MeqRequest.h>
+#include <BBSKernel/MNS/MeqMatrixTmp.h>
#include <Common/LofarLogger.h>
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqMatrix.cc b/CEP/BB/BBSKernel/src/MNS/MeqMatrix.cc
index bc49be8f88f..4c0b9b51fcb 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqMatrix.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqMatrix.cc
@@ -21,12 +21,12 @@
//# $Id$
#include <lofar_config.h>
-#include <BBS/MNS/MeqMatrix.h>
-#include <BBS/MNS/MeqMatrixTmp.h>
-#include <BBS/MNS/MeqMatrixRealSca.h>
-#include <BBS/MNS/MeqMatrixComplexSca.h>
-#include <BBS/MNS/MeqMatrixRealArr.h>
-#include <BBS/MNS/MeqMatrixComplexArr.h>
+#include <BBSKernel/MNS/MeqMatrix.h>
+#include <BBSKernel/MNS/MeqMatrixTmp.h>
+#include <BBSKernel/MNS/MeqMatrixRealSca.h>
+#include <BBSKernel/MNS/MeqMatrixComplexSca.h>
+#include <BBSKernel/MNS/MeqMatrixRealArr.h>
+#include <BBSKernel/MNS/MeqMatrixComplexArr.h>
#include <Blob/BlobArray.h>
#include <Blob/BlobOStream.h>
#include <Blob/BlobIStream.h>
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqMatrix.h b/CEP/BB/BBSKernel/src/MNS/MeqMatrix.h
index f57291e271a..be22bc571ee 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqMatrix.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqMatrix.h
@@ -27,7 +27,7 @@
// Matrix for Mns
//# Includes
-#include <BBS/MNS/MeqMatrixRep.h>
+#include <BBSKernel/MNS/MeqMatrixRep.h>
//# Forward Declarations
namespace casa
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqMatrixComplexArr.cc b/CEP/BB/BBSKernel/src/MNS/MeqMatrixComplexArr.cc
index 4739b80aadf..31322aabcd3 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqMatrixComplexArr.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqMatrixComplexArr.cc
@@ -24,11 +24,11 @@
#include <lofar_config.h>
-#include <BBS/MNS/MeqMatrixRealSca.h>
-#include <BBS/MNS/MeqMatrixRealArr.h>
-#include <BBS/MNS/MeqMatrixComplexSca.h>
-#include <BBS/MNS/MeqMatrixComplexArr.h>
-#include <BBS/MNS/Pool.h>
+#include <BBSKernel/MNS/MeqMatrixRealSca.h>
+#include <BBSKernel/MNS/MeqMatrixRealArr.h>
+#include <BBSKernel/MNS/MeqMatrixComplexSca.h>
+#include <BBSKernel/MNS/MeqMatrixComplexArr.h>
+#include <BBSKernel/MNS/Pool.h>
#include <Common/LofarLogger.h>
#include <Common/lofar_iomanip.h>
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqMatrixComplexArr.h b/CEP/BB/BBSKernel/src/MNS/MeqMatrixComplexArr.h
index c6ab7d93ec3..14ce67e733a 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqMatrixComplexArr.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqMatrixComplexArr.h
@@ -27,7 +27,7 @@
// Temporary matrix for Mns
//# Includes
-#include <BBS/MNS/MeqMatrixRep.h>
+#include <BBSKernel/MNS/MeqMatrixRep.h>
#include <Common/lofar_complex.h>
#include <Common/lofar_stack.h>
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqMatrixComplexSca.cc b/CEP/BB/BBSKernel/src/MNS/MeqMatrixComplexSca.cc
index 77e7c797181..f9013e684bd 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqMatrixComplexSca.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqMatrixComplexSca.cc
@@ -23,10 +23,10 @@
#undef TIMER
#include <lofar_config.h>
-#include <BBS/MNS/MeqMatrixRealSca.h>
-#include <BBS/MNS/MeqMatrixRealArr.h>
-#include <BBS/MNS/MeqMatrixComplexSca.h>
-#include <BBS/MNS/MeqMatrixComplexArr.h>
+#include <BBSKernel/MNS/MeqMatrixRealSca.h>
+#include <BBSKernel/MNS/MeqMatrixRealArr.h>
+#include <BBSKernel/MNS/MeqMatrixComplexSca.h>
+#include <BBSKernel/MNS/MeqMatrixComplexArr.h>
#include <Common/LofarLogger.h>
#if defined TIMER
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqMatrixComplexSca.h b/CEP/BB/BBSKernel/src/MNS/MeqMatrixComplexSca.h
index e6ba3187119..1487ebd3b46 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqMatrixComplexSca.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqMatrixComplexSca.h
@@ -27,7 +27,7 @@
// Temporary matrix for Mns
//# Includes
-#include <BBS/MNS/MeqMatrixRep.h>
+#include <BBSKernel/MNS/MeqMatrixRep.h>
#include <Common/lofar_complex.h>
namespace LOFAR
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqMatrixRealArr.cc b/CEP/BB/BBSKernel/src/MNS/MeqMatrixRealArr.cc
index 5c373faece8..e8e56fd86d6 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqMatrixRealArr.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqMatrixRealArr.cc
@@ -23,11 +23,11 @@
#undef TIMER
#include <lofar_config.h>
-#include <BBS/MNS/MeqMatrixRealSca.h>
-#include <BBS/MNS/MeqMatrixRealArr.h>
-#include <BBS/MNS/MeqMatrixComplexSca.h>
-#include <BBS/MNS/MeqMatrixComplexArr.h>
-#include <BBS/MNS/Pool.h>
+#include <BBSKernel/MNS/MeqMatrixRealSca.h>
+#include <BBSKernel/MNS/MeqMatrixRealArr.h>
+#include <BBSKernel/MNS/MeqMatrixComplexSca.h>
+#include <BBSKernel/MNS/MeqMatrixComplexArr.h>
+#include <BBSKernel/MNS/Pool.h>
#include <Common/LofarLogger.h>
#include <casa/BasicSL/Constants.h>
#include <cmath>
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqMatrixRealArr.h b/CEP/BB/BBSKernel/src/MNS/MeqMatrixRealArr.h
index 62673f65dc2..2c94c1799d4 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqMatrixRealArr.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqMatrixRealArr.h
@@ -27,7 +27,7 @@
// Temporary matrix for Mns
//# Includes
-#include <BBS/MNS/MeqMatrixRep.h>
+#include <BBSKernel/MNS/MeqMatrixRep.h>
namespace LOFAR
{
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqMatrixRealSca.cc b/CEP/BB/BBSKernel/src/MNS/MeqMatrixRealSca.cc
index 0b5791c94c7..0e2c24e771b 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqMatrixRealSca.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqMatrixRealSca.cc
@@ -21,10 +21,10 @@
//# $Id$
#include <lofar_config.h>
-#include <BBS/MNS/MeqMatrixRealSca.h>
-#include <BBS/MNS/MeqMatrixRealArr.h>
-#include <BBS/MNS/MeqMatrixComplexSca.h>
-#include <BBS/MNS/MeqMatrixComplexArr.h>
+#include <BBSKernel/MNS/MeqMatrixRealSca.h>
+#include <BBSKernel/MNS/MeqMatrixRealArr.h>
+#include <BBSKernel/MNS/MeqMatrixComplexSca.h>
+#include <BBSKernel/MNS/MeqMatrixComplexArr.h>
#include <casa/BasicMath/Math.h>
#include <casa/BasicSL/Constants.h>
#include <Common/lofar_iostream.h>
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqMatrixRealSca.h b/CEP/BB/BBSKernel/src/MNS/MeqMatrixRealSca.h
index 7a4f7c09e2d..675c0f04e0e 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqMatrixRealSca.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqMatrixRealSca.h
@@ -27,7 +27,7 @@
// Temporary matrix for Mns
//# Includes
-#include <BBS/MNS/MeqMatrixRep.h>
+#include <BBSKernel/MNS/MeqMatrixRep.h>
namespace LOFAR
{
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqMatrixRep.cc b/CEP/BB/BBSKernel/src/MNS/MeqMatrixRep.cc
index 10bf4274d04..589bdafaf37 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqMatrixRep.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqMatrixRep.cc
@@ -21,7 +21,7 @@
//# $Id$
#include <lofar_config.h>
-#include <BBS/MNS/MeqMatrixRep.h>
+#include <BBSKernel/MNS/MeqMatrixRep.h>
#include <casa/Exceptions/Error.h>
using namespace casa;
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqMatrixTmp.cc b/CEP/BB/BBSKernel/src/MNS/MeqMatrixTmp.cc
index ace3100a3de..6da649764b9 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqMatrixTmp.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqMatrixTmp.cc
@@ -21,9 +21,9 @@
//# $Id$
#include <lofar_config.h>
-#include <BBS/MNS/MeqMatrixTmp.h>
-#include <BBS/MNS/MeqMatrixRealArr.h>
-#include <BBS/MNS/MeqMatrixComplexArr.h>
+#include <BBSKernel/MNS/MeqMatrixTmp.h>
+#include <BBSKernel/MNS/MeqMatrixRealArr.h>
+#include <BBSKernel/MNS/MeqMatrixComplexArr.h>
namespace LOFAR
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqMatrixTmp.h b/CEP/BB/BBSKernel/src/MNS/MeqMatrixTmp.h
index 88ebadaa0a9..78fb6c2f5ef 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqMatrixTmp.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqMatrixTmp.h
@@ -27,10 +27,10 @@
// Temporary matrix for Mns
//# Includes
-#include <BBS/MNS/MeqMatrixRep.h>
-#include <BBS/MNS/MeqMatrix.h>
-#include <BBS/MNS/MeqMatrixRealSca.h>
-#include <BBS/MNS/MeqMatrixComplexSca.h>
+#include <BBSKernel/MNS/MeqMatrixRep.h>
+#include <BBSKernel/MNS/MeqMatrix.h>
+#include <BBSKernel/MNS/MeqMatrixRealSca.h>
+#include <BBSKernel/MNS/MeqMatrixComplexSca.h>
namespace LOFAR
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqParm.cc b/CEP/BB/BBSKernel/src/MNS/MeqParm.cc
index aa171beaf91..a72711bd21a 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqParm.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqParm.cc
@@ -21,7 +21,7 @@
//# $Id$
#include <lofar_config.h>
-#include <BBS/MNS/MeqParm.h>
+#include <BBSKernel/MNS/MeqParm.h>
#include <Common/LofarLogger.h>
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqParm.h b/CEP/BB/BBSKernel/src/MNS/MeqParm.h
index 6b32358fc1d..0b24f2e7c07 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqParm.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqParm.h
@@ -27,8 +27,8 @@
// The base class for a parameter
//# Includes
-#include <BBS/MNS/MeqExpr.h>
-#include <BBS/MNS/MeqResult.h>
+#include <BBSKernel/MNS/MeqExpr.h>
+#include <BBSKernel/MNS/MeqResult.h>
#include <ParmDB/ParmValue.h>
#include <Common/lofar_string.h>
#include <Common/lofar_map.h>
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqParmExpr.cc b/CEP/BB/BBSKernel/src/MNS/MeqParmExpr.cc
index b9fefc508dd..add41dd3a68 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqParmExpr.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqParmExpr.cc
@@ -20,9 +20,9 @@
//#
//# $Id$
-#include <BBS/MNS/MeqParmExpr.h>
-#include <BBS/MNS/MeqParmFunklet.h>
-#include <BBS/MNS/MeqMatrixTmp.h>
+#include <BBSKernel/MNS/MeqParmExpr.h>
+#include <BBSKernel/MNS/MeqParmFunklet.h>
+#include <BBSKernel/MNS/MeqMatrixTmp.h>
namespace LOFAR
{
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqParmExpr.h b/CEP/BB/BBSKernel/src/MNS/MeqParmExpr.h
index 42cd4882360..e35c7d4ab8b 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqParmExpr.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqParmExpr.h
@@ -27,7 +27,7 @@
// A parm which is an expression of other parms.
//# Includes
-#include <BBS/MNS/MeqExpr.h>
+#include <BBSKernel/MNS/MeqExpr.h>
#include <ParmDB/ParmDB.h>
namespace LOFAR
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqParmFunklet.cc b/CEP/BB/BBSKernel/src/MNS/MeqParmFunklet.cc
index e325ead049a..8f61629d53a 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqParmFunklet.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqParmFunklet.cc
@@ -21,10 +21,10 @@
//# $Id$
#include <lofar_config.h>
-#include <BBS/MNS/MeqParmFunklet.h>
-#include <BBS/MNS/MeqParmExpr.h>
-#include <BBS/MNS/MeqPolc.h>
-#include <BBS/ParmData.h>
+#include <BBSKernel/MNS/MeqParmFunklet.h>
+#include <BBSKernel/MNS/MeqParmExpr.h>
+#include <BBSKernel/MNS/MeqPolc.h>
+#include <BBSKernel/ParmData.h>
#include <ParmDB/ParmValue.h>
#include <ParmDB/ParmDB.h>
#include <Common/LofarLogger.h>
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqParmFunklet.h b/CEP/BB/BBSKernel/src/MNS/MeqParmFunklet.h
index 9acfc1badf0..9ce6929cc0c 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqParmFunklet.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqParmFunklet.h
@@ -27,8 +27,8 @@
// A stored parameter with funklet coefficients
//# Includes
-#include <BBS/MNS/MeqParm.h>
-#include <BBS/MNS/MeqFunklet.h>
+#include <BBSKernel/MNS/MeqParm.h>
+#include <BBSKernel/MNS/MeqFunklet.h>
#include <ParmDB/ParmDB.h>
#include <Common/lofar_vector.h>
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqParmSingle.cc b/CEP/BB/BBSKernel/src/MNS/MeqParmSingle.cc
index e44f88d72c2..66a81300dd9 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqParmSingle.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqParmSingle.cc
@@ -21,8 +21,8 @@
//# $Id$
#include <lofar_config.h>
-#include <BBS/MNS/MeqParmSingle.h>
-#include <BBS/MNS/MeqRequest.h>
+#include <BBSKernel/MNS/MeqParmSingle.h>
+#include <BBSKernel/MNS/MeqRequest.h>
#include <Common/lofar_vector.h>
#include <Common/LofarLogger.h>
#include <cmath>
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqParmSingle.h b/CEP/BB/BBSKernel/src/MNS/MeqParmSingle.h
index 4dd865d5062..fe7f7c4133f 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqParmSingle.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqParmSingle.h
@@ -27,7 +27,7 @@
// The class for a single parameter
//# Includes
-#include <BBS/MNS/MeqParm.h>
+#include <BBSKernel/MNS/MeqParm.h>
namespace LOFAR
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqPhaseRef.cc b/CEP/BB/BBSKernel/src/MNS/MeqPhaseRef.cc
index 6ca89c61fb7..20c4b3034c3 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqPhaseRef.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqPhaseRef.cc
@@ -21,7 +21,7 @@
//# $Id$
#include <lofar_config.h>
-#include <BBS/MNS/MeqPhaseRef.h>
+#include <BBSKernel/MNS/MeqPhaseRef.h>
#include <Common/LofarLogger.h>
#include <measures/Measures/MDirection.h>
#include <measures/Measures/MPosition.h>
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqPointSource.cc b/CEP/BB/BBSKernel/src/MNS/MeqPointSource.cc
index 10c13727d0c..6ca2e96d2e4 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqPointSource.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqPointSource.cc
@@ -21,7 +21,7 @@
//# $Id$
#include <lofar_config.h>
-#include <BBS/MNS/MeqPointSource.h>
+#include <BBSKernel/MNS/MeqPointSource.h>
namespace LOFAR
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqPointSource.h b/CEP/BB/BBSKernel/src/MNS/MeqPointSource.h
index 95420d39a59..0ca047ad77d 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqPointSource.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqPointSource.h
@@ -27,7 +27,7 @@
// Class holding a point source
//# Includes
-#include <BBS/MNS/MeqSource.h>
+#include <BBSKernel/MNS/MeqSource.h>
#include <Common/lofar_string.h>
namespace LOFAR
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqPolc.cc b/CEP/BB/BBSKernel/src/MNS/MeqPolc.cc
index 9af88a7c2c9..6441b92023c 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqPolc.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqPolc.cc
@@ -22,10 +22,10 @@
#include <lofar_config.h>
-#include <BBS/MNS/MeqPolc.h>
-#include <BBS/MNS/MeqRequest.h>
-#include <BBS/MNS/MeqResult.h>
-#include <BBS/MNS/MeqMatrixTmp.h>
+#include <BBSKernel/MNS/MeqPolc.h>
+#include <BBSKernel/MNS/MeqRequest.h>
+#include <BBSKernel/MNS/MeqResult.h>
+#include <BBSKernel/MNS/MeqMatrixTmp.h>
#include <Common/LofarLogger.h>
using namespace casa;
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqPolc.h b/CEP/BB/BBSKernel/src/MNS/MeqPolc.h
index e98179bb1b0..3c3992e360b 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqPolc.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqPolc.h
@@ -27,7 +27,7 @@
// Ordinary polynomial with coefficients valid for a given domain
//# Includes
-#include <BBS/MNS/MeqFunklet.h>
+#include <BBSKernel/MNS/MeqFunklet.h>
namespace LOFAR
{
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqPolcAn.cc b/CEP/BB/BBSKernel/src/MNS/MeqPolcAn.cc
index 0efa72090e3..b7d1eefce00 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqPolcAn.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqPolcAn.cc
@@ -23,10 +23,10 @@
#include <lofar_config.h>
#include <Common/Profiling/PerfProfile.h>
-#include <BBS/MNS/MeqPolc.h>
-#include <BBS/MNS/MeqRequest.h>
-#include <BBS/MNS/MeqResult.h>
-#include <BBS/MNS/MeqMatrixTmp.h>
+#include <BBSKernel/MNS/MeqPolc.h>
+#include <BBSKernel/MNS/MeqRequest.h>
+#include <BBSKernel/MNS/MeqResult.h>
+#include <BBSKernel/MNS/MeqMatrixTmp.h>
#include <Common/LofarLogger.h>
using namespace casa;
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqPolcLog.cc b/CEP/BB/BBSKernel/src/MNS/MeqPolcLog.cc
index 5f094fb4d43..b6ce95a0e81 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqPolcLog.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqPolcLog.cc
@@ -23,10 +23,10 @@
#include <lofar_config.h>
-#include <BBS/MNS/MeqPolcLog.h>
-#include <BBS/MNS/MeqRequest.h>
-#include <BBS/MNS/MeqResult.h>
-#include <BBS/MNS/MeqMatrixTmp.h>
+#include <BBSKernel/MNS/MeqPolcLog.h>
+#include <BBSKernel/MNS/MeqRequest.h>
+#include <BBSKernel/MNS/MeqResult.h>
+#include <BBSKernel/MNS/MeqMatrixTmp.h>
#include <Common/LofarLogger.h>
using namespace casa;
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqPolcLog.h b/CEP/BB/BBSKernel/src/MNS/MeqPolcLog.h
index d32029ce32d..0e15d3d3b89 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqPolcLog.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqPolcLog.h
@@ -55,7 +55,7 @@
// example.
//# Includes
-#include <BBS/MNS/MeqFunklet.h>
+#include <BBSKernel/MNS/MeqFunklet.h>
namespace LOFAR
{
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqRequest.cc b/CEP/BB/BBSKernel/src/MNS/MeqRequest.cc
index fc61d45e5f8..0dff4f6a3a2 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqRequest.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqRequest.cc
@@ -21,7 +21,7 @@
//# $Id$
#include <lofar_config.h>
-#include <BBS/MNS/MeqRequest.h>
+#include <BBSKernel/MNS/MeqRequest.h>
#include <Common/LofarLogger.h>
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqRequest.h b/CEP/BB/BBSKernel/src/MNS/MeqRequest.h
index ca2204b594d..c92d023e934 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqRequest.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqRequest.h
@@ -27,9 +27,9 @@
// The request for an evaluation of an expression
//# Includes
-#include <BBS/MNS/MeqRequestId.h>
-#include <BBS/MNS/MeqDomain.h>
-#include <BBS/MNS/MeqMatrix.h>
+#include <BBSKernel/MNS/MeqRequestId.h>
+#include <BBSKernel/MNS/MeqDomain.h>
+#include <BBSKernel/MNS/MeqMatrix.h>
#include <Common/lofar_vector.h>
namespace LOFAR
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqResult.cc b/CEP/BB/BBSKernel/src/MNS/MeqResult.cc
index 577bdb55fc9..f20222177ff 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqResult.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqResult.cc
@@ -21,10 +21,10 @@
//# $Id$
#include <lofar_config.h>
-#include <BBS/MNS/MeqResult.h>
-#include <BBS/MNS/MeqMatrixTmp.h>
-#include <BBS/MNS/Pool.h>
-#include <BBS/MNS/MeqParmFunklet.h>
+#include <BBSKernel/MNS/MeqResult.h>
+#include <BBSKernel/MNS/MeqMatrixTmp.h>
+#include <BBSKernel/MNS/Pool.h>
+#include <BBSKernel/MNS/MeqParmFunklet.h>
namespace LOFAR
{
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqResult.h b/CEP/BB/BBSKernel/src/MNS/MeqResult.h
index a7e40feabdc..662d6a60cc5 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqResult.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqResult.h
@@ -27,8 +27,8 @@
// The result of an expression for a domain.
//# Includes
-#include <BBS/MNS/MeqMatrix.h>
-#include <BBS/MNS/Pool.h>
+#include <BBSKernel/MNS/MeqMatrix.h>
+#include <BBSKernel/MNS/Pool.h>
#include <Common/LofarLogger.h>
#include <Common/lofar_map.h>
#include <Common/lofar_iostream.h>
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqResultVec.cc b/CEP/BB/BBSKernel/src/MNS/MeqResultVec.cc
index 271d14ec30b..881e6d6e27a 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqResultVec.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqResultVec.cc
@@ -21,7 +21,7 @@
//# $Id$
#include <lofar_config.h>
-#include <BBS/MNS/MeqResultVec.h>
+#include <BBSKernel/MNS/MeqResultVec.h>
// This class represents the result in a Jones matrix of a domain for
// which the expressions have been evaluated.
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqResultVec.h b/CEP/BB/BBSKernel/src/MNS/MeqResultVec.h
index 7173b25965a..ee7d6819bfd 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqResultVec.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqResultVec.h
@@ -27,7 +27,7 @@
// A result vector containing multiple results.
//# Includes
-#include <BBS/MNS/MeqResult.h>
+#include <BBSKernel/MNS/MeqResult.h>
#include <Common/lofar_iostream.h>
#include <Common/lofar_vector.h>
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqSource.cc b/CEP/BB/BBSKernel/src/MNS/MeqSource.cc
index 03dc3a57097..50c4b32adcd 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqSource.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqSource.cc
@@ -21,7 +21,7 @@
//# $Id$
#include <lofar_config.h>
-#include <BBS/MNS/MeqSource.h>
+#include <BBSKernel/MNS/MeqSource.h>
namespace LOFAR
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqSource.h b/CEP/BB/BBSKernel/src/MNS/MeqSource.h
index d4a9d643384..19fe9443e47 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqSource.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqSource.h
@@ -27,7 +27,7 @@
// Abstract base class for holding a source
//# Includes
-#include <BBS/MNS/MeqExpr.h>
+#include <BBSKernel/MNS/MeqExpr.h>
#include <Common/lofar_string.h>
namespace LOFAR
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqSourceList.cc b/CEP/BB/BBSKernel/src/MNS/MeqSourceList.cc
index e24731ee250..a3664a12131 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqSourceList.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqSourceList.cc
@@ -21,10 +21,10 @@
//# $Id$
#include <lofar_config.h>
-#include <BBS/MNS/MeqSourceList.h>
-#include <BBS/MNS/MeqPointSource.h>
-#include <BBS/MNS/MeqGaussSource.h>
-#include <BBS/MNS/MeqParmFunklet.h>
+#include <BBSKernel/MNS/MeqSourceList.h>
+#include <BBSKernel/MNS/MeqPointSource.h>
+#include <BBSKernel/MNS/MeqGaussSource.h>
+#include <BBSKernel/MNS/MeqParmFunklet.h>
#include <Common/LofarLogger.h>
#include <casa/Arrays/Vector.h>
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqSourceList.h b/CEP/BB/BBSKernel/src/MNS/MeqSourceList.h
index cb59574835d..7451fdde258 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqSourceList.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqSourceList.h
@@ -27,7 +27,7 @@
// List of sources
//# Includes
-#include <BBS/MNS/MeqPointSource.h>
+#include <BBSKernel/MNS/MeqPointSource.h>
#include <ParmDB/ParmDB.h>
#include <Common/lofar_vector.h>
#include <Common/lofar_map.h>
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqStatExpr.cc b/CEP/BB/BBSKernel/src/MNS/MeqStatExpr.cc
index 29b6e589145..323077d10df 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqStatExpr.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqStatExpr.cc
@@ -23,11 +23,11 @@
#include <lofar_config.h>
#include <Common/Timer.h>
-#include <BBS/MNS/MeqStatExpr.h>
-#include <BBS/MNS/MeqExpr.h>
-#include <BBS/MNS/MeqRequest.h>
-#include <BBS/MNS/MeqMatrix.h>
-#include <BBS/MNS/MeqMatrixTmp.h>
+#include <BBSKernel/MNS/MeqStatExpr.h>
+#include <BBSKernel/MNS/MeqExpr.h>
+#include <BBSKernel/MNS/MeqRequest.h>
+#include <BBSKernel/MNS/MeqMatrix.h>
+#include <BBSKernel/MNS/MeqMatrixTmp.h>
namespace LOFAR
{
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqStatExpr.h b/CEP/BB/BBSKernel/src/MNS/MeqStatExpr.h
index 5a3cb3f576b..8add9699015 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqStatExpr.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqStatExpr.h
@@ -27,8 +27,8 @@
// The Jones expression for a station
//# Includes
-#include <BBS/MNS/MeqJonesExpr.h>
-#include <BBS/MNS/MeqExpr.h>
+#include <BBSKernel/MNS/MeqJonesExpr.h>
+#include <BBSKernel/MNS/MeqExpr.h>
namespace LOFAR
{
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqStatUVW.cc b/CEP/BB/BBSKernel/src/MNS/MeqStatUVW.cc
index 3ec6326fb2d..2e23a65faf5 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqStatUVW.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqStatUVW.cc
@@ -22,11 +22,11 @@
#include <lofar_config.h>
-#include <BBS/MNS/MeqStatUVW.h>
-#include <BBS/MNS/MeqPhaseRef.h>
-#include <BBS/MNS/MeqRequest.h>
-#include <BBS/MNS/MeqExpr.h>
-#include <BBS/MNS/MeqMatrixTmp.h>
+#include <BBSKernel/MNS/MeqStatUVW.h>
+#include <BBSKernel/MNS/MeqPhaseRef.h>
+#include <BBSKernel/MNS/MeqRequest.h>
+#include <BBSKernel/MNS/MeqExpr.h>
+#include <BBSKernel/MNS/MeqMatrixTmp.h>
#include <Common/LofarLogger.h>
#include <measures/Measures/MBaseline.h>
#include <measures/Measures/MPosition.h>
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqStatUVW.h b/CEP/BB/BBSKernel/src/MNS/MeqStatUVW.h
index bfdfdc4d80a..dbd18c787e4 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqStatUVW.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqStatUVW.h
@@ -27,9 +27,9 @@
// The station UVW coordinates for a time domain
//# Includes
-#include <BBS/MNS/MeqResult.h>
-#include <BBS/MNS/MeqRequest.h>
-#include <BBS/MNS/MeqStation.h>
+#include <BBSKernel/MNS/MeqResult.h>
+#include <BBSKernel/MNS/MeqRequest.h>
+#include <BBSKernel/MNS/MeqStation.h>
#include <Common/lofar_map.h>
#include <measures/Measures/MeasFrame.h>
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqStation.cc b/CEP/BB/BBSKernel/src/MNS/MeqStation.cc
index 7763bb92ad8..7f3f2d9902c 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqStation.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqStation.cc
@@ -21,7 +21,7 @@
//# $Id$
#include <lofar_config.h>
-#include <BBS/MNS/MeqStation.h>
+#include <BBSKernel/MNS/MeqStation.h>
namespace LOFAR
{
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqStation.h b/CEP/BB/BBSKernel/src/MNS/MeqStation.h
index f984aa574b9..603c4cdec01 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqStation.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqStation.h
@@ -27,7 +27,7 @@
// Class holding the ITRF position expressions of a station
//# Includes
-#include <BBS/MNS/MeqExpr.h>
+#include <BBSKernel/MNS/MeqExpr.h>
#include <Common/lofar_string.h>
namespace LOFAR
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqTabular.cc b/CEP/BB/BBSKernel/src/MNS/MeqTabular.cc
index a0a294f4ad2..5ce1f0067d5 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqTabular.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqTabular.cc
@@ -23,10 +23,10 @@
#include <lofar_config.h>
#include <utility>
-#include <BBS/MNS/MeqTabular.h>
-#include <BBS/MNS/MeqRequest.h>
-#include <BBS/MNS/MeqResult.h>
-#include <BBS/MNS/MeqMatrixTmp.h>
+#include <BBSKernel/MNS/MeqTabular.h>
+#include <BBSKernel/MNS/MeqRequest.h>
+#include <BBSKernel/MNS/MeqResult.h>
+#include <BBSKernel/MNS/MeqMatrixTmp.h>
#include <Common/LofarLogger.h>
#define MIN(__a, __b) __a <= __b ? __a : __b;
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqTabular.h b/CEP/BB/BBSKernel/src/MNS/MeqTabular.h
index d26d2bb3f8a..1e01e97c85a 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqTabular.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqTabular.h
@@ -27,7 +27,7 @@
// A tabular (non-solvable) parameter value.
//# Includes
-#include <BBS/MNS/MeqFunklet.h>
+#include <BBSKernel/MNS/MeqFunklet.h>
namespace LOFAR
{
diff --git a/CEP/BB/BBSKernel/src/ParmData.cc b/CEP/BB/BBSKernel/src/ParmData.cc
index 8555ed51778..e447dda0eb1 100644
--- a/CEP/BB/BBSKernel/src/ParmData.cc
+++ b/CEP/BB/BBSKernel/src/ParmData.cc
@@ -21,7 +21,7 @@
//# $Id$
#include <lofar_config.h>
-#include <BBS/ParmData.h>
+#include <BBSKernel/ParmData.h>
#include <Blob/BlobOStream.h>
#include <Blob/BlobIStream.h>
#include <Common/VectorUtil.h>
diff --git a/CEP/BB/BBSKernel/src/ParmData.h b/CEP/BB/BBSKernel/src/ParmData.h
index 1de1de7b2ca..54af03cfafe 100644
--- a/CEP/BB/BBSKernel/src/ParmData.h
+++ b/CEP/BB/BBSKernel/src/ParmData.h
@@ -27,8 +27,8 @@
// The properties for solvable parameters
//# Includes
-#include <BBS/MNS/MeqMatrix.h>
-#include <BBS/MNS/MeqFunklet.h>
+#include <BBSKernel/MNS/MeqMatrix.h>
+#include <BBSKernel/MNS/MeqFunklet.h>
#include <Common/LofarTypes.h>
#include <string>
#include <vector>
diff --git a/CEP/BB/BBSKernel/src/ParmWriter.cc b/CEP/BB/BBSKernel/src/ParmWriter.cc
index ac180f6fc2e..b7c38091960 100644
--- a/CEP/BB/BBSKernel/src/ParmWriter.cc
+++ b/CEP/BB/BBSKernel/src/ParmWriter.cc
@@ -24,9 +24,9 @@
#include <lofar_config.h>
//# Includes
-#include <BBS/ParmWriter.h>
-#include <BBS/ParmData.h>
-#include <BBS/MNS/MeqDomain.h>
+#include <BBSKernel/ParmWriter.h>
+#include <BBSKernel/ParmData.h>
+#include <BBSKernel/MNS/MeqDomain.h>
#include <ParmDB/ParmDB.h>
#include <ParmDB/ParmValue.h>
#include <Common/LofarLogger.h>
diff --git a/CEP/BB/BBSKernel/src/Prediffer.cc b/CEP/BB/BBSKernel/src/Prediffer.cc
index ac4ae88c24e..de6a59e4592 100644
--- a/CEP/BB/BBSKernel/src/Prediffer.cc
+++ b/CEP/BB/BBSKernel/src/Prediffer.cc
@@ -22,25 +22,25 @@
#include <lofar_config.h>
-#include <BBS/Prediffer.h>
-#include <BBS/MMap.h>
-#include <BBS/FlagsMap.h>
-#include <BBS/MNS/MeqLMN.h>
-#include <BBS/MNS/MeqDFTPS.h>
-#include <BBS/MNS/MeqDiag.h>
-#include <BBS/MNS/MeqBaseDFTPS.h>
-#include <BBS/MNS/MeqBaseLinPS.h>
-#include <BBS/MNS/MeqStatExpr.h>
-#include <BBS/MNS/MeqJonesSum.h>
-#include <BBS/MNS/MeqMatrixTmp.h>
-#include <BBS/MNS/MeqMatrixComplexArr.h>
-#include <BBS/MNS/MeqMatrixRealArr.h>
-#include <BBS/MNS/MeqParmFunklet.h>
-#include <BBS/MNS/MeqParmSingle.h>
-#include <BBS/MNS/MeqPointSource.h>
-#include <BBS/MNS/MeqJonesCMul3.h>
-#include <BBS/MNS/MeqJonesInvert.h>
-#include <BBS/MNS/MeqJonesMMap.h>
+#include <BBSKernel/Prediffer.h>
+#include <BBSKernel/MMap.h>
+#include <BBSKernel/FlagsMap.h>
+#include <BBSKernel/MNS/MeqLMN.h>
+#include <BBSKernel/MNS/MeqDFTPS.h>
+#include <BBSKernel/MNS/MeqDiag.h>
+#include <BBSKernel/MNS/MeqBaseDFTPS.h>
+#include <BBSKernel/MNS/MeqBaseLinPS.h>
+#include <BBSKernel/MNS/MeqStatExpr.h>
+#include <BBSKernel/MNS/MeqJonesSum.h>
+#include <BBSKernel/MNS/MeqMatrixTmp.h>
+#include <BBSKernel/MNS/MeqMatrixComplexArr.h>
+#include <BBSKernel/MNS/MeqMatrixRealArr.h>
+#include <BBSKernel/MNS/MeqParmFunklet.h>
+#include <BBSKernel/MNS/MeqParmSingle.h>
+#include <BBSKernel/MNS/MeqPointSource.h>
+#include <BBSKernel/MNS/MeqJonesCMul3.h>
+#include <BBSKernel/MNS/MeqJonesInvert.h>
+#include <BBSKernel/MNS/MeqJonesMMap.h>
#include <Common/Timer.h>
#include <Common/LofarLogger.h>
@@ -105,7 +105,7 @@
#include <malloc.h>
#include <unistd.h>
-#include <BBS/BBSTestLogger.h>
+#include <BBSKernel/BBSTestLogger.h>
#if defined _OPENMP
#include <omp.h>
diff --git a/CEP/BB/BBSKernel/src/Prediffer.h b/CEP/BB/BBSKernel/src/Prediffer.h
index 6d2f86a7fc6..aaeda808682 100644
--- a/CEP/BB/BBSKernel/src/Prediffer.h
+++ b/CEP/BB/BBSKernel/src/Prediffer.h
@@ -30,23 +30,23 @@
#include <casa/Arrays/Matrix.h>
#include <scimath/Fitting/LSQFit.h>
-#include <BBS/StrategyProp.h>
-#include <BBS/StepProp.h>
-#include <BBS/SolveProp.h>
-#include <BBS/ParmData.h>
-#include <BBS/MMapMSInfo.h>
-#include <BBS/MNS/MeqDomain.h>
-#include <BBS/MNS/MeqJonesExpr.h>
-#include <BBS/MNS/MeqJonesNode.h>
-#include <BBS/MNS/MeqMatrix.h>
-#include <BBS/MNS/MeqParm.h>
-#include <BBS/MNS/MeqPhaseRef.h>
-#include <BBS/MNS/MeqSourceList.h>
-#include <BBS/MNS/MeqRequest.h>
-#include <BBS/MNS/MeqStation.h>
-#include <BBS/MNS/MeqStatUVW.h>
-#include <BBS/MNS/MeqLMN.h>
-#include <BBS/MNS/MeqDFTPS.h>
+#include <BBSKernel/StrategyProp.h>
+#include <BBSKernel/StepProp.h>
+#include <BBSKernel/SolveProp.h>
+#include <BBSKernel/ParmData.h>
+#include <BBSKernel/MMapMSInfo.h>
+#include <BBSKernel/MNS/MeqDomain.h>
+#include <BBSKernel/MNS/MeqJonesExpr.h>
+#include <BBSKernel/MNS/MeqJonesNode.h>
+#include <BBSKernel/MNS/MeqMatrix.h>
+#include <BBSKernel/MNS/MeqParm.h>
+#include <BBSKernel/MNS/MeqPhaseRef.h>
+#include <BBSKernel/MNS/MeqSourceList.h>
+#include <BBSKernel/MNS/MeqRequest.h>
+#include <BBSKernel/MNS/MeqStation.h>
+#include <BBSKernel/MNS/MeqStatUVW.h>
+#include <BBSKernel/MNS/MeqLMN.h>
+#include <BBSKernel/MNS/MeqDFTPS.h>
#include <ParmDB/ParmDB.h>
#include <ParmDB/ParmValue.h>
#include <MS/MSDesc.h>
diff --git a/CEP/BB/BBSKernel/src/Quality.cc b/CEP/BB/BBSKernel/src/Quality.cc
index 0e1d2f8812d..2af48dcd91d 100644
--- a/CEP/BB/BBSKernel/src/Quality.cc
+++ b/CEP/BB/BBSKernel/src/Quality.cc
@@ -22,7 +22,7 @@
#include <lofar_config.h>
-#include <BBS/Quality.h>
+#include <BBSKernel/Quality.h>
namespace LOFAR
{
diff --git a/CEP/BB/BBSKernel/src/SolveProp.h b/CEP/BB/BBSKernel/src/SolveProp.h
index 365315b7a22..b4dbae313a7 100644
--- a/CEP/BB/BBSKernel/src/SolveProp.h
+++ b/CEP/BB/BBSKernel/src/SolveProp.h
@@ -26,7 +26,7 @@
// \file
// Solve properties.
-#include <BBS/MNS/MeqDomain.h>
+#include <BBSKernel/MNS/MeqDomain.h>
#include <Common/lofar_vector.h>
#include <Common/lofar_string.h>
diff --git a/CEP/BB/BBSKernel/src/Solver.cc b/CEP/BB/BBSKernel/src/Solver.cc
index 729eb4566b8..b781df446ee 100644
--- a/CEP/BB/BBSKernel/src/Solver.cc
+++ b/CEP/BB/BBSKernel/src/Solver.cc
@@ -22,12 +22,12 @@
#include <lofar_config.h>
-#include <BBS/Solver.h>
+#include <BBSKernel/Solver.h>
#include <Common/VectorUtil.h>
#include <Common/LofarLogger.h>
#include <Common/Timer.h>
-#include <BBS/BBSTestLogger.h>
+#include <BBSKernel/BBSTestLogger.h>
#include <ParmDB/ParmValue.h>
#include <ParmDB/ParmDomain.h>
diff --git a/CEP/BB/BBSKernel/src/Solver.h b/CEP/BB/BBSKernel/src/Solver.h
index eb8edda60b4..8cb931409b1 100644
--- a/CEP/BB/BBSKernel/src/Solver.h
+++ b/CEP/BB/BBSKernel/src/Solver.h
@@ -27,8 +27,8 @@
// Calculates parameter values using a least squares fitter
#include <scimath/Fitting/LSQaips.h>
-#include <BBS/ParmData.h>
-#include <BBS/Quality.h>
+#include <BBSKernel/ParmData.h>
+#include <BBSKernel/Quality.h>
#include <ParmDB/ParmDB.h>
#include <Common/LofarTypes.h>
#include <Common/lofar_vector.h>
diff --git a/CEP/BB/BBSKernel/src/StepProp.cc b/CEP/BB/BBSKernel/src/StepProp.cc
index 2eef8595322..3f243eb43f3 100644
--- a/CEP/BB/BBSKernel/src/StepProp.cc
+++ b/CEP/BB/BBSKernel/src/StepProp.cc
@@ -20,7 +20,7 @@
//#
//# $Id$
-#include <BBS/StepProp.h>
+#include <BBSKernel/StepProp.h>
#include <Common/LofarLogger.h>
using namespace casa;
diff --git a/CEP/BB/BBSKernel/src/StrategyProp.cc b/CEP/BB/BBSKernel/src/StrategyProp.cc
index 83efc149f3e..6d30a96a696 100644
--- a/CEP/BB/BBSKernel/src/StrategyProp.cc
+++ b/CEP/BB/BBSKernel/src/StrategyProp.cc
@@ -20,7 +20,7 @@
//#
//# $Id$
-#include <BBS/StrategyProp.h>
+#include <BBSKernel/StrategyProp.h>
#include <Common/LofarLogger.h>
using namespace casa;
--
GitLab