diff --git a/CEP/BB/BBSControl/src/BBSCorrectStep.cc b/CEP/BB/BBSControl/src/BBSCorrectStep.cc
index cf119b1d60088766b97fffdb6bc44238222120b0..636649fb1538201b6a0091fe072aa3fbc278ae89 100644
--- a/CEP/BB/BBSControl/src/BBSCorrectStep.cc
+++ b/CEP/BB/BBSControl/src/BBSCorrectStep.cc
@@ -37,6 +37,12 @@ namespace LOFAR
}
+ const string& BBSCorrectStep::operation() const
+ {
+ static string theOperation("Correct");
+ return theOperation;
+ }
+
const string& BBSCorrectStep::classType() const
{
static string theType("BBSCorrectStep");
diff --git a/CEP/BB/BBSControl/src/BBSPredictStep.cc b/CEP/BB/BBSControl/src/BBSPredictStep.cc
index 4fc5f5f32220a4ce5b0e80f3bf9be30962d9febf..85c3c46a59ce2250898609edf84b5c154bd30f1a 100644
--- a/CEP/BB/BBSControl/src/BBSPredictStep.cc
+++ b/CEP/BB/BBSControl/src/BBSPredictStep.cc
@@ -36,7 +36,12 @@ namespace LOFAR
registerClass<BBSPredictStep>("BBSPredictStep");
}
-
+ const string& BBSPredictStep::operation() const
+ {
+ static string theOperation("Predict");
+ return theOperation;
+ }
+
const string& BBSPredictStep::classType() const
{
static string theType("BBSPredictStep");
diff --git a/CEP/BB/BBSControl/src/BBSRefitStep.cc b/CEP/BB/BBSControl/src/BBSRefitStep.cc
index 208cbe65a31896090dad17b483b2554336a1388d..87ab70cdde29efae8f99e939c42ce016ccf4cbbb 100644
--- a/CEP/BB/BBSControl/src/BBSRefitStep.cc
+++ b/CEP/BB/BBSControl/src/BBSRefitStep.cc
@@ -36,7 +36,12 @@ namespace LOFAR
registerClass<BBSRefitStep>("BBSRefitStep");
}
-
+ const string& BBSRefitStep::operation() const
+ {
+ static string theOperation("Refit");
+ return theOperation;
+ }
+
const string& BBSRefitStep::classType() const
{
static string theType("BBSRefitStep");
diff --git a/CEP/BB/BBSControl/src/BBSShiftStep.cc b/CEP/BB/BBSControl/src/BBSShiftStep.cc
index 6404b5401c9fdd4ee199563426fdb9d89207d39c..464d23b68097d9be7fa892ccc15a9e8f8cf58608 100644
--- a/CEP/BB/BBSControl/src/BBSShiftStep.cc
+++ b/CEP/BB/BBSControl/src/BBSShiftStep.cc
@@ -36,7 +36,12 @@ namespace LOFAR
registerClass<BBSShiftStep>("BBSShiftStep");
}
-
+ const string& BBSShiftStep::operation() const
+ {
+ static string theOperation("Shift");
+ return theOperation;
+ }
+
const string& BBSShiftStep::classType() const
{
static string theType("BBSShiftStep");
diff --git a/CEP/BB/BBSControl/src/BBSSolveStep.cc b/CEP/BB/BBSControl/src/BBSSolveStep.cc
index 3e594117efbec8b7349305065202a4894503f2ed..5a544b0aae39a720048e20db0e03f69b09de849c 100644
--- a/CEP/BB/BBSControl/src/BBSSolveStep.cc
+++ b/CEP/BB/BBSControl/src/BBSSolveStep.cc
@@ -105,6 +105,21 @@ namespace LOFAR
}
+ const string& BBSSolveStep::operation() const
+ {
+ static string theOperation("Solve");
+ return theOperation;
+ }
+
+
+ const string& BBSSolveStep::classType() const
+ {
+ LOG_TRACE_LIFETIME(TRACE_LEVEL_RTTI, "");
+ static const string theType("BBSSolveStep");
+ return theType;
+ }
+
+
//##-------- P r i v a t e m e t h o d s --------##//
void BBSSolveStep::write(BlobOStream& bos) const
@@ -133,14 +148,6 @@ namespace LOFAR
}
- const string& BBSSolveStep::classType() const
- {
- LOG_TRACE_LIFETIME(TRACE_LEVEL_RTTI, "");
- static const string theType("BBSSolveStep");
- return theType;
- }
-
-
} // namespace BBS
} // namespace LOFAR
diff --git a/CEP/BB/BBSControl/src/BBSSolverProcessControl.cc b/CEP/BB/BBSControl/src/BBSSolverProcessControl.cc
index ff155c7d8106ffe899638bad957debb20567e852..df63b2f26308058736070c9496a5f72067165955 100644
--- a/CEP/BB/BBSControl/src/BBSSolverProcessControl.cc
+++ b/CEP/BB/BBSControl/src/BBSSolverProcessControl.cc
@@ -259,7 +259,7 @@ namespace BBS
Domain &domain = itsRegisteredDomains[request->getDomainIndex()];
domain.index = request->getDomainIndex();
domain.unknowns = request->getUnknowns();
- domain.solver.set(domain.unknowns.size());
+ domain.solver.set(casa::uInt(domain.unknowns.size()));
domain.epsilon = request->getEpsilon();
// Set new value solution test
//domain.solver.setEpsValue(request->getEpsilon());
diff --git a/CEP/BB/BBSControl/src/BBSStep.cc b/CEP/BB/BBSControl/src/BBSStep.cc
index 0544bdb586dc708a5973e54c11386c0d76a61899..abf1d361aab6cebedf94f1abc09125f6bb03c433 100644
--- a/CEP/BB/BBSControl/src/BBSStep.cc
+++ b/CEP/BB/BBSControl/src/BBSStep.cc
@@ -190,11 +190,7 @@ namespace LOFAR
// If defined, get the correlation selection (ALL, AUTO, or CROSS), and
// type (e.g., ["XX", "XY", "YX", "YY"]
try {
- string sel = ps.getString("Correlation.Selection");
- if (sel == "ALL" || sel == "AUTO" || sel == "CROSS")
- itsCorrelation.selection = sel;
- else THROW(BBSControlException,
- "Invalid correlation selection " << sel);
+ itsCorrelation.selection = ps.getString("Correlation.Selection");
itsCorrelation.type = ps.getStringVector("Correlation.Type");
} catch (APSException&) {}
diff --git a/CEP/BB/BBSControl/src/BBSStrategy.cc b/CEP/BB/BBSControl/src/BBSStrategy.cc
index d7f3b0b377d13b3b4c7c57a29bb94331f1647b9e..89ae2bac442c12f71f581f02f6ef3d704931ab51 100644
--- a/CEP/BB/BBSControl/src/BBSStrategy.cc
+++ b/CEP/BB/BBSControl/src/BBSStrategy.cc
@@ -86,8 +86,7 @@ namespace LOFAR
itsInputData = ps.getString("InputData");
// Get the region of interest (optional)
- try
- {
+ try {
itsRegionOfInterest = ps.getDoubleVector("RegionOfInterest");
} catch (APSException&) {}
@@ -96,12 +95,7 @@ namespace LOFAR
itsDomainSize.timeInterval = ps.getDouble("WorkDomainSize.Time");
// Get the correlation product selection (ALL, AUTO, or CROSS)
- string sel = ps.getString("Correlation.Selection");
- if (sel == "ALL" || sel == "AUTO" || sel == "CROSS")
- itsCorrelation.selection = sel;
- else
- THROW(BBSControlException,
- "Invalid correlation selection " << sel);
+ itsCorrelation.selection = ps.getString("Correlation.Selection");
itsCorrelation.type = ps.getStringVector("Correlation.Type");
// Get the integration intervals in frequency (Hz) and time (s).
diff --git a/CEP/BB/BBSControl/src/BBSSubtractStep.cc b/CEP/BB/BBSControl/src/BBSSubtractStep.cc
index 111fc8219a333446778ea6274e2014691752472f..687423a75deb1f124db456f5c2384214087ef867 100644
--- a/CEP/BB/BBSControl/src/BBSSubtractStep.cc
+++ b/CEP/BB/BBSControl/src/BBSSubtractStep.cc
@@ -36,7 +36,12 @@ namespace LOFAR
registerClass<BBSSubtractStep>("BBSSubtractStep");
}
-
+ const string& BBSSubtractStep::operation() const
+ {
+ static string theOperation("Subtract");
+ return theOperation;
+ }
+
const string& BBSSubtractStep::classType() const
{
static string theType("BBSSubtractStep");
diff --git a/CEP/BB/BBSControl/src/SolverProcessControl.cc b/CEP/BB/BBSControl/src/SolverProcessControl.cc
index ff155c7d8106ffe899638bad957debb20567e852..df63b2f26308058736070c9496a5f72067165955 100644
--- a/CEP/BB/BBSControl/src/SolverProcessControl.cc
+++ b/CEP/BB/BBSControl/src/SolverProcessControl.cc
@@ -259,7 +259,7 @@ namespace BBS
Domain &domain = itsRegisteredDomains[request->getDomainIndex()];
domain.index = request->getDomainIndex();
domain.unknowns = request->getUnknowns();
- domain.solver.set(domain.unknowns.size());
+ domain.solver.set(casa::uInt(domain.unknowns.size()));
domain.epsilon = request->getEpsilon();
// Set new value solution test
//domain.solver.setEpsValue(request->getEpsilon());