BugId: 991

* Added operation() method to BBSSingleStep and its child classes to query the
  BBSSingleStep for the type of operation it will perform.

* Do not use PSQL arrays anymore. They caused "major" headaches when quoting
  array of strings. An array of strings is now stored as a normal string
  delimited by '[' and ']', just as in a ParameterSet.

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");

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");

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");

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");

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

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());

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&) {}
 

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).

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");

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());