diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqDomain.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqDomain.h
index 7d04381ff4a1bd46033642d25910c6860f78c57d..6f5f306f026abb78dfab53909aae50b514e2ff11 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqDomain.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqDomain.h
@@ -54,10 +54,10 @@ public:
MeqDomain (double startX, double endX, double startY, double endY);
// Create from a ParmDomain. It checks if it is a 2-dim domain.
- explicit MeqDomain (const ParmDB::ParmDomain&);
+ explicit MeqDomain (const LOFAR::ParmDB::ParmDomain&);
// Convert to a ParmDomain.
- ParmDB::ParmDomain toParmDomain() const;
+ LOFAR::ParmDB::ParmDomain toParmDomain() const;
// Get the start, end, and step of the domain.
double startX() const
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqFunklet.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqFunklet.h
index d47cf07181e6a31eb45d6b5fd23c3b4e06983525..8e451279405fedc3dbde193bfa85d413b0d99aa4 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqFunklet.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqFunklet.h
@@ -59,7 +59,7 @@ public:
MeqFunklet();
// Create the funklet from a parm value.
- explicit MeqFunklet (const ParmDB::ParmValue& pvalue);
+ explicit MeqFunklet (const LOFAR::ParmDB::ParmValue& pvalue);
// Copy constructor.
MeqFunklet (const MeqFunklet&);
@@ -74,7 +74,7 @@ public:
// Create the correct derived funklet from a ParmValue.
// The caller is responsible for deleting the newly created object.
- static MeqFunklet* make (const ParmDB::ParmValue&, const std::string& name);
+ static MeqFunklet* make (const LOFAR::ParmDB::ParmValue&, const std::string& name);
// Calculate the value and possible perturbations.
virtual MeqResult getResult (const MeqRequest&,
@@ -133,7 +133,7 @@ public:
{ value = itsCoeff; }
// Get the parm value.
- const ParmDB::ParmValue& getParmValue() const
+ const LOFAR::ParmDB::ParmValue& getParmValue() const
{ return itsParmValue; }
// Set to be a new parm value (i.e. a new record in the parm table).
@@ -156,7 +156,7 @@ protected:
MeqDomain itsDomain;
int itsNrScid;
int itsScidInx; //# Index of first solvable coeff.
- ParmDB::ParmValue itsParmValue;
+ LOFAR::ParmDB::ParmValue itsParmValue;
};
// @}
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqParm.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqParm.h
index 0b24f2e7c0764ce8a9cb1c0a06ae5168c1b0fd6a..4493763be2cff2a674df34d5a48058091ad9145a 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqParm.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqParm.h
@@ -75,7 +75,7 @@ public:
virtual void removeFunklets();
// Read the polcs for the given domain.
- virtual void fillFunklets (const std::map<std::string,ParmDB::ParmValueSet>&,
+ virtual void fillFunklets (const std::map<std::string,LOFAR::ParmDB::ParmValueSet>&,
const MeqDomain&);
// Initialize the solvable parameter for the given domain.
@@ -145,7 +145,7 @@ public:
{ return itsParmPtr->getParmDBSeqNr(); }
void removeFunklets()
{ itsParmPtr->removeFunklets(); }
- void fillFunklets (const std::map<std::string,ParmDB::ParmValueSet>& parmSet,
+ void fillFunklets (const std::map<std::string,LOFAR::ParmDB::ParmValueSet>& parmSet,
const MeqDomain& domain)
{ itsParmPtr->fillFunklets (parmSet, domain); }
int initDomain (const vector<MeqDomain>& solveDomains, int& pertIndex,
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqParmExpr.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqParmExpr.h
index e35c7d4ab8b843e444bc0a286950b29734454abf..e0bd7fd50902ce85485b388ea665b17a00703a3c 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqParmExpr.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqParmExpr.h
@@ -52,7 +52,7 @@ class MeqParmExpr: public MeqExprRep
{
public:
// Create from an expression.
- MeqParmExpr (const string& expr, MeqParmGroup&, ParmDB::ParmDB* table);
+ MeqParmExpr (const string& expr, MeqParmGroup&, LOFAR::ParmDB::ParmDB* table);
virtual ~MeqParmExpr();
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqParmFunklet.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqParmFunklet.h
index 9ce6929cc0c87632234a33313160dd8b65934c85..52fa45e6dfac3bc0801c407645fccc3cc42fa1e2 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqParmFunklet.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqParmFunklet.h
@@ -56,7 +56,7 @@ class MeqParmFunklet: public MeqParm
{
public:
// Create a stored paramater with the given name and type.
- MeqParmFunklet (const string& name, ParmDB::ParmDB* table);
+ MeqParmFunklet (const string& name, LOFAR::ParmDB::ParmDB* table);
virtual ~MeqParmFunklet();
@@ -65,7 +65,7 @@ public:
// a MeqParmFunklet.
static MeqExpr create (const string& name,
MeqParmGroup& group,
- ParmDB::ParmDB* table);
+ LOFAR::ParmDB::ParmDB* table);
// Get the requested result of the parameter.
virtual MeqResult getResult (const MeqRequest&);
@@ -77,7 +77,7 @@ public:
// Only fill if not filled yet.
// It means that clearFunklets need to be called if a new work domain
// is to be processed.
- virtual void fillFunklets (const std::map<std::string,ParmDB::ParmValueSet>&,
+ virtual void fillFunklets (const std::map<std::string,LOFAR::ParmDB::ParmValueSet>&,
const MeqDomain&);
// Add a funklet.
@@ -96,7 +96,7 @@ public:
virtual const vector<MeqFunklet*>& getFunklets() const;
// Get the ParmDBInfo
- virtual ParmDB::ParmDBMeta getParmDBMeta() const;
+ virtual LOFAR::ParmDB::ParmDBMeta getParmDBMeta() const;
// Get the ParmDB seqnr.
virtual int getParmDBSeqNr() const;
@@ -127,7 +127,7 @@ private:
//# This is the max nr of scids/funklet
int itsPertInx; //# index of first perturbed value in result
vector<MeqFunklet*> itsFunklets;
- ParmDB::ParmDB* itsTable;
+ LOFAR::ParmDB::ParmDB* itsTable;
MeqDomain itsWorkDomain;
};
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqPolc.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqPolc.h
index 3c3992e360b903ff4d6ed0e331a9f6be92c310f4..fd1cee73afe4122b5f31fda3793f31a28e9f15ae 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqPolc.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqPolc.h
@@ -52,10 +52,10 @@ public:
{}
// Create a polc from a ParmValue object.
- MeqPolc (const ParmDB::ParmValue&);
+ MeqPolc (const LOFAR::ParmDB::ParmValue&);
// Convert a polc to a ParmValue object.
- ParmDB::ParmValue toParmValue() const;
+ LOFAR::ParmDB::ParmValue toParmValue() const;
virtual ~MeqPolc();
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqPolcLog.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqPolcLog.h
index 0e15d3d3b890e0aea9cdf7370353c09f75606ec5..924f606097a4050efe969b54653cae6096824d77 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqPolcLog.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqPolcLog.h
@@ -76,10 +76,10 @@ public:
}
// Create a PolcLog from a ParmValue object.
- MeqPolcLog(const ParmDB::ParmValue& pvalue);
+ MeqPolcLog(const LOFAR::ParmDB::ParmValue& pvalue);
// Convert a PolcLog to a ParmValue object.
- ParmDB::ParmValue toParmValue() const;
+ LOFAR::ParmDB::ParmValue toParmValue() const;
virtual ~MeqPolcLog();
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqSourceList.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqSourceList.h
index 7451fdde258e54f8ee3fda62b24772a2dea8676b..07e8976bdf7f86879ed05e203264073301de2e7e 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqSourceList.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqSourceList.h
@@ -52,7 +52,7 @@ public:
{}
// Fill the source list from the sources in the parm table.
- MeqSourceList (ParmDB::ParmDB& parmTable, MeqParmGroup& group);
+ MeqSourceList (LOFAR::ParmDB::ParmDB& parmTable, MeqParmGroup& group);
~MeqSourceList();
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqTabular.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqTabular.h
index 1e01e97c85a0c8f43e02edd3e6707d4854048e3b..442bebf5175e7030640bca79926a96f6edc48d76 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqTabular.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqTabular.h
@@ -46,10 +46,10 @@ namespace BBS
{}
// Create a tabular from a ParmValue object.
- MeqTabular (const ParmDB::ParmValue&);
+ MeqTabular (const LOFAR::ParmDB::ParmValue&);
// Convert a tabular to a ParmValue object.
- ParmDB::ParmValue toParmValue() const;
+ LOFAR::ParmDB::ParmValue toParmValue() const;
virtual ~MeqTabular();
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/ParmWriter.h b/CEP/BB/BBSKernel/include/BBSKernel/ParmWriter.h
index 2b249bd2351c273990e6843454d3e1a35fb7747e..852ac959658a6ddef0a4399b3d5a24efa87b463c 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/ParmWriter.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/ParmWriter.h
@@ -70,7 +70,7 @@ namespace BBS
double tStart, double tEnd);
private:
- void setCoeff (ParmDB::ParmValueRep& pval, const MeqMatrix& coeff);
+ void setCoeff (LOFAR::ParmDB::ParmValueRep& pval, const MeqMatrix& coeff);
};
// @}
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/Prediffer.h b/CEP/BB/BBSKernel/include/BBSKernel/Prediffer.h
index aaeda808682d4991e1e969e083982861cf52f514..aa0f93d850a2bd7c584fc348a2740bb8b42d916c 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/Prediffer.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/Prediffer.h
@@ -87,8 +87,8 @@ public:
// for the specified data descriptor (i.e. spectral window).
// The UVW coordinates can be calculated or taken from the MS.
Prediffer (const string& msName,
- const ParmDB::ParmDBMeta& meqPtd,
- const ParmDB::ParmDBMeta& skyPtd,
+ const LOFAR::ParmDB::ParmDBMeta& meqPtd,
+ const LOFAR::ParmDB::ParmDBMeta& skyPtd,
uint ddid,
bool calcUVW);
@@ -353,9 +353,9 @@ private:
string itsMSName; //# Measurement set name
string itsMEPName; //# Common parmtable name
- ParmDB::ParmDB itsMEP; //# Common parmtable
+ LOFAR::ParmDB::ParmDB itsMEP; //# Common parmtable
string itsGSMMEPName; //# GSM parameters parmtable name
- ParmDB::ParmDB itsGSMMEP; //# parmtable for GSM parameters
+ LOFAR::ParmDB::ParmDB itsGSMMEP; //# parmtable for GSM parameters
MeqParmGroup itsParmGroup; //# container for all parms
bool itsCalcUVW;
@@ -417,7 +417,7 @@ private:
bool itsIsWeightSpec; //# true = weight per channel
//# All parm values in current work domain.
- map<string,ParmDB::ParmValueSet> itsParmValues;
+ map<string,LOFAR::ParmDB::ParmValueSet> itsParmValues;
//# Fitter info set by initSolvableParms.
vector<int> itsFreqFitInx; //# Fitter for each freq in work domain
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/Solver.h b/CEP/BB/BBSKernel/include/BBSKernel/Solver.h
index 8cb931409b15de65f9596abda80d7ac97c540e17..040596999cabdf2247675cc81385e36668eaab65 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/Solver.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/Solver.h
@@ -84,7 +84,7 @@ public:
// Log the quality indicators, and the coefficients of the solvable
// parameters to a ParmDB.
- void log(ParmDB::ParmDB &table);
+ void log(LOFAR::ParmDB::ParmDB &table);
private:
// Copy constructor and assignment are not allowed.
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqDomain.cc b/CEP/BB/BBSKernel/src/MNS/MeqDomain.cc
index fe3a553c55cbf45e817e4d0b2f4ce0acc577e61a..b4366a1a2d5dd753a899a754ab9715b6a237c067 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqDomain.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqDomain.cc
@@ -49,7 +49,7 @@ MeqDomain::MeqDomain (double startX, double endX,
" must be < endY " << endY);
}
-MeqDomain::MeqDomain (const ParmDB::ParmDomain& pdomain)
+MeqDomain::MeqDomain (const LOFAR::ParmDB::ParmDomain& pdomain)
{
ASSERTSTR (pdomain.getStart().size() == 2,
"BBS only supports 2-dim funklets and domains");
@@ -59,9 +59,9 @@ MeqDomain::MeqDomain (const ParmDB::ParmDomain& pdomain)
itsEndY = pdomain.getEnd()[1];
}
-ParmDB::ParmDomain MeqDomain::toParmDomain() const
+LOFAR::ParmDB::ParmDomain MeqDomain::toParmDomain() const
{
- return ParmDB::ParmDomain (startX(), endX(), startY(), endY());
+ return LOFAR::ParmDB::ParmDomain (startX(), endX(), startY(), endY());
}
std::ostream& operator<< (std::ostream& os, const MeqDomain& domain)
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqDomain.h b/CEP/BB/BBSKernel/src/MNS/MeqDomain.h
index 7d04381ff4a1bd46033642d25910c6860f78c57d..6f5f306f026abb78dfab53909aae50b514e2ff11 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqDomain.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqDomain.h
@@ -54,10 +54,10 @@ public:
MeqDomain (double startX, double endX, double startY, double endY);
// Create from a ParmDomain. It checks if it is a 2-dim domain.
- explicit MeqDomain (const ParmDB::ParmDomain&);
+ explicit MeqDomain (const LOFAR::ParmDB::ParmDomain&);
// Convert to a ParmDomain.
- ParmDB::ParmDomain toParmDomain() const;
+ LOFAR::ParmDB::ParmDomain toParmDomain() const;
// Get the start, end, and step of the domain.
double startX() const
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqFunklet.cc b/CEP/BB/BBSKernel/src/MNS/MeqFunklet.cc
index fd94146cd5fb018a5d6bf9ebddd36918a5161ea2..8890e54c25b0df1056a363d543bfa202f0e6432f 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqFunklet.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqFunklet.cc
@@ -44,11 +44,11 @@ MeqFunklet::MeqFunklet()
setDomain (MeqDomain(0,1,0,1));
}
-MeqFunklet::MeqFunklet (const ParmDB::ParmValue& pvalue)
+MeqFunklet::MeqFunklet (const LOFAR::ParmDB::ParmValue& pvalue)
: itsNrScid (0),
itsParmValue (pvalue.clone())
{
- const ParmDB::ParmValueRep& pval = pvalue.rep();
+ const LOFAR::ParmDB::ParmValueRep& pval = pvalue.rep();
itsDomain = MeqDomain(pval.itsDomain);
if (pval.itsShape.size() != 0) {
ASSERT (pval.itsShape.size() == 2);
@@ -83,9 +83,9 @@ MeqFunklet& MeqFunklet::operator= (const MeqFunklet& that)
return *this;
}
-MeqFunklet* MeqFunklet::make (const ParmDB::ParmValue& pvalue, const string& name)
+MeqFunklet* MeqFunklet::make (const LOFAR::ParmDB::ParmValue& pvalue, const string& name)
{
- const ParmDB::ParmValueRep& pval = pvalue.rep();
+ const LOFAR::ParmDB::ParmValueRep& pval = pvalue.rep();
ASSERTSTR(pval.itsShape.size() == 2,
"No 2-dim funklet " << pval.itsType << ' ' << pval.itsShape << " found for parameter " << name);
@@ -147,7 +147,7 @@ void MeqFunklet::clearSolvable()
void MeqFunklet::setDomain (const MeqDomain& domain)
{
itsDomain = domain;
- itsParmValue.rep().setDomain (ParmDB::ParmDomain(domain.startX(),
+ itsParmValue.rep().setDomain (LOFAR::ParmDB::ParmDomain(domain.startX(),
domain.endX(),
domain.startY(),
domain.endY()));
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqFunklet.h b/CEP/BB/BBSKernel/src/MNS/MeqFunklet.h
index d47cf07181e6a31eb45d6b5fd23c3b4e06983525..8e451279405fedc3dbde193bfa85d413b0d99aa4 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqFunklet.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqFunklet.h
@@ -59,7 +59,7 @@ public:
MeqFunklet();
// Create the funklet from a parm value.
- explicit MeqFunklet (const ParmDB::ParmValue& pvalue);
+ explicit MeqFunklet (const LOFAR::ParmDB::ParmValue& pvalue);
// Copy constructor.
MeqFunklet (const MeqFunklet&);
@@ -74,7 +74,7 @@ public:
// Create the correct derived funklet from a ParmValue.
// The caller is responsible for deleting the newly created object.
- static MeqFunklet* make (const ParmDB::ParmValue&, const std::string& name);
+ static MeqFunklet* make (const LOFAR::ParmDB::ParmValue&, const std::string& name);
// Calculate the value and possible perturbations.
virtual MeqResult getResult (const MeqRequest&,
@@ -133,7 +133,7 @@ public:
{ value = itsCoeff; }
// Get the parm value.
- const ParmDB::ParmValue& getParmValue() const
+ const LOFAR::ParmDB::ParmValue& getParmValue() const
{ return itsParmValue; }
// Set to be a new parm value (i.e. a new record in the parm table).
@@ -156,7 +156,7 @@ protected:
MeqDomain itsDomain;
int itsNrScid;
int itsScidInx; //# Index of first solvable coeff.
- ParmDB::ParmValue itsParmValue;
+ LOFAR::ParmDB::ParmValue itsParmValue;
};
// @}
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqParm.cc b/CEP/BB/BBSKernel/src/MNS/MeqParm.cc
index a72711bd21a2c303b566bf59123e6e758ae99f92..13db5da7462245257199b1d849c64c7bd68f2392 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqParm.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqParm.cc
@@ -47,7 +47,7 @@ int MeqParm::getParmDBSeqNr() const
void MeqParm::removeFunklets()
{}
-void MeqParm::fillFunklets (const std::map<std::string,ParmDB::ParmValueSet>&,
+void MeqParm::fillFunklets (const std::map<std::string,LOFAR::ParmDB::ParmValueSet>&,
const MeqDomain&)
{}
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqParm.h b/CEP/BB/BBSKernel/src/MNS/MeqParm.h
index 0b24f2e7c0764ce8a9cb1c0a06ae5168c1b0fd6a..4493763be2cff2a674df34d5a48058091ad9145a 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqParm.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqParm.h
@@ -75,7 +75,7 @@ public:
virtual void removeFunklets();
// Read the polcs for the given domain.
- virtual void fillFunklets (const std::map<std::string,ParmDB::ParmValueSet>&,
+ virtual void fillFunklets (const std::map<std::string,LOFAR::ParmDB::ParmValueSet>&,
const MeqDomain&);
// Initialize the solvable parameter for the given domain.
@@ -145,7 +145,7 @@ public:
{ return itsParmPtr->getParmDBSeqNr(); }
void removeFunklets()
{ itsParmPtr->removeFunklets(); }
- void fillFunklets (const std::map<std::string,ParmDB::ParmValueSet>& parmSet,
+ void fillFunklets (const std::map<std::string,LOFAR::ParmDB::ParmValueSet>& parmSet,
const MeqDomain& domain)
{ itsParmPtr->fillFunklets (parmSet, domain); }
int initDomain (const vector<MeqDomain>& solveDomains, int& pertIndex,
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqParmExpr.cc b/CEP/BB/BBSKernel/src/MNS/MeqParmExpr.cc
index add41dd3a68a1cceeb92588f4dfbca46ab759149..c61d437b74d1fd336d6100458d0e2c1945c4b9b1 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqParmExpr.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqParmExpr.cc
@@ -30,7 +30,7 @@ namespace BBS
{
MeqParmExpr::MeqParmExpr (const string& expr, MeqParmGroup& group,
- ParmDB::ParmDB* table)
+ LOFAR::ParmDB::ParmDB* table)
{
// Only the multiplication or subtraction of 2 parms is supported.
string::size_type idx = expr.find('-');
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqParmExpr.h b/CEP/BB/BBSKernel/src/MNS/MeqParmExpr.h
index e35c7d4ab8b843e444bc0a286950b29734454abf..e0bd7fd50902ce85485b388ea665b17a00703a3c 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqParmExpr.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqParmExpr.h
@@ -52,7 +52,7 @@ class MeqParmExpr: public MeqExprRep
{
public:
// Create from an expression.
- MeqParmExpr (const string& expr, MeqParmGroup&, ParmDB::ParmDB* table);
+ MeqParmExpr (const string& expr, MeqParmGroup&, LOFAR::ParmDB::ParmDB* table);
virtual ~MeqParmExpr();
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqParmFunklet.cc b/CEP/BB/BBSKernel/src/MNS/MeqParmFunklet.cc
index 8f61629d53afad4c50f9f7f015b87d5ff9218ea6..d9f30defdee3eb31287005ca86c156f93821375d 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqParmFunklet.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqParmFunklet.cc
@@ -48,7 +48,7 @@ namespace LOFAR
namespace BBS
{
-MeqParmFunklet::MeqParmFunklet (const string& name, ParmDB::ParmDB* table)
+MeqParmFunklet::MeqParmFunklet (const string& name, LOFAR::ParmDB::ParmDB* table)
: MeqParm (name),
itsDefUsed (false),
itsNrPert (0),
@@ -63,7 +63,7 @@ MeqParmFunklet::~MeqParmFunklet()
MeqExpr MeqParmFunklet::create (const string& name,
MeqParmGroup& group,
- ParmDB::ParmDB* table)
+ LOFAR::ParmDB::ParmDB* table)
{
// If the parm already exists, return it.
MeqParmGroup::iterator pos = group.find (name);
@@ -71,12 +71,12 @@ MeqExpr MeqParmFunklet::create (const string& name,
return pos->second;
}
// If the parm is an expression, use that.
- map<string,ParmDB::ParmValueSet> pset;
+ map<string,LOFAR::ParmDB::ParmValueSet> pset;
table->getDefValues (pset, name);
if (! pset.empty()) {
- ParmDB::ParmValueSet& pvset = pset.begin()->second;
+ LOFAR::ParmDB::ParmValueSet& pvset = pset.begin()->second;
if (! pvset.getValues().empty()) {
- ParmDB::ParmValueRep& pv = pvset.getValues()[0].rep();
+ LOFAR::ParmDB::ParmValueRep& pv = pvset.getValues()[0].rep();
if (pv.itsType == "parmexpr") {
return new MeqParmExpr (pv.itsExpr, group, table);
}
@@ -218,7 +218,7 @@ MeqResult MeqParmFunklet::getResult (const MeqRequest& request)
return result;
}
-ParmDB::ParmDBMeta MeqParmFunklet::getParmDBMeta() const
+LOFAR::ParmDB::ParmDBMeta MeqParmFunklet::getParmDBMeta() const
{
return itsTable->getParmDBMeta();
}
@@ -239,21 +239,21 @@ void MeqParmFunklet::removeFunklets()
}
void MeqParmFunklet::fillFunklets
- (const map<string,ParmDB::ParmValueSet>& parmSet,
+ (const map<string,LOFAR::ParmDB::ParmValueSet>& parmSet,
const MeqDomain& domain)
{
// Only fill if not filled yet.
if (! itsFunklets.empty()) {
return;
}
- ParmDB::ParmDomain pdomain(domain.startX(), domain.endX(),
+ LOFAR::ParmDB::ParmDomain pdomain(domain.startX(), domain.endX(),
domain.startY(), domain.endY());
bool found = false;
// Try to find the funklets in the parm set.
- map<string,ParmDB::ParmValueSet>::const_iterator pos =
+ map<string,LOFAR::ParmDB::ParmValueSet>::const_iterator pos =
parmSet.find(getName());
if (pos != parmSet.end()) {
- const vector<ParmDB::ParmValue>& vec = pos->second.getValues();
+ const vector<LOFAR::ParmDB::ParmValue>& vec = pos->second.getValues();
if (vec.size() > 0) {
// Check if the funklet domains cover the entire domain and if they
// do not overlap. /// Not implemented yet!!!
@@ -272,7 +272,7 @@ void MeqParmFunklet::fillFunklets
}
if (!found) {
// No value found, so use a default value.
- ParmDB::ParmValue pval = itsTable->getDefValue (getName());
+ LOFAR::ParmDB::ParmValue pval = itsTable->getDefValue (getName());
ASSERTSTR (!pval.rep().itsShape.empty(),
"No value found for parameter " << getName()
<< " in given domain");
@@ -385,8 +385,8 @@ void MeqParmFunklet::updateFromTable()
"MeqParmFunklet::updateFromTable - "
"domain mismatches domain given in itsFunklets");
// Find the funklet(s) for the current domain.
- ParmDB::ParmDomain pdomain = itsWorkDomain.toParmDomain();
- ParmDB::ParmValueSet pset = itsTable->getValues (getName(), pdomain);
+ LOFAR::ParmDB::ParmDomain pdomain = itsWorkDomain.toParmDomain();
+ LOFAR::ParmDB::ParmValueSet pset = itsTable->getValues (getName(), pdomain);
ASSERT(pset.getValues().size() == 1);
MeqPolc newpolc (pset.getValues()[0]);
// Update the coefficients with the new ones.
@@ -396,7 +396,7 @@ void MeqParmFunklet::updateFromTable()
void MeqParmFunklet::save()
{
for (unsigned int i=0; i<itsFunklets.size(); i++) {
- ParmDB::ParmValue pval = itsFunklets[i]->getParmValue();
+ LOFAR::ParmDB::ParmValue pval = itsFunklets[i]->getParmValue();
itsTable->putValue (getName(), pval);
}
}
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqParmFunklet.h b/CEP/BB/BBSKernel/src/MNS/MeqParmFunklet.h
index 9ce6929cc0c87632234a33313160dd8b65934c85..52fa45e6dfac3bc0801c407645fccc3cc42fa1e2 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqParmFunklet.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqParmFunklet.h
@@ -56,7 +56,7 @@ class MeqParmFunklet: public MeqParm
{
public:
// Create a stored paramater with the given name and type.
- MeqParmFunklet (const string& name, ParmDB::ParmDB* table);
+ MeqParmFunklet (const string& name, LOFAR::ParmDB::ParmDB* table);
virtual ~MeqParmFunklet();
@@ -65,7 +65,7 @@ public:
// a MeqParmFunklet.
static MeqExpr create (const string& name,
MeqParmGroup& group,
- ParmDB::ParmDB* table);
+ LOFAR::ParmDB::ParmDB* table);
// Get the requested result of the parameter.
virtual MeqResult getResult (const MeqRequest&);
@@ -77,7 +77,7 @@ public:
// Only fill if not filled yet.
// It means that clearFunklets need to be called if a new work domain
// is to be processed.
- virtual void fillFunklets (const std::map<std::string,ParmDB::ParmValueSet>&,
+ virtual void fillFunklets (const std::map<std::string,LOFAR::ParmDB::ParmValueSet>&,
const MeqDomain&);
// Add a funklet.
@@ -96,7 +96,7 @@ public:
virtual const vector<MeqFunklet*>& getFunklets() const;
// Get the ParmDBInfo
- virtual ParmDB::ParmDBMeta getParmDBMeta() const;
+ virtual LOFAR::ParmDB::ParmDBMeta getParmDBMeta() const;
// Get the ParmDB seqnr.
virtual int getParmDBSeqNr() const;
@@ -127,7 +127,7 @@ private:
//# This is the max nr of scids/funklet
int itsPertInx; //# index of first perturbed value in result
vector<MeqFunklet*> itsFunklets;
- ParmDB::ParmDB* itsTable;
+ LOFAR::ParmDB::ParmDB* itsTable;
MeqDomain itsWorkDomain;
};
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqPolc.cc b/CEP/BB/BBSKernel/src/MNS/MeqPolc.cc
index 6441b92023cb54eb0a44e28c934f947f802a49c0..1faf3833d8c48e6db05deb40fc9faebb51a27501 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqPolc.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqPolc.cc
@@ -36,10 +36,10 @@ namespace BBS
{
-MeqPolc::MeqPolc (const ParmDB::ParmValue& pvalue)
+MeqPolc::MeqPolc (const LOFAR::ParmDB::ParmValue& pvalue)
: MeqFunklet (pvalue)
{
- const ParmDB::ParmValueRep& pval = pvalue.rep();
+ const LOFAR::ParmDB::ParmValueRep& pval = pvalue.rep();
ASSERTSTR (pval.itsType == "polc",
"Funklet in ParmValue is not of type 'polc'");
}
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqPolc.h b/CEP/BB/BBSKernel/src/MNS/MeqPolc.h
index 3c3992e360b903ff4d6ed0e331a9f6be92c310f4..fd1cee73afe4122b5f31fda3793f31a28e9f15ae 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqPolc.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqPolc.h
@@ -52,10 +52,10 @@ public:
{}
// Create a polc from a ParmValue object.
- MeqPolc (const ParmDB::ParmValue&);
+ MeqPolc (const LOFAR::ParmDB::ParmValue&);
// Convert a polc to a ParmValue object.
- ParmDB::ParmValue toParmValue() const;
+ LOFAR::ParmDB::ParmValue toParmValue() const;
virtual ~MeqPolc();
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqPolcLog.cc b/CEP/BB/BBSKernel/src/MNS/MeqPolcLog.cc
index b6ce95a0e81c7480ce94f6c8a307c59f22de7e1c..29aafc47fc4a965a1f80360af3f6f35ffb4a2be8 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqPolcLog.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqPolcLog.cc
@@ -36,10 +36,10 @@ namespace LOFAR
namespace BBS
{
-MeqPolcLog::MeqPolcLog(const ParmDB::ParmValue& pvalue)
+MeqPolcLog::MeqPolcLog(const LOFAR::ParmDB::ParmValue& pvalue)
: MeqFunklet(pvalue)
{
- const ParmDB::ParmValueRep& pval = pvalue.rep();
+ const LOFAR::ParmDB::ParmValueRep& pval = pvalue.rep();
ASSERTSTR(pval.itsType == "polclog",
"Funklet in ParmValue is not of type 'polclog'.");
@@ -69,7 +69,7 @@ MeqResult MeqPolcLog::getResult(const MeqRequest& request, int nrpert, int pertI
// "The output domain should be completely contained within the input domain.");
// Get the f0 constants from the parmdb.
- const ParmDB::ParmValueRep ¶meters = itsParmValue.rep();
+ const LOFAR::ParmDB::ParmValueRep ¶meters = itsParmValue.rep();
ASSERTSTR(parameters.itsConstants.size() >= 2, "No constants found in the parmdb for this polclog.");
const double f0[2] = {parameters.itsConstants[0], parameters.itsConstants[1]};
ASSERTSTR(f0[0] > 0.0 && f0[1] == 0.0, "A polclog should always be logarithmic in frequency and linear in time.");
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqPolcLog.h b/CEP/BB/BBSKernel/src/MNS/MeqPolcLog.h
index 0e15d3d3b890e0aea9cdf7370353c09f75606ec5..924f606097a4050efe969b54653cae6096824d77 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqPolcLog.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqPolcLog.h
@@ -76,10 +76,10 @@ public:
}
// Create a PolcLog from a ParmValue object.
- MeqPolcLog(const ParmDB::ParmValue& pvalue);
+ MeqPolcLog(const LOFAR::ParmDB::ParmValue& pvalue);
// Convert a PolcLog to a ParmValue object.
- ParmDB::ParmValue toParmValue() const;
+ LOFAR::ParmDB::ParmValue toParmValue() const;
virtual ~MeqPolcLog();
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqSourceList.cc b/CEP/BB/BBSKernel/src/MNS/MeqSourceList.cc
index a3664a12131ce1664bc56740bad9e2ad40041851..e9fc53adcd61ef586ca7542ecc60799f4542c0b9 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqSourceList.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqSourceList.cc
@@ -38,23 +38,23 @@ namespace LOFAR
namespace BBS
{
-MeqSourceList::MeqSourceList (ParmDB::ParmDB& parmTable, MeqParmGroup& group)
+MeqSourceList::MeqSourceList (LOFAR::ParmDB::ParmDB& parmTable, MeqParmGroup& group)
{
// Get the vector of all parms containing a source name.
// Also get all parms representing a gaussian source.
vector<string> nams = parmTable.getNames("RA:*");
vector<string> gnams = parmTable.getNames("Phi:*");
if (nams.size() == 0) {
- map<string,ParmDB::ParmValueSet> pset;
+ map<string,LOFAR::ParmDB::ParmValueSet> pset;
parmTable.getDefValues (pset, "RA:*");
- for (map<string,ParmDB::ParmValueSet>::const_iterator iter = pset.begin();
+ for (map<string,LOFAR::ParmDB::ParmValueSet>::const_iterator iter = pset.begin();
iter != pset.end();
iter++) {
nams.push_back (iter->first);
}
pset.clear();
parmTable.getDefValues (pset, "Phi:*");
- for (map<string,ParmDB::ParmValueSet>::const_iterator iter = pset.begin();
+ for (map<string,LOFAR::ParmDB::ParmValueSet>::const_iterator iter = pset.begin();
iter != pset.end();
iter++) {
gnams.push_back (iter->first);
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqSourceList.h b/CEP/BB/BBSKernel/src/MNS/MeqSourceList.h
index 7451fdde258e54f8ee3fda62b24772a2dea8676b..07e8976bdf7f86879ed05e203264073301de2e7e 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqSourceList.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqSourceList.h
@@ -52,7 +52,7 @@ public:
{}
// Fill the source list from the sources in the parm table.
- MeqSourceList (ParmDB::ParmDB& parmTable, MeqParmGroup& group);
+ MeqSourceList (LOFAR::ParmDB::ParmDB& parmTable, MeqParmGroup& group);
~MeqSourceList();
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqTabular.cc b/CEP/BB/BBSKernel/src/MNS/MeqTabular.cc
index 5ce1f0067d553e708cebac79c334d09ccf5eb3b0..acf9ae6b9c883cc4da4b5246fe3b01582acb0136 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqTabular.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqTabular.cc
@@ -39,10 +39,10 @@ namespace LOFAR
namespace BBS
{
- MeqTabular::MeqTabular (const ParmDB::ParmValue& pvalue)
+ MeqTabular::MeqTabular (const LOFAR::ParmDB::ParmValue& pvalue)
: MeqFunklet (pvalue)
{
- const ParmDB::ParmValueRep& pval = pvalue.rep();
+ const LOFAR::ParmDB::ParmValueRep& pval = pvalue.rep();
ASSERTSTR (pval.itsType == "tabular",
"Funklet in ParmValue is not of type 'tabular'");
}
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqTabular.h b/CEP/BB/BBSKernel/src/MNS/MeqTabular.h
index 1e01e97c85a0c8f43e02edd3e6707d4854048e3b..442bebf5175e7030640bca79926a96f6edc48d76 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqTabular.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqTabular.h
@@ -46,10 +46,10 @@ namespace BBS
{}
// Create a tabular from a ParmValue object.
- MeqTabular (const ParmDB::ParmValue&);
+ MeqTabular (const LOFAR::ParmDB::ParmValue&);
// Convert a tabular to a ParmValue object.
- ParmDB::ParmValue toParmValue() const;
+ LOFAR::ParmDB::ParmValue toParmValue() const;
virtual ~MeqTabular();
diff --git a/CEP/BB/BBSKernel/src/ParmWriter.cc b/CEP/BB/BBSKernel/src/ParmWriter.cc
index b7c3809196094b80c5cd9f1759f2d54391b53891..3f27d8d711f77cb2d70ec36d22fd90e71fc7f677 100644
--- a/CEP/BB/BBSKernel/src/ParmWriter.cc
+++ b/CEP/BB/BBSKernel/src/ParmWriter.cc
@@ -51,7 +51,7 @@ void ParmWriter::write (const ParmDataInfo& pDataInfo,
double tStart, double tEnd)
{
const vector<ParmData>& pData = pDataInfo.parms();
- ParmDB::ParmDomain pdomain(fStart, fEnd, tStart, tEnd);
+ LOFAR::ParmDB::ParmDomain pdomain(fStart, fEnd, tStart, tEnd);
// Store all parameters, all domains in their own ParmTable
// Use one ParmTable at the time to avoid reopening the same table.
vector<char> done(pData.size(), 0);
@@ -80,18 +80,18 @@ void ParmWriter::write (const ParmDataInfo& pDataInfo,
// Get the ParmDB object for this ParmDB index.
// It requires that Prediffer and Controller open the ParmDBs in
// the same order.
- ParmDB::ParmDB pdb = ParmDB::ParmDB::getParmDB (lastDBnr);
- map<string,ParmDB::ParmValueSet> vals;
+ LOFAR::ParmDB::ParmDB pdb = LOFAR::ParmDB::ParmDB::getParmDB (lastDBnr);
+ map<string,LOFAR::ParmDB::ParmValueSet> vals;
pdb.getValues (vals, parmNames, pdomain);
// Add entries for parms not present in the map.
// They are clearly new parms.
// Set the value for all parms.
for (uint i=0; i<parmNames.size(); i++) {
const ParmData& parmd = pData[parmIndex[i]];
- map<string,ParmDB::ParmValueSet>::iterator pos = vals.find(parmNames[i]);
+ map<string,LOFAR::ParmDB::ParmValueSet>::iterator pos = vals.find(parmNames[i]);
if (pos == vals.end()) {
- ParmDB::ParmValueSet pset(parmNames[i]);
- ParmDB::ParmValue pval = pdb.getDefValue (parmNames[i]);
+ LOFAR::ParmDB::ParmValueSet pset(parmNames[i]);
+ LOFAR::ParmDB::ParmValue pval = pdb.getDefValue (parmNames[i]);
for (int j=0; j<parmd.size(); ++j) {
//// set correct domain
setCoeff (pval.rep(), parmd.getCoeff(j));
@@ -109,7 +109,7 @@ void ParmWriter::write (const ParmDataInfo& pDataInfo,
}
}
-void ParmWriter::setCoeff (ParmDB::ParmValueRep& pval, const MeqMatrix& coeff)
+void ParmWriter::setCoeff (LOFAR::ParmDB::ParmValueRep& pval, const MeqMatrix& coeff)
{
ASSERT (int(pval.itsCoeff.size()) == coeff.nelements());
const double* vals = coeff.doubleStorage();
diff --git a/CEP/BB/BBSKernel/src/ParmWriter.h b/CEP/BB/BBSKernel/src/ParmWriter.h
index 2b249bd2351c273990e6843454d3e1a35fb7747e..852ac959658a6ddef0a4399b3d5a24efa87b463c 100644
--- a/CEP/BB/BBSKernel/src/ParmWriter.h
+++ b/CEP/BB/BBSKernel/src/ParmWriter.h
@@ -70,7 +70,7 @@ namespace BBS
double tStart, double tEnd);
private:
- void setCoeff (ParmDB::ParmValueRep& pval, const MeqMatrix& coeff);
+ void setCoeff (LOFAR::ParmDB::ParmValueRep& pval, const MeqMatrix& coeff);
};
// @}
diff --git a/CEP/BB/BBSKernel/src/Prediffer.cc b/CEP/BB/BBSKernel/src/Prediffer.cc
index de6a59e45923ab0de4b3acfb72c7bb887428f96a..04cca80986d416bb0916411e867bc1a811360e74 100644
--- a/CEP/BB/BBSKernel/src/Prediffer.cc
+++ b/CEP/BB/BBSKernel/src/Prediffer.cc
@@ -120,8 +120,8 @@ namespace BBS
{
Prediffer::Prediffer(const string& msName,
- const ParmDB::ParmDBMeta& meqPdm,
- const ParmDB::ParmDBMeta& skyPdm,
+ const LOFAR::ParmDB::ParmDBMeta& meqPdm,
+ const LOFAR::ParmDB::ParmDBMeta& skyPdm,
uint ddid,
bool calcUVW)
: itsMEPName (meqPdm.getTableName()),
@@ -1009,7 +1009,7 @@ void Prediffer::readParms()
// Read all parms for this domain into a single map.
itsParmValues.clear();
vector<string> emptyvec;
- ParmDB::ParmDomain pdomain(itsWorkDomain.startX(), itsWorkDomain.endX(),
+ LOFAR::ParmDB::ParmDomain pdomain(itsWorkDomain.startX(), itsWorkDomain.endX(),
itsWorkDomain.startY(), itsWorkDomain.endY());
itsMEP.getValues (itsParmValues, emptyvec, pdomain);
itsGSMMEP.getValues (itsParmValues, emptyvec, pdomain);
diff --git a/CEP/BB/BBSKernel/src/Prediffer.h b/CEP/BB/BBSKernel/src/Prediffer.h
index aaeda808682d4991e1e969e083982861cf52f514..aa0f93d850a2bd7c584fc348a2740bb8b42d916c 100644
--- a/CEP/BB/BBSKernel/src/Prediffer.h
+++ b/CEP/BB/BBSKernel/src/Prediffer.h
@@ -87,8 +87,8 @@ public:
// for the specified data descriptor (i.e. spectral window).
// The UVW coordinates can be calculated or taken from the MS.
Prediffer (const string& msName,
- const ParmDB::ParmDBMeta& meqPtd,
- const ParmDB::ParmDBMeta& skyPtd,
+ const LOFAR::ParmDB::ParmDBMeta& meqPtd,
+ const LOFAR::ParmDB::ParmDBMeta& skyPtd,
uint ddid,
bool calcUVW);
@@ -353,9 +353,9 @@ private:
string itsMSName; //# Measurement set name
string itsMEPName; //# Common parmtable name
- ParmDB::ParmDB itsMEP; //# Common parmtable
+ LOFAR::ParmDB::ParmDB itsMEP; //# Common parmtable
string itsGSMMEPName; //# GSM parameters parmtable name
- ParmDB::ParmDB itsGSMMEP; //# parmtable for GSM parameters
+ LOFAR::ParmDB::ParmDB itsGSMMEP; //# parmtable for GSM parameters
MeqParmGroup itsParmGroup; //# container for all parms
bool itsCalcUVW;
@@ -417,7 +417,7 @@ private:
bool itsIsWeightSpec; //# true = weight per channel
//# All parm values in current work domain.
- map<string,ParmDB::ParmValueSet> itsParmValues;
+ map<string,LOFAR::ParmDB::ParmValueSet> itsParmValues;
//# Fitter info set by initSolvableParms.
vector<int> itsFreqFitInx; //# Fitter for each freq in work domain
diff --git a/CEP/BB/BBSKernel/src/Solver.cc b/CEP/BB/BBSKernel/src/Solver.cc
index b781df446ee2eedaac8e073fde1da4baec89c6ee..486260efa329f9672e02f5fd3c740c43edb313e2 100644
--- a/CEP/BB/BBSKernel/src/Solver.cc
+++ b/CEP/BB/BBSKernel/src/Solver.cc
@@ -105,7 +105,7 @@ void Solver::solve (bool useSVD)
// last iteration to a ParmDB. The type of the parameters is set to 'history'
// to ensure that they cannot accidentily be used as input for BBSkernel. Also,
// ParmFacade::getHistory() checks on this type.
-void Solver::log(ParmDB::ParmDB &table)
+void Solver::log(LOFAR::ParmDB::ParmDB &table)
{
ostringstream os;
os << std::setfill('0');
@@ -124,11 +124,11 @@ void Solver::log(ParmDB::ParmDB &table)
// coefficients of each solvable parameter.
for(size_t i = 0; i < itsFitters.size(); ++i)
{
- ParmDB::ParmValue value;
- ParmDB::ParmValueRep &valueRep = value.rep();
+ LOFAR::ParmDB::ParmValue value;
+ LOFAR::ParmDB::ParmValueRep &valueRep = value.rep();
valueRep.setType("history");
- valueRep.setDomain(ParmDB::ParmDomain(domains[i].startX(), domains[i].endX(), domains[i].startY(), domains[i].endY()));
+ valueRep.setDomain(LOFAR::ParmDB::ParmDomain(domains[i].startX(), domains[i].endX(), domains[i].startY(), domains[i].endY()));
// Log quality indicators.
FitterData &fitter = itsFitters[i];
diff --git a/CEP/BB/BBSKernel/src/Solver.h b/CEP/BB/BBSKernel/src/Solver.h
index 8cb931409b15de65f9596abda80d7ac97c540e17..040596999cabdf2247675cc81385e36668eaab65 100644
--- a/CEP/BB/BBSKernel/src/Solver.h
+++ b/CEP/BB/BBSKernel/src/Solver.h
@@ -84,7 +84,7 @@ public:
// Log the quality indicators, and the coefficients of the solvable
// parameters to a ParmDB.
- void log(ParmDB::ParmDB &table);
+ void log(LOFAR::ParmDB::ParmDB &table);
private:
// Copy constructor and assignment are not allowed.