diff --git a/CEP/Imager/MWControl/configure.in b/CEP/Imager/MWControl/configure.in
index 1383218b1fe14949cfc89589a425edf416e26de8..bb0f002edc5a724802e51922c49b624411b9d022 100644
--- a/CEP/Imager/MWControl/configure.in
+++ b/CEP/Imager/MWControl/configure.in
@@ -52,7 +52,7 @@ dnl Check for LOFAR specific things
 dnl
 lofar_GENERAL
 lofar_INTERNAL(CEP/Imager/MWCommon,MWCommon,,1,MWCommon/MWConnection.h,,)
-lofar_INTERNAL(CEP/Calibration/BBSKernel,BBSKernel,,1,BBSKernel/Types.h,,)
+lofar_INTERNAL(CEP/Calibration/BBSKernel,BBSKernel,,1,BBSKernel/Measurement.h,,)
 lofar_EXTERNAL(boost,1,boost/shared_ptr.hpp,"")
 
 dnl
diff --git a/CEP/Imager/MWControl/include/MWControl/MWGlobalSpec.h b/CEP/Imager/MWControl/include/MWControl/MWGlobalSpec.h
index b0c056393b2147b975d9cfd1c6ecae1dfff8f6db..04537e895a7e62de6703e0467ce26cb5ca300c90 100644
--- a/CEP/Imager/MWControl/include/MWControl/MWGlobalSpec.h
+++ b/CEP/Imager/MWControl/include/MWControl/MWGlobalSpec.h
@@ -1,4 +1,4 @@
-//# MWGlobalStep.h: Class representing a global step in the MWSpec composite pattern
+//# MWGlobalStep.h: A global step in the MWSpec composite pattern
 //#
 //# Copyright (C) 2005
 //# ASTRON (Netherlands Foundation for Research in Astronomy)
diff --git a/CEP/Imager/MWControl/include/MWControl/MWLocalSpec.h b/CEP/Imager/MWControl/include/MWControl/MWLocalSpec.h
index 37bf6890ac79329b030ef5709db75af3e218e19a..094c9073346c343810a73c22f2ef81c5ecb876d6 100644
--- a/CEP/Imager/MWControl/include/MWControl/MWLocalSpec.h
+++ b/CEP/Imager/MWControl/include/MWControl/MWLocalSpec.h
@@ -1,4 +1,4 @@
-//# MWLocalStep.h: Class representing a local step in the MWSpec composite pattern
+//# MWLocalStep.h: A local step in the MWSpec composite pattern
 //#
 //# Copyright (C) 2005
 //# ASTRON (Netherlands Foundation for Research in Astronomy)
diff --git a/CEP/Imager/MWControl/include/MWControl/MWMultiSpec.h b/CEP/Imager/MWControl/include/MWControl/MWMultiSpec.h
index 5167296d9c2f54e12d138b16035ef9bf2b0ab638..8e173e651ffcc7f47de41a24bcb4af304026cd7f 100644
--- a/CEP/Imager/MWControl/include/MWControl/MWMultiSpec.h
+++ b/CEP/Imager/MWControl/include/MWControl/MWMultiSpec.h
@@ -1,4 +1,4 @@
-//# MWMultiSpec.h: Class representing a multi step in the MWSpec composite pattern
+//# MWMultiSpec.h: A multi step in the MWSpec composite pattern
 //#
 //# Copyright (C) 2005
 //# ASTRON (Netherlands Foundation for Research in Astronomy)
diff --git a/CEP/Imager/MWControl/include/MWControl/PredifferBBS.h b/CEP/Imager/MWControl/include/MWControl/PredifferBBS.h
index f179d6609d70d48231b008d44854c5fe3f2910b2..d03aafcef89378ccf2398b021df2c216673294ad 100644
--- a/CEP/Imager/MWControl/include/MWControl/PredifferBBS.h
+++ b/CEP/Imager/MWControl/include/MWControl/PredifferBBS.h
@@ -74,7 +74,7 @@ class PredifferBBS: public PredifferProxy
 			 LOFAR::BlobOStream& out);
 
   private:
-    LOFAR::BBS::Prediffer* itsPrediffer;
+    /* LOFAR::BBS::Prediffer* */ int* itsPrediffer;
   };
 
 }} // end namespaces
diff --git a/CEP/Imager/MWControl/src/MWGlobalSpec.cc b/CEP/Imager/MWControl/src/MWGlobalSpec.cc
index 60d330cf5db6ba0eac19b1bee30cee3e147bb04b..3f2aeee47a9657465a90d3b1a81efba8436086ac 100644
--- a/CEP/Imager/MWControl/src/MWGlobalSpec.cc
+++ b/CEP/Imager/MWControl/src/MWGlobalSpec.cc
@@ -1,9 +1,26 @@
-//#  MWGlobalSpec.cc: 
+//# MWGlobalSpec.cc: A global step in the MWSpec composite pattern
 //#
-//#  Copyright (C) 2007
+//# Copyright (C) 2005
+//# ASTRON (Netherlands Foundation for Research in Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
 //#
-//#  $Id$
+//# This program is free software; you can redistribute it and/or modify
+//# it under the terms of the GNU General Public License as published by
+//# the Free Software Foundation; either version 2 of the License, or
+//# (at your option) any later version.
+//#
+//# This program is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License
+//# along with this program; if not, write to the Free Software
+//# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//#
+//# $Id$
 
+#include <lofar_config.h>
 #include <MWControl/MWGlobalSpec.h>
 #include <MWCommon/MWStepFactory.h>
 
diff --git a/CEP/Imager/MWControl/src/MWLocalSpec.cc b/CEP/Imager/MWControl/src/MWLocalSpec.cc
index e46d54e936db6a6ccfd5e5956c0dc8a6735fa794..143faa1cca3d617c40c089242935bcb0a95fb169 100644
--- a/CEP/Imager/MWControl/src/MWLocalSpec.cc
+++ b/CEP/Imager/MWControl/src/MWLocalSpec.cc
@@ -1,9 +1,26 @@
-//#  MWLocalSpec.cc: 
+//# MWLocalSpec.cc: A local step in the MWSpec composite pattern
 //#
-//#  Copyright (C) 2007
+//# Copyright (C) 2005
+//# ASTRON (Netherlands Foundation for Research in Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
 //#
-//#  $Id$
+//# This program is free software; you can redistribute it and/or modify
+//# it under the terms of the GNU General Public License as published by
+//# the Free Software Foundation; either version 2 of the License, or
+//# (at your option) any later version.
+//#
+//# This program is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License
+//# along with this program; if not, write to the Free Software
+//# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//#
+//# $Id$
 
+#include <lofar_config.h>
 #include <MWControl/MWLocalSpec.h>
 #include <MWCommon/MWStepFactory.h>
 
diff --git a/CEP/Imager/MWControl/src/MWMultiSpec.cc b/CEP/Imager/MWControl/src/MWMultiSpec.cc
index 3f5f946271c76c91cc900e4b74ec3b09f1d1f0b5..9a0d3a5c1a270d728e61b14f8883876012e95e31 100644
--- a/CEP/Imager/MWControl/src/MWMultiSpec.cc
+++ b/CEP/Imager/MWControl/src/MWMultiSpec.cc
@@ -1,9 +1,26 @@
-//#  MWMultiSpec.cc: 
+//# MWMultiSpec.cc: A multi step in the MWSpec composite pattern
 //#
-//#  Copyright (C) 2007
+//# Copyright (C) 2005
+//# ASTRON (Netherlands Foundation for Research in Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
 //#
-//#  $Id$
+//# This program is free software; you can redistribute it and/or modify
+//# it under the terms of the GNU General Public License as published by
+//# the Free Software Foundation; either version 2 of the License, or
+//# (at your option) any later version.
+//#
+//# This program is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License
+//# along with this program; if not, write to the Free Software
+//# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//#
+//# $Id$
 
+#include <lofar_config.h>
 #include <MWControl/MWMultiSpec.h>
 
 using namespace LOFAR;
diff --git a/CEP/Imager/MWControl/src/MWParameterHandler.cc b/CEP/Imager/MWControl/src/MWParameterHandler.cc
index d387519499ea4733a1ff29dfe7dfe51fed8acc4a..afd6fb4f86d52adee707b31c7e29482eed8dda06 100644
--- a/CEP/Imager/MWControl/src/MWParameterHandler.cc
+++ b/CEP/Imager/MWControl/src/MWParameterHandler.cc
@@ -1,9 +1,26 @@
-//#  MWParameterHandler.cc: 
+//# MWParameterHandler.cc: Handle the master-worker part of a .parset file
 //#
-//#  Copyright (C) 2007
+//# Copyright (C) 2005
+//# ASTRON (Netherlands Foundation for Research in Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
 //#
-//#  $Id$
+//# This program is free software; you can redistribute it and/or modify
+//# it under the terms of the GNU General Public License as published by
+//# the Free Software Foundation; either version 2 of the License, or
+//# (at your option) any later version.
+//#
+//# This program is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License
+//# along with this program; if not, write to the Free Software
+//# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//#
+//# $Id$
 
+#include <lofar_config.h>
 #include <MWControl/MWParameterHandler.h>
 #include <MWControl/MWStrategySpec.h>
 #include <MWControl/MWMultiSpec.h>
diff --git a/CEP/Imager/MWControl/src/MWSpec.cc b/CEP/Imager/MWControl/src/MWSpec.cc
index c8ef325f120a27c23662d947a4d6c769af2244e7..cbbb2ce5aa456803c971a07c0c2056e7e90e26ec 100644
--- a/CEP/Imager/MWControl/src/MWSpec.cc
+++ b/CEP/Imager/MWControl/src/MWSpec.cc
@@ -1,9 +1,26 @@
-//#  MWSpec.cc: 
+//# MWSpec.cc: Base component class of the MWSpec composite pattern
 //#
-//#  Copyright (C) 2007
+//# Copyright (C) 2005
+//# ASTRON (Netherlands Foundation for Research in Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
 //#
-//#  $Id$
+//# This program is free software; you can redistribute it and/or modify
+//# it under the terms of the GNU General Public License as published by
+//# the Free Software Foundation; either version 2 of the License, or
+//# (at your option) any later version.
+//#
+//# This program is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License
+//# along with this program; if not, write to the Free Software
+//# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//#
+//# $Id$
 
+#include <lofar_config.h>
 #include <MWControl/MWSpec.h>
 #include <MWControl/MWGlobalSpec.h>
 #include <MWControl/MWLocalSpec.h>
diff --git a/CEP/Imager/MWControl/src/MWStrategySpec.cc b/CEP/Imager/MWControl/src/MWStrategySpec.cc
index 2bb42d8e8ce78a0c7be3c06a1342306bbe1c8f89..4cc2476c191ef9a9f44692acc1228de142a12b98 100644
--- a/CEP/Imager/MWControl/src/MWStrategySpec.cc
+++ b/CEP/Imager/MWControl/src/MWStrategySpec.cc
@@ -1,7 +1,26 @@
-//# MWStrategySpec.cc: The specification of a strategy
+//# MWStrategySpec.cc: Specification of a BBS strateg
 //#
-//# Copyright (C) 2007
+//# Copyright (C) 2005
+//# ASTRON (Netherlands Foundation for Research in Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#
+//# This program is free software; you can redistribute it and/or modify
+//# it under the terms of the GNU General Public License as published by
+//# the Free Software Foundation; either version 2 of the License, or
+//# (at your option) any later version.
+//#
+//# This program is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License
+//# along with this program; if not, write to the Free Software
+//# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//#
+//# $Id$
 
+#include <lofar_config.h>
 #include <MWControl/MWStrategySpec.h>
 #include <MWControl/MWSpec.h>
 #include <MWControl/MWParameterHandler.h>
diff --git a/CEP/Imager/MWControl/src/PredifferBBS.cc b/CEP/Imager/MWControl/src/PredifferBBS.cc
index 4c63f2fdd549201dd3530440b71a77b801024f04..fc376c55566e951c1f1bb61c8bd7e9dd31146f51 100644
--- a/CEP/Imager/MWControl/src/PredifferBBS.cc
+++ b/CEP/Imager/MWControl/src/PredifferBBS.cc
@@ -1,19 +1,34 @@
-//#  PredifferBBS.cc: Prediffer BBSler of distributed VDS processing
+//# PredifferBBS.cc: A WorkerProxy to handle BBSKernel prediffer commands
 //#
-//#  Copyright (C) 2007
+//# Copyright (C) 2005
+//# ASTRON (Netherlands Foundation for Research in Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
 //#
-//#  $Id$
+//# This program is free software; you can redistribute it and/or modify
+//# it under the terms of the GNU General Public License as published by
+//# the Free Software Foundation; either version 2 of the License, or
+//# (at your option) any later version.
+//#
+//# This program is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License
+//# along with this program; if not, write to the Free Software
+//# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//#
+//# $Id$
 
 #include <lofar_config.h>
 #include <MWControl/PredifferBBS.h>
-#include <BBSKernel/Prediffer.h>
+///#include <BBSKernel/Prediffer.h>
 #include <BBSKernel/MeasurementAIPS.h>
 #include <ParmDB/ParmDB.h>
 #include <Blob/BlobIStream.h>
 #include <Blob/BlobString.h>
 
 using namespace LOFAR::BBS;
-using LOFAR::ParmDB::ParmDBMeta;
 
 namespace LOFAR { namespace CEP {
 
@@ -40,11 +55,9 @@ namespace LOFAR { namespace CEP {
 						parset.getInt32 ("ObsID", 0),
 						parset.getInt32 ("SubBandID", 0),
 						parset.getInt32 ("FieldID", 0)));
-    LOFAR::ParmDB::ParmDB instDB
-      (ParmDBMeta(parset.getString("ParmDB.Instrument"), "aips"));
-    LOFAR::ParmDB::ParmDB skyDB
-      (ParmDBMeta(parset.getString("ParmDB.LocalSky"), "aips"));
-    itsPrediffer = new Prediffer (ms, instDB, skyDB);
+    ParmDB instDB (ParmDBMeta(parset.getString("ParmDB.Instrument"), "casa"));
+    ParmDB skyDB  (ParmDBMeta(parset.getString("ParmDB.LocalSky"), "casa"));
+    ///itsPrediffer = new Prediffer (ms, instDB, skyDB);
   }
 
   int PredifferBBS::process (int operation, int streamId,
diff --git a/CEP/Imager/MWControl/src/PredifferProxy.cc b/CEP/Imager/MWControl/src/PredifferProxy.cc
index d14364a2d60941f9a8265d8ef17c627a2ab47acf..34c672ec95c125dd9f170be15e3fd7745b114e80 100644
--- a/CEP/Imager/MWControl/src/PredifferProxy.cc
+++ b/CEP/Imager/MWControl/src/PredifferProxy.cc
@@ -1,9 +1,26 @@
-//#  PredifferProxy.cc: Prediffer proxyler of distributed VDS processing
+//# PredifferProxy.cc: Base class for BBSKernel prediffer behaviour
 //#
-//#  Copyright (C) 2007
+//# Copyright (C) 2005
+//# ASTRON (Netherlands Foundation for Research in Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
 //#
-//#  $Id$
+//# This program is free software; you can redistribute it and/or modify
+//# it under the terms of the GNU General Public License as published by
+//# the Free Software Foundation; either version 2 of the License, or
+//# (at your option) any later version.
+//#
+//# This program is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License
+//# along with this program; if not, write to the Free Software
+//# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//#
+//# $Id$
 
+#include <lofar_config.h>
 #include <MWControl/PredifferProxy.h>
 
 
diff --git a/CEP/Imager/MWControl/src/SolverBBS.cc b/CEP/Imager/MWControl/src/SolverBBS.cc
index 47b1555f2476931435a6a59ad8a872af22447c22..a057d154d6ecbb04f7e9446f273fdfa5d2aec308 100644
--- a/CEP/Imager/MWControl/src/SolverBBS.cc
+++ b/CEP/Imager/MWControl/src/SolverBBS.cc
@@ -1,8 +1,24 @@
-//#  SolverBBS.cc: Solver BBSler of distributed VDS processing
+//# SolverBBS.cc: A WorkerProxy to handle BBSKernel solver commands
 //#
-//#  Copyright (C) 2007
+//# Copyright (C) 2005
+//# ASTRON (Netherlands Foundation for Research in Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
 //#
-//#  $Id$
+//# This program is free software; you can redistribute it and/or modify
+//# it under the terms of the GNU General Public License as published by
+//# the Free Software Foundation; either version 2 of the License, or
+//# (at your option) any later version.
+//#
+//# This program is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License
+//# along with this program; if not, write to the Free Software
+//# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//#
+//# $Id$
 
 #include <lofar_config.h>
 #include <MWControl/SolverBBS.h>
diff --git a/CEP/Imager/MWControl/src/SolverProxy.cc b/CEP/Imager/MWControl/src/SolverProxy.cc
index bde7af33c68f5a356e4d744ddca9605142fc1e0c..d465a36808e6c05aeb648e1fc1270c8dfece15d2 100644
--- a/CEP/Imager/MWControl/src/SolverProxy.cc
+++ b/CEP/Imager/MWControl/src/SolverProxy.cc
@@ -1,9 +1,26 @@
-//#  SolverProxy.cc: 
+//# SolverProxy.cc: Base class for BBSKernel solver behaviour
 //#
-//#  Copyright (C) 2007
+//# Copyright (C) 2005
+//# ASTRON (Netherlands Foundation for Research in Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
 //#
-//#  $Id$
+//# This program is free software; you can redistribute it and/or modify
+//# it under the terms of the GNU General Public License as published by
+//# the Free Software Foundation; either version 2 of the License, or
+//# (at your option) any later version.
+//#
+//# This program is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License
+//# along with this program; if not, write to the Free Software
+//# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//#
+//# $Id$
 
+#include <lofar_config.h>
 #include <MWControl/SolverProxy.h>
 
 
diff --git a/CEP/Imager/MWControl/test/MWStepTester.cc b/CEP/Imager/MWControl/test/MWStepTester.cc
index d07f61f9b0439274f5a47c6358e2ea4b0007aec2..e6aa600a2775854d807a5803f103603863d523ad 100644
--- a/CEP/Imager/MWControl/test/MWStepTester.cc
+++ b/CEP/Imager/MWControl/test/MWStepTester.cc
@@ -1,9 +1,26 @@
-//#  MWStepTester.cc: 
+//# MWStepTester.cc: Test class for the MWStep framework
 //#
-//#  Copyright (C) 2007
+//# Copyright (C) 2005
+//# ASTRON (Netherlands Foundation for Research in Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
 //#
-//#  $Id$
+//# This program is free software; you can redistribute it and/or modify
+//# it under the terms of the GNU General Public License as published by
+//# the Free Software Foundation; either version 2 of the License, or
+//# (at your option) any later version.
+//#
+//# This program is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License
+//# along with this program; if not, write to the Free Software
+//# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//#
+//# $Id$
 
+#include <lofar_config.h>
 #include "MWStepTester.h"
 #include <MWControl/MWGlobalSpec.h>
 #include <MWControl/MWLocalSpec.h>
diff --git a/CEP/Imager/MWControl/test/MWStepTester.h b/CEP/Imager/MWControl/test/MWStepTester.h
index d265941888da4fc1e7aa6621e1ab61083c1ede23..8e589dd3f3ca4ca97499e6320039d0d01df51ea3 100644
--- a/CEP/Imager/MWControl/test/MWStepTester.h
+++ b/CEP/Imager/MWControl/test/MWStepTester.h
@@ -1,8 +1,24 @@
-//#  MWStepTester.h: 
+//# MWStepTester.h: Test class for the MWStep framework
 //#
-//#  Copyright (C) 2007
+//# Copyright (C) 2005
+//# ASTRON (Netherlands Foundation for Research in Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
 //#
-//#  $Id$
+//# This program is free software; you can redistribute it and/or modify
+//# it under the terms of the GNU General Public License as published by
+//# the Free Software Foundation; either version 2 of the License, or
+//# (at your option) any later version.
+//#
+//# This program is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License
+//# along with this program; if not, write to the Free Software
+//# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//#
+//# $Id$
 
 #ifndef LOFAR_MWCONTROL_MWSTEPTESTER_H
 #define LOFAR_MWCONTROL_MWSTEPTESTER_H
diff --git a/CEP/Imager/MWControl/test/PredifferTest.cc b/CEP/Imager/MWControl/test/PredifferTest.cc
index f592ed37864b986a1804562e55ea5d1d958db4a1..f7206d57e96e9b3ec1f90f9122b9fbe80dff1fa1 100644
--- a/CEP/Imager/MWControl/test/PredifferTest.cc
+++ b/CEP/Imager/MWControl/test/PredifferTest.cc
@@ -1,9 +1,26 @@
-//#  PredifferTest.cc: Prediffer BBSler of distributed VDS processing
+//# PredifferTest.cc: Test class mimicking the PredifferBBS behaviour
 //#
-//#  Copyright (C) 2007
+//# Copyright (C) 2005
+//# ASTRON (Netherlands Foundation for Research in Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
 //#
-//#  $Id$
+//# This program is free software; you can redistribute it and/or modify
+//# it under the terms of the GNU General Public License as published by
+//# the Free Software Foundation; either version 2 of the License, or
+//# (at your option) any later version.
+//#
+//# This program is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License
+//# along with this program; if not, write to the Free Software
+//# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//#
+//# $Id$
 
+#include <lofar_config.h>
 #include "PredifferTest.h"
 #include "MWStepTester.h"
 #include <MWCommon/MasterControl.h>
diff --git a/CEP/Imager/MWControl/test/PredifferTest.h b/CEP/Imager/MWControl/test/PredifferTest.h
index 9c2ab0890dd816982400cac983c6a88b83151515..10fdf4a05dfcba3ca220067350cc5506a44f58a6 100644
--- a/CEP/Imager/MWControl/test/PredifferTest.h
+++ b/CEP/Imager/MWControl/test/PredifferTest.h
@@ -1,8 +1,24 @@
-//#  PredifferTest.h: 
+//# PredifferTest.h: Test class mimicking the PredifferBBS behaviour
 //#
-//#  Copyright (C) 2007
+//# Copyright (C) 2005
+//# ASTRON (Netherlands Foundation for Research in Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
 //#
-//#  $Id$
+//# This program is free software; you can redistribute it and/or modify
+//# it under the terms of the GNU General Public License as published by
+//# the Free Software Foundation; either version 2 of the License, or
+//# (at your option) any later version.
+//#
+//# This program is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License
+//# along with this program; if not, write to the Free Software
+//# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//#
+//# $Id$
 
 #ifndef LOFAR_MWCONTROL_PREDIFFERTEST_H
 #define LOFAR_MWCONTROL_PREDIFFERTEST_H
diff --git a/CEP/Imager/MWControl/test/SolverTest.cc b/CEP/Imager/MWControl/test/SolverTest.cc
index 172c2fa3a27212bbd9d82f6b2da17058968882d9..0c3326143d2339e19966305ac62d3c32fa5bedd0 100644
--- a/CEP/Imager/MWControl/test/SolverTest.cc
+++ b/CEP/Imager/MWControl/test/SolverTest.cc
@@ -1,9 +1,26 @@
-//#  SolverTest.cc: Solver BBSler of distributed VDS processing
+//# SolverTest.cc: Test class mimicking the SolverBBS behaviour
 //#
-//#  Copyright (C) 2007
+//# Copyright (C) 2005
+//# ASTRON (Netherlands Foundation for Research in Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
 //#
-//#  $Id$
+//# This program is free software; you can redistribute it and/or modify
+//# it under the terms of the GNU General Public License as published by
+//# the Free Software Foundation; either version 2 of the License, or
+//# (at your option) any later version.
+//#
+//# This program is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License
+//# along with this program; if not, write to the Free Software
+//# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//#
+//# $Id$
 
+#include <lofar_config.h>
 #include "SolverTest.h"
 #include <MWControl/MWGlobalSpec.h>
 #include <MWCommon/MasterControl.h>
diff --git a/CEP/Imager/MWControl/test/SolverTest.h b/CEP/Imager/MWControl/test/SolverTest.h
index b10103ec224b65829a6b142b025d25cc9eae85ce..e1ce1e963fa3772a28e35b7c478330c923908b22 100644
--- a/CEP/Imager/MWControl/test/SolverTest.h
+++ b/CEP/Imager/MWControl/test/SolverTest.h
@@ -1,8 +1,24 @@
-//#  SolverTest.h: 
+//# SolverTest.h: Test class mimicking the SolverBBS behaviour
 //#
-//#  Copyright (C) 2007
+//# Copyright (C) 2005
+//# ASTRON (Netherlands Foundation for Research in Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
 //#
-//#  $Id$
+//# This program is free software; you can redistribute it and/or modify
+//# it under the terms of the GNU General Public License as published by
+//# the Free Software Foundation; either version 2 of the License, or
+//# (at your option) any later version.
+//#
+//# This program is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License
+//# along with this program; if not, write to the Free Software
+//# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//#
+//# $Id$
 
 #ifndef LOFAR_MWCONTROL_SOLVERTEST_H
 #define LOFAR_MWCONTROL_SOLVERTEST_H
diff --git a/CEP/Imager/MWControl/test/tMWControl.cc b/CEP/Imager/MWControl/test/tMWControl.cc
index 27b62e4d4706aa9f3c6bb29f6f401f0879ec3a39..297351f6627ba24d013cd3fe8749ef9b2ef33900 100644
--- a/CEP/Imager/MWControl/test/tMWControl.cc
+++ b/CEP/Imager/MWControl/test/tMWControl.cc
@@ -1,8 +1,24 @@
-//#  tMWControl.cc: Test program for Master-Worker framework
+//# tMWControl.cc: Test program for Master-Worker framework
 //#
-//#  Copyright (C) 2007
+//# Copyright (C) 2005
+//# ASTRON (Netherlands Foundation for Research in Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
 //#
-//#  $Id$
+//# This program is free software; you can redistribute it and/or modify
+//# it under the terms of the GNU General Public License as published by
+//# the Free Software Foundation; either version 2 of the License, or
+//# (at your option) any later version.
+//#
+//# This program is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License
+//# along with this program; if not, write to the Free Software
+//# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//#
+//# $Id$
 
 #include <lofar_config.h>
 #include "PredifferTest.h"
diff --git a/CEP/Imager/MWControl/test/tMWControl.in b/CEP/Imager/MWControl/test/tMWControl.in
index c87b2aac10142afd36456f8cc106a9688510ca78..1df6ba99b86e0ed2784679642a2761f0776b7643 100644
--- a/CEP/Imager/MWControl/test/tMWControl.in
+++ b/CEP/Imager/MWControl/test/tMWControl.in
@@ -8,8 +8,8 @@ Strategy.Correlation.Selection = ALL        # one of AUTO, CROSS, ALL
 Strategy.Correlation.Type = [ XX, YY ]      # which (cross)correlations to use
 Strategy.WorkDomainSize.Freq = 1e+6         # work domain size: f(Hz) 
 Strategy.WorkDomainSize.Time = 10           # work domain size: t(s)
-Strategy.Integration.Freq = 1;              # integration interval: f(Hz)
-Strategy.Integration.Time = 0.1;            # integration interval: t(s)
+Strategy.Integration.Freq = 1               # integration interval: f(Hz)
+Strategy.Integration.Time = 0.1             # integration interval: t(s)
 
 InputData      = INDATA            # MS input data column 
 ParmDB.Instrument       = test.mep          # instrument parameters (MS table)
@@ -24,8 +24,8 @@ Step.xyz1.Sources       = [ 3C343 ]         # list of sources
 Step.xyz1.ExtraSources  = [ M81 ]           # list of sources outside patch
 Step.xyz1.InstrumentModel = [ Bandpass,   \ # Instrument model
                            DirGain, Phase ]
-Step.xyz1.Integration.Freq = 2;             # integration interval: f(Hz)
-Step.xyz1.Integration.Time = 0.5;           # integration interval: t(s)
+Step.xyz1.Integration.Freq = 2              # integration interval: f(Hz)
+Step.xyz1.Integration.Time = 0.5            # integration interval: t(s)
 Step.xyz1.Correlation.Selection = CROSS     # one of AUTO, CROSS, ALL
 Step.xyz1.Correlation.Type = [ XX, XY,    \ # which (cross) correlations to use
                                YX, YY ]
diff --git a/CEP/Imager/MWControl/test/tMWControl.in_mpi_out3 b/CEP/Imager/MWControl/test/tMWControl.in_mpi_out3
index 4bb018bc705139845f464da6f5e20a29d0989895..b953b03386d832e1f76e478e692ab432e7a814c0 100644
--- a/CEP/Imager/MWControl/test/tMWControl.in_mpi_out3
+++ b/CEP/Imager/MWControl/test/tMWControl.in_mpi_out3
@@ -4,7 +4,275 @@ SolverTest::setInitInfo
 SolverTest::doProcess
   Operation: 2
   StreamId:  0
-  Set work domain: [20 Hz, 300 Hz, 0, 1]
+  Set work domain: [20 Hz, 300 Hz, 48490, 48500]
+SolverTest::doProcess
+  Operation: 3
+  StreamId:  0
+  Solve maxiter 10
+SolverTest::doProcess
+  Operation: 4
+  StreamId:  0
+  ParmInfo 1
+SolverTest::doProcess
+  Operation: 4
+  StreamId:  0
+  ParmInfo 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 0
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 2
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 3
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 4
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 5
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 6
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 7
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 8
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 9
+SolverTest::doProcess
+  Operation: 3
+  StreamId:  0
+  Solve maxiter 10
+SolverTest::doProcess
+  Operation: 4
+  StreamId:  0
+  ParmInfo 1
+SolverTest::doProcess
+  Operation: 4
+  StreamId:  0
+  ParmInfo 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 0
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 2
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 3
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 4
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 5
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 6
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 7
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 8
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 9
+SolverTest::doProcess
+  Operation: 2
+  StreamId:  0
+  Set work domain: [20 Hz, 300 Hz, 48500, 48510]
 SolverTest::doProcess
   Operation: 3
   StreamId:  0
@@ -280,7 +548,199 @@ PredifferTest::setInitInfo
 PredifferTest::doProcess
   Operation: 2
   StreamId:  0
-  Set work domain: [20 Hz, 300 Hz, 0, 1]
+  Set work domain: [20 Hz, 300 Hz, 48490, 48500]
+PredifferTest::doProcess
+  Operation: 3
+  StreamId:  0
+  MWStepTester::visitSolve,  streamId 0
+   Max nr. of iterations:  10
+   Convergence threshold:  1e-07
+   Min fraction converged: 0.95
+   Solvable parameters:    [PHASE:*]
+   Excluded parameters:    []
+   Domain shape:           1000 Hz,  1 s
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 3
+  StreamId:  0
+  MWStepTester::visitCorrect,  streamId 0
+PredifferTest::doProcess
+  Operation: 3
+  StreamId:  0
+  MWStepTester::visitSolve,  streamId 0
+   Max nr. of iterations:  10
+   Convergence threshold:  1e-07
+   Min fraction converged: 0.95
+   Solvable parameters:    [PHASE:*]
+   Excluded parameters:    []
+   Domain shape:           1000 Hz,  1 s
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 3
+  StreamId:  0
+  MWStepTester::visitCorrect,  streamId 0
+PredifferTest::doProcess
+  Operation: 2
+  StreamId:  0
+  Set work domain: [20 Hz, 300 Hz, 48500, 48510]
 PredifferTest::doProcess
   Operation: 3
   StreamId:  0
@@ -480,7 +940,199 @@ PredifferTest::setInitInfo
 PredifferTest::doProcess
   Operation: 2
   StreamId:  0
-  Set work domain: [20 Hz, 300 Hz, 0, 1]
+  Set work domain: [20 Hz, 300 Hz, 48490, 48500]
+PredifferTest::doProcess
+  Operation: 3
+  StreamId:  0
+  MWStepTester::visitSolve,  streamId 0
+   Max nr. of iterations:  10
+   Convergence threshold:  1e-07
+   Min fraction converged: 0.95
+   Solvable parameters:    [PHASE:*]
+   Excluded parameters:    []
+   Domain shape:           1000 Hz,  1 s
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 3
+  StreamId:  0
+  MWStepTester::visitCorrect,  streamId 0
+PredifferTest::doProcess
+  Operation: 3
+  StreamId:  0
+  MWStepTester::visitSolve,  streamId 0
+   Max nr. of iterations:  10
+   Convergence threshold:  1e-07
+   Min fraction converged: 0.95
+   Solvable parameters:    [PHASE:*]
+   Excluded parameters:    []
+   Domain shape:           1000 Hz,  1 s
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 3
+  StreamId:  0
+  MWStepTester::visitCorrect,  streamId 0
+PredifferTest::doProcess
+  Operation: 2
+  StreamId:  0
+  Set work domain: [20 Hz, 300 Hz, 48500, 48510]
 PredifferTest::doProcess
   Operation: 3
   StreamId:  0
diff --git a/CEP/Imager/MWControl/test/tMWControl.in_mpi_out4 b/CEP/Imager/MWControl/test/tMWControl.in_mpi_out4
index 42c4c8bde0eb99a578fa08353acef6d587fef4f4..b3e8ca5d534fd9f4a41dbf373c7dbd679f7c82ae 100644
--- a/CEP/Imager/MWControl/test/tMWControl.in_mpi_out4
+++ b/CEP/Imager/MWControl/test/tMWControl.in_mpi_out4
@@ -5,7 +5,275 @@ SolverTest::setInitInfo
 SolverTest::doProcess
   Operation: 2
   StreamId:  0
-  Set work domain: [20 Hz, 300 Hz, 0, 1]
+  Set work domain: [20 Hz, 300 Hz, 48490, 48500]
+SolverTest::doProcess
+  Operation: 3
+  StreamId:  0
+  Solve maxiter 10
+SolverTest::doProcess
+  Operation: 4
+  StreamId:  0
+  ParmInfo 1
+SolverTest::doProcess
+  Operation: 4
+  StreamId:  0
+  ParmInfo 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 0
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 2
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 3
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 4
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 5
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 6
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 7
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 8
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 9
+SolverTest::doProcess
+  Operation: 3
+  StreamId:  0
+  Solve maxiter 10
+SolverTest::doProcess
+  Operation: 4
+  StreamId:  0
+  ParmInfo 1
+SolverTest::doProcess
+  Operation: 4
+  StreamId:  0
+  ParmInfo 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 0
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 2
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 3
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 4
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 5
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 6
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 7
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 8
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 9
+SolverTest::doProcess
+  Operation: 2
+  StreamId:  0
+  Set work domain: [20 Hz, 300 Hz, 48500, 48510]
 SolverTest::doProcess
   Operation: 3
   StreamId:  0
@@ -281,7 +549,199 @@ PredifferTest::setInitInfo
 PredifferTest::doProcess
   Operation: 2
   StreamId:  0
-  Set work domain: [20 Hz, 300 Hz, 0, 1]
+  Set work domain: [20 Hz, 300 Hz, 48490, 48500]
+PredifferTest::doProcess
+  Operation: 3
+  StreamId:  0
+  MWStepTester::visitSolve,  streamId 0
+   Max nr. of iterations:  10
+   Convergence threshold:  1e-07
+   Min fraction converged: 0.95
+   Solvable parameters:    [PHASE:*]
+   Excluded parameters:    []
+   Domain shape:           1000 Hz,  1 s
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 3
+  StreamId:  0
+  MWStepTester::visitCorrect,  streamId 0
+PredifferTest::doProcess
+  Operation: 3
+  StreamId:  0
+  MWStepTester::visitSolve,  streamId 0
+   Max nr. of iterations:  10
+   Convergence threshold:  1e-07
+   Min fraction converged: 0.95
+   Solvable parameters:    [PHASE:*]
+   Excluded parameters:    []
+   Domain shape:           1000 Hz,  1 s
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 3
+  StreamId:  0
+  MWStepTester::visitCorrect,  streamId 0
+PredifferTest::doProcess
+  Operation: 2
+  StreamId:  0
+  Set work domain: [20 Hz, 300 Hz, 48500, 48510]
 PredifferTest::doProcess
   Operation: 3
   StreamId:  0
@@ -481,7 +941,199 @@ PredifferTest::setInitInfo
 PredifferTest::doProcess
   Operation: 2
   StreamId:  0
-  Set work domain: [20 Hz, 300 Hz, 0, 1]
+  Set work domain: [20 Hz, 300 Hz, 48490, 48500]
+PredifferTest::doProcess
+  Operation: 3
+  StreamId:  0
+  MWStepTester::visitSolve,  streamId 0
+   Max nr. of iterations:  10
+   Convergence threshold:  1e-07
+   Min fraction converged: 0.95
+   Solvable parameters:    [PHASE:*]
+   Excluded parameters:    []
+   Domain shape:           1000 Hz,  1 s
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 3
+  StreamId:  0
+  MWStepTester::visitCorrect,  streamId 0
+PredifferTest::doProcess
+  Operation: 3
+  StreamId:  0
+  MWStepTester::visitSolve,  streamId 0
+   Max nr. of iterations:  10
+   Convergence threshold:  1e-07
+   Min fraction converged: 0.95
+   Solvable parameters:    [PHASE:*]
+   Excluded parameters:    []
+   Domain shape:           1000 Hz,  1 s
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 3
+  StreamId:  0
+  MWStepTester::visitCorrect,  streamId 0
+PredifferTest::doProcess
+  Operation: 2
+  StreamId:  0
+  Set work domain: [20 Hz, 300 Hz, 48500, 48510]
 PredifferTest::doProcess
   Operation: 3
   StreamId:  0
diff --git a/CEP/Imager/MWControl/test/tMWControl.in_ms b/CEP/Imager/MWControl/test/tMWControl.in_ms
index d787d16c9533342565909fe30fe9902a8156c57f..1003c5103e19d8ee1e708abb769f6c96454a1420 100644
--- a/CEP/Imager/MWControl/test/tMWControl.in_ms
+++ b/CEP/Imager/MWControl/test/tMWControl.in_ms
@@ -1,7 +1,7 @@
 Name = /usr/local/xyx
 FileSys = node1:/usr
-StartTime = 0
-EndTime = 1
+StartTime = 0/13:28:10
+EndTime = 0/13:28:30
 StepTime = 0.5
 NChan = [64, 128]
 StartFreqs = [20, 120]
@@ -12,8 +12,8 @@ AntNames = [RT0, RT1, RT2, RT3]
 NParts = 2
 Part0.Name = /usr/local/xyz1.ms
 Part0.FileSysx = node1:/usr
-Part0.StartTime = 0
-Part0.EndTime = 2
+Part0.StartTime = 0/13:28:10
+Part0.EndTime = 0/13:28:30
 Part0.StepTime = 0.5
 Part0.NChan = [64, 128]
 Part0.StartFreqs = [20, 120]
@@ -22,8 +22,8 @@ Part0.Ant1 = [0, 1, 2]
 Part0.Ant2 = [0, 1, 3]
 Part1.Name = /usr/local/xyz2.ms
 Part1.FileSys = node1:/usr
-Part1.StartTime = 0
-Part1.EndTime = 2
+Part1.StartTime = 0/13:28:10
+Part1.EndTime = 0/13:28:30
 Part1.StepTime = 0.5
 Part1.NChan = [64, 128]
 Part1.StartFreqs = [20, 120]
diff --git a/CEP/Imager/MWControl/test/tMWControl.run b/CEP/Imager/MWControl/test/tMWControl.run
index 8bd2ffbd23e818ce3083efb63edc4dd3099108d5..5d73de481b4ece29ab30bd2c32d182f2358c8ac2 100755
--- a/CEP/Imager/MWControl/test/tMWControl.run
+++ b/CEP/Imager/MWControl/test/tMWControl.run
@@ -13,6 +13,11 @@ Node1.NodeFileSys = [node1:/usr]
 Node1.NodeMountPoints = [/user]
 EOF
 
+# Exit if this is a test run.
+if test "$1" != ""; then
+  exit 0
+fi
+
 # First run tMWControl without MPI.
 # It makes no sense to continue if this fails.
 \rm -f tMWControl_tmp.cout*
diff --git a/CEP/Imager/MWControl/test/tMWControl.stdout b/CEP/Imager/MWControl/test/tMWControl.stdout
index 6db3159bac02aae6b80a325cbffe295cdf90b61a..2bfda53dbeb3fcf2aa2340666ec14719a469e2a8 100644
--- a/CEP/Imager/MWControl/test/tMWControl.stdout
+++ b/CEP/Imager/MWControl/test/tMWControl.stdout
@@ -17,15 +17,15 @@ SolverTest::setInitInfo
 PredifferTest::doProcess
   Operation: 2
   StreamId:  0
-  Set work domain: [20 Hz, 300 Hz, 0, 1]
+  Set work domain: [20 Hz, 300 Hz, 48490, 48500]
 PredifferTest::doProcess
   Operation: 2
   StreamId:  0
-  Set work domain: [20 Hz, 300 Hz, 0, 1]
+  Set work domain: [20 Hz, 300 Hz, 48490, 48500]
 SolverTest::doProcess
   Operation: 2
   StreamId:  0
-  Set work domain: [20 Hz, 300 Hz, 0, 1]
+  Set work domain: [20 Hz, 300 Hz, 48490, 48500]
 PredifferTest::doProcess
   Operation: 3
   StreamId:  0
@@ -342,14 +342,14 @@ PredifferTest::doProcess
   Operation: 3
   StreamId:  0
   MWStepTester::visitLocal,  streamId 0
-Baselines.Station1="      [ CS*, CS*,  CS*,  RS1*, RS1*, RS2* ]"
-Baselines.Station2="      [ CS*, RS1*, RS2*, RS1*, RS2*, RS2* ]"
+Baselines.Station1=[ CS*, CS*,  CS*,  RS1*, RS1*, RS2* ]
+Baselines.Station2=[ CS*, RS1*, RS2*, RS1*, RS2*, RS2* ]
 Correlation.Selection=CROSS
-Correlation.Type=[ XX, XY,                               YX, YY ]
+Correlation.Type=[ XX, XY, YX, YY ]
 ExtraSources=[ M81 ]
 InstrumentModel=[ DirGain, Phase ]
-Integration.Freq=2;
-Integration.Time=0.5;
+Integration.Freq=2
+Integration.Time=0.5
 Operation=CORRECT
 OutputData=OUTDATA2
 Sources=[ 3C343 ]
@@ -358,14 +358,14 @@ PredifferTest::doProcess
   Operation: 3
   StreamId:  0
   MWStepTester::visitLocal,  streamId 0
-Baselines.Station1="      [ CS*, CS*,  CS*,  RS1*, RS1*, RS2* ]"
-Baselines.Station2="      [ CS*, RS1*, RS2*, RS1*, RS2*, RS2* ]"
+Baselines.Station1=[ CS*, CS*,  CS*,  RS1*, RS1*, RS2* ]
+Baselines.Station2=[ CS*, RS1*, RS2*, RS1*, RS2*, RS2* ]
 Correlation.Selection=CROSS
-Correlation.Type=[ XX, XY,                               YX, YY ]
+Correlation.Type=[ XX, XY, YX, YY ]
 ExtraSources=[ M81 ]
 InstrumentModel=[ DirGain, Phase ]
-Integration.Freq=2;
-Integration.Time=0.5;
+Integration.Freq=2
+Integration.Time=0.5
 Operation=CORRECT
 OutputData=OUTDATA2
 Sources=[ 3C343 ]
@@ -704,13 +704,3350 @@ Operation=PREDICT
 OutputData=OUTDATA3
 Sources=[ 3C343 ]
 Steps=[ sl1, sl3 ]
+PredifferTest::doProcess
+  Operation: 2
+  StreamId:  0
+  Set work domain: [20 Hz, 300 Hz, 48500, 48510]
+PredifferTest::doProcess
+  Operation: 2
+  StreamId:  0
+  Set work domain: [20 Hz, 300 Hz, 48500, 48510]
+SolverTest::doProcess
+  Operation: 2
+  StreamId:  0
+  Set work domain: [20 Hz, 300 Hz, 48500, 48510]
+PredifferTest::doProcess
+  Operation: 3
+  StreamId:  0
+  MWStepTester::visitGlobal,  streamId 0
+   Max nr. of iterations:  10
+   Convergence threshold:  1e-07
+   Min fraction converged: 0.95
+   Solvable parameters:    [PHASE:*]
+   Excluded parameters:    []
+   Domain shape:           1000 Hz,  1 s
+PredifferTest::doProcess
+  Operation: 3
+  StreamId:  0
+  MWStepTester::visitGlobal,  streamId 0
+   Max nr. of iterations:  10
+   Convergence threshold:  1e-07
+   Min fraction converged: 0.95
+   Solvable parameters:    [PHASE:*]
+   Excluded parameters:    []
+   Domain shape:           1000 Hz,  1 s
+SolverTest::doProcess
+  Operation: 3
+  StreamId:  0
+  Solve maxiter 10
+SolverTest::doProcess
+  Operation: 4
+  StreamId:  0
+  ParmInfo 1
+SolverTest::doProcess
+  Operation: 4
+  StreamId:  0
+  ParmInfo 1
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 0
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 1
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 2
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 3
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 4
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 5
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 6
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 7
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 8
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 9
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 3
+  StreamId:  0
+  MWStepTester::visitLocal,  streamId 0
+Baselines.Station1=[ CS*, CS*,  CS*,  RS1*, RS1*, RS2* ]
+Baselines.Station2=[ CS*, RS1*, RS2*, RS1*, RS2*, RS2* ]
+Correlation.Selection=CROSS
+Correlation.Type=[ XX, XY, YX, YY ]
+ExtraSources=[ M81 ]
+InstrumentModel=[ DirGain, Phase ]
+Integration.Freq=2
+Integration.Time=0.5
+Operation=CORRECT
+OutputData=OUTDATA2
+Sources=[ 3C343 ]
+Steps=[ sl1, sl2 ]
+PredifferTest::doProcess
+  Operation: 3
+  StreamId:  0
+  MWStepTester::visitLocal,  streamId 0
+Baselines.Station1=[ CS*, CS*,  CS*,  RS1*, RS1*, RS2* ]
+Baselines.Station2=[ CS*, RS1*, RS2*, RS1*, RS2*, RS2* ]
+Correlation.Selection=CROSS
+Correlation.Type=[ XX, XY, YX, YY ]
+ExtraSources=[ M81 ]
+InstrumentModel=[ DirGain, Phase ]
+Integration.Freq=2
+Integration.Time=0.5
+Operation=CORRECT
+OutputData=OUTDATA2
+Sources=[ 3C343 ]
+Steps=[ sl1, sl2 ]
+PredifferTest::doProcess
+  Operation: 3
+  StreamId:  0
+  MWStepTester::visitGlobal,  streamId 0
+   Max nr. of iterations:  10
+   Convergence threshold:  1e-07
+   Min fraction converged: 0.95
+   Solvable parameters:    [PHASE:*]
+   Excluded parameters:    []
+   Domain shape:           1000 Hz,  1 s
+PredifferTest::doProcess
+  Operation: 3
+  StreamId:  0
+  MWStepTester::visitGlobal,  streamId 0
+   Max nr. of iterations:  10
+   Convergence threshold:  1e-07
+   Min fraction converged: 0.95
+   Solvable parameters:    [PHASE:*]
+   Excluded parameters:    []
+   Domain shape:           1000 Hz,  1 s
+SolverTest::doProcess
+  Operation: 3
+  StreamId:  0
+  Solve maxiter 10
+SolverTest::doProcess
+  Operation: 4
+  StreamId:  0
+  ParmInfo 1
+SolverTest::doProcess
+  Operation: 4
+  StreamId:  0
+  ParmInfo 1
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 0
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 1
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 2
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 3
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 4
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 5
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 6
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 7
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 8
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 9
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 3
+  StreamId:  0
+  MWStepTester::visitLocal,  streamId 0
+Baselines.Station1=[ CS*, CS*,  RS1* ]
+Baselines.Station2=[ CS*, RS1*, RS1* ]
+InstrumentModel=[ Phase ]
+Operation=PREDICT
+OutputData=OUTDATA3
+Sources=[ 3C343 ]
+Steps=[ sl1, sl3 ]
+PredifferTest::doProcess
+  Operation: 3
+  StreamId:  0
+  MWStepTester::visitLocal,  streamId 0
+Baselines.Station1=[ CS*, CS*,  RS1* ]
+Baselines.Station2=[ CS*, RS1*, RS1* ]
+InstrumentModel=[ Phase ]
+Operation=PREDICT
+OutputData=OUTDATA3
+Sources=[ 3C343 ]
+Steps=[ sl1, sl3 ]
+
+Doing MPI run on 3 nodes ...
+SolverTest::setInitInfo
+SolverTest::doProcess
+  Operation: 2
+  StreamId:  0
+  Set work domain: [20 Hz, 300 Hz, 48490, 48500]
+SolverTest::doProcess
+  Operation: 3
+  StreamId:  0
+  Solve maxiter 10
+SolverTest::doProcess
+  Operation: 4
+  StreamId:  0
+  ParmInfo 1
+SolverTest::doProcess
+  Operation: 4
+  StreamId:  0
+  ParmInfo 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 0
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 2
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 3
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 4
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 5
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 6
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 7
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 8
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 9
+SolverTest::doProcess
+  Operation: 3
+  StreamId:  0
+  Solve maxiter 10
+SolverTest::doProcess
+  Operation: 4
+  StreamId:  0
+  ParmInfo 1
+SolverTest::doProcess
+  Operation: 4
+  StreamId:  0
+  ParmInfo 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 0
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 2
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 3
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 4
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 5
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 6
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 7
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 8
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 9
+SolverTest::doProcess
+  Operation: 2
+  StreamId:  0
+  Set work domain: [20 Hz, 300 Hz, 48500, 48510]
+SolverTest::doProcess
+  Operation: 3
+  StreamId:  0
+  Solve maxiter 10
+SolverTest::doProcess
+  Operation: 4
+  StreamId:  0
+  ParmInfo 1
+SolverTest::doProcess
+  Operation: 4
+  StreamId:  0
+  ParmInfo 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 0
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 2
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 3
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 4
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 5
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 6
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 7
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 8
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 9
+SolverTest::doProcess
+  Operation: 3
+  StreamId:  0
+  Solve maxiter 10
+SolverTest::doProcess
+  Operation: 4
+  StreamId:  0
+  ParmInfo 1
+SolverTest::doProcess
+  Operation: 4
+  StreamId:  0
+  ParmInfo 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 0
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 2
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 3
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 4
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 5
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 6
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 7
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 8
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 9
+prediffer rank 1
+PredifferTest::setInitInfo
+  MS:         /usr/local/xyz1.ms
+  Column:     INDATA
+  SkyParmDB:  test.gsm
+  InstParmDB: test.mep
+  Subband:    0
+  CalcUVW:    0
+PredifferTest::doProcess
+  Operation: 2
+  StreamId:  0
+  Set work domain: [20 Hz, 300 Hz, 48490, 48500]
+PredifferTest::doProcess
+  Operation: 3
+  StreamId:  0
+  MWStepTester::visitSolve,  streamId 0
+   Max nr. of iterations:  10
+   Convergence threshold:  1e-07
+   Min fraction converged: 0.95
+   Solvable parameters:    [PHASE:*]
+   Excluded parameters:    []
+   Domain shape:           1000 Hz,  1 s
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 3
+  StreamId:  0
+  MWStepTester::visitCorrect,  streamId 0
+PredifferTest::doProcess
+  Operation: 3
+  StreamId:  0
+  MWStepTester::visitSolve,  streamId 0
+   Max nr. of iterations:  10
+   Convergence threshold:  1e-07
+   Min fraction converged: 0.95
+   Solvable parameters:    [PHASE:*]
+   Excluded parameters:    []
+   Domain shape:           1000 Hz,  1 s
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 3
+  StreamId:  0
+  MWStepTester::visitCorrect,  streamId 0
+PredifferTest::doProcess
+  Operation: 2
+  StreamId:  0
+  Set work domain: [20 Hz, 300 Hz, 48500, 48510]
+PredifferTest::doProcess
+  Operation: 3
+  StreamId:  0
+  MWStepTester::visitSolve,  streamId 0
+   Max nr. of iterations:  10
+   Convergence threshold:  1e-07
+   Min fraction converged: 0.95
+   Solvable parameters:    [PHASE:*]
+   Excluded parameters:    []
+   Domain shape:           1000 Hz,  1 s
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 3
+  StreamId:  0
+  MWStepTester::visitCorrect,  streamId 0
+PredifferTest::doProcess
+  Operation: 3
+  StreamId:  0
+  MWStepTester::visitSolve,  streamId 0
+   Max nr. of iterations:  10
+   Convergence threshold:  1e-07
+   Min fraction converged: 0.95
+   Solvable parameters:    [PHASE:*]
+   Excluded parameters:    []
+   Domain shape:           1000 Hz,  1 s
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 3
+  StreamId:  0
+  MWStepTester::visitCorrect,  streamId 0
+prediffer rank 2
+PredifferTest::setInitInfo
+  MS:         /usr/local/xyz2.ms
+  Column:     INDATA
+  SkyParmDB:  test.gsm
+  InstParmDB: test.mep
+  Subband:    0
+  CalcUVW:    0
+PredifferTest::doProcess
+  Operation: 2
+  StreamId:  0
+  Set work domain: [20 Hz, 300 Hz, 48490, 48500]
+PredifferTest::doProcess
+  Operation: 3
+  StreamId:  0
+  MWStepTester::visitSolve,  streamId 0
+   Max nr. of iterations:  10
+   Convergence threshold:  1e-07
+   Min fraction converged: 0.95
+   Solvable parameters:    [PHASE:*]
+   Excluded parameters:    []
+   Domain shape:           1000 Hz,  1 s
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 3
+  StreamId:  0
+  MWStepTester::visitCorrect,  streamId 0
+PredifferTest::doProcess
+  Operation: 3
+  StreamId:  0
+  MWStepTester::visitSolve,  streamId 0
+   Max nr. of iterations:  10
+   Convergence threshold:  1e-07
+   Min fraction converged: 0.95
+   Solvable parameters:    [PHASE:*]
+   Excluded parameters:    []
+   Domain shape:           1000 Hz,  1 s
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 3
+  StreamId:  0
+  MWStepTester::visitCorrect,  streamId 0
+PredifferTest::doProcess
+  Operation: 2
+  StreamId:  0
+  Set work domain: [20 Hz, 300 Hz, 48500, 48510]
+PredifferTest::doProcess
+  Operation: 3
+  StreamId:  0
+  MWStepTester::visitSolve,  streamId 0
+   Max nr. of iterations:  10
+   Convergence threshold:  1e-07
+   Min fraction converged: 0.95
+   Solvable parameters:    [PHASE:*]
+   Excluded parameters:    []
+   Domain shape:           1000 Hz,  1 s
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 3
+  StreamId:  0
+  MWStepTester::visitCorrect,  streamId 0
+PredifferTest::doProcess
+  Operation: 3
+  StreamId:  0
+  MWStepTester::visitSolve,  streamId 0
+   Max nr. of iterations:  10
+   Convergence threshold:  1e-07
+   Min fraction converged: 0.95
+   Solvable parameters:    [PHASE:*]
+   Excluded parameters:    []
+   Domain shape:           1000 Hz,  1 s
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 3
+  StreamId:  0
+  MWStepTester::visitCorrect,  streamId 0
+
+Doing MPI run on 4 nodes ...
+solver rank 1
+SolverTest::setInitInfo
+SolverTest::doProcess
+  Operation: 2
+  StreamId:  0
+  Set work domain: [20 Hz, 300 Hz, 48490, 48500]
+SolverTest::doProcess
+  Operation: 3
+  StreamId:  0
+  Solve maxiter 10
+SolverTest::doProcess
+  Operation: 4
+  StreamId:  0
+  ParmInfo 1
+SolverTest::doProcess
+  Operation: 4
+  StreamId:  0
+  ParmInfo 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 0
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 2
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 3
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 4
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 5
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 6
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 7
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 8
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 9
+SolverTest::doProcess
+  Operation: 3
+  StreamId:  0
+  Solve maxiter 10
+SolverTest::doProcess
+  Operation: 4
+  StreamId:  0
+  ParmInfo 1
+SolverTest::doProcess
+  Operation: 4
+  StreamId:  0
+  ParmInfo 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 0
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 2
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 3
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 4
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 5
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 6
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 7
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 8
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 9
+SolverTest::doProcess
+  Operation: 2
+  StreamId:  0
+  Set work domain: [20 Hz, 300 Hz, 48500, 48510]
+SolverTest::doProcess
+  Operation: 3
+  StreamId:  0
+  Solve maxiter 10
+SolverTest::doProcess
+  Operation: 4
+  StreamId:  0
+  ParmInfo 1
+SolverTest::doProcess
+  Operation: 4
+  StreamId:  0
+  ParmInfo 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 0
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 2
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 3
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 4
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 5
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 6
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 7
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 8
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 9
+SolverTest::doProcess
+  Operation: 3
+  StreamId:  0
+  Solve maxiter 10
+SolverTest::doProcess
+  Operation: 4
+  StreamId:  0
+  ParmInfo 1
+SolverTest::doProcess
+  Operation: 4
+  StreamId:  0
+  ParmInfo 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 0
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 2
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 3
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 4
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 5
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 6
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 7
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 8
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 9
+prediffer rank 2
+PredifferTest::setInitInfo
+  MS:         /usr/local/xyz1.ms
+  Column:     INDATA
+  SkyParmDB:  test.gsm
+  InstParmDB: test.mep
+  Subband:    0
+  CalcUVW:    0
+PredifferTest::doProcess
+  Operation: 2
+  StreamId:  0
+  Set work domain: [20 Hz, 300 Hz, 48490, 48500]
+PredifferTest::doProcess
+  Operation: 3
+  StreamId:  0
+  MWStepTester::visitSolve,  streamId 0
+   Max nr. of iterations:  10
+   Convergence threshold:  1e-07
+   Min fraction converged: 0.95
+   Solvable parameters:    [PHASE:*]
+   Excluded parameters:    []
+   Domain shape:           1000 Hz,  1 s
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 3
+  StreamId:  0
+  MWStepTester::visitCorrect,  streamId 0
+PredifferTest::doProcess
+  Operation: 3
+  StreamId:  0
+  MWStepTester::visitSolve,  streamId 0
+   Max nr. of iterations:  10
+   Convergence threshold:  1e-07
+   Min fraction converged: 0.95
+   Solvable parameters:    [PHASE:*]
+   Excluded parameters:    []
+   Domain shape:           1000 Hz,  1 s
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 3
+  StreamId:  0
+  MWStepTester::visitCorrect,  streamId 0
+PredifferTest::doProcess
+  Operation: 2
+  StreamId:  0
+  Set work domain: [20 Hz, 300 Hz, 48500, 48510]
+PredifferTest::doProcess
+  Operation: 3
+  StreamId:  0
+  MWStepTester::visitSolve,  streamId 0
+   Max nr. of iterations:  10
+   Convergence threshold:  1e-07
+   Min fraction converged: 0.95
+   Solvable parameters:    [PHASE:*]
+   Excluded parameters:    []
+   Domain shape:           1000 Hz,  1 s
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 3
+  StreamId:  0
+  MWStepTester::visitCorrect,  streamId 0
+PredifferTest::doProcess
+  Operation: 3
+  StreamId:  0
+  MWStepTester::visitSolve,  streamId 0
+   Max nr. of iterations:  10
+   Convergence threshold:  1e-07
+   Min fraction converged: 0.95
+   Solvable parameters:    [PHASE:*]
+   Excluded parameters:    []
+   Domain shape:           1000 Hz,  1 s
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 3
+  StreamId:  0
+  MWStepTester::visitCorrect,  streamId 0
+prediffer rank 3
+PredifferTest::setInitInfo
+  MS:         /usr/local/xyz2.ms
+  Column:     INDATA
+  SkyParmDB:  test.gsm
+  InstParmDB: test.mep
+  Subband:    0
+  CalcUVW:    0
+PredifferTest::doProcess
+  Operation: 2
+  StreamId:  0
+  Set work domain: [20 Hz, 300 Hz, 48490, 48500]
+PredifferTest::doProcess
+  Operation: 3
+  StreamId:  0
+  MWStepTester::visitSolve,  streamId 0
+   Max nr. of iterations:  10
+   Convergence threshold:  1e-07
+   Min fraction converged: 0.95
+   Solvable parameters:    [PHASE:*]
+   Excluded parameters:    []
+   Domain shape:           1000 Hz,  1 s
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 3
+  StreamId:  0
+  MWStepTester::visitCorrect,  streamId 0
+PredifferTest::doProcess
+  Operation: 3
+  StreamId:  0
+  MWStepTester::visitSolve,  streamId 0
+   Max nr. of iterations:  10
+   Convergence threshold:  1e-07
+   Min fraction converged: 0.95
+   Solvable parameters:    [PHASE:*]
+   Excluded parameters:    []
+   Domain shape:           1000 Hz,  1 s
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 3
+  StreamId:  0
+  MWStepTester::visitCorrect,  streamId 0
+PredifferTest::doProcess
+  Operation: 2
+  StreamId:  0
+  Set work domain: [20 Hz, 300 Hz, 48500, 48510]
+PredifferTest::doProcess
+  Operation: 3
+  StreamId:  0
+  MWStepTester::visitSolve,  streamId 0
+   Max nr. of iterations:  10
+   Convergence threshold:  1e-07
+   Min fraction converged: 0.95
+   Solvable parameters:    [PHASE:*]
+   Excluded parameters:    []
+   Domain shape:           1000 Hz,  1 s
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 3
+  StreamId:  0
+  MWStepTester::visitCorrect,  streamId 0
+PredifferTest::doProcess
+  Operation: 3
+  StreamId:  0
+  MWStepTester::visitSolve,  streamId 0
+   Max nr. of iterations:  10
+   Convergence threshold:  1e-07
+   Min fraction converged: 0.95
+   Solvable parameters:    [PHASE:*]
+   Excluded parameters:    []
+   Domain shape:           1000 Hz,  1 s
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
+  Operation: 3
+  StreamId:  0
+  MWStepTester::visitCorrect,  streamId 0
 
-Doing MPI run on 3 nodes ...
+Doing socket run on 3 nodes ...
 SolverTest::setInitInfo
 SolverTest::doProcess
   Operation: 2
   StreamId:  0
-  Set work domain: [20 Hz, 300 Hz, 0, 1]
+  Set work domain: [20 Hz, 300 Hz, 48490, 48500]
 SolverTest::doProcess
   Operation: 3
   StreamId:  0
@@ -975,209 +4312,277 @@ SolverTest::doProcess
   Operation: 6
   StreamId:  0
   Solve iteration: 9
-prediffer rank 1
-PredifferTest::setInitInfo
-  MS:         /usr/local/xyz1.ms
-  Column:     INDATA
-  SkyParmDB:  test.gsm
-  InstParmDB: test.mep
-  Subband:    0
-  CalcUVW:    0
-PredifferTest::doProcess
+SolverTest::doProcess
   Operation: 2
   StreamId:  0
-  Set work domain: [20 Hz, 300 Hz, 0, 1]
-PredifferTest::doProcess
+  Set work domain: [20 Hz, 300 Hz, 48500, 48510]
+SolverTest::doProcess
   Operation: 3
   StreamId:  0
-  MWStepTester::visitSolve,  streamId 0
-   Max nr. of iterations:  10
-   Convergence threshold:  1e-07
-   Min fraction converged: 0.95
-   Solvable parameters:    [PHASE:*]
-   Excluded parameters:    []
-   Domain shape:           1000 Hz,  1 s
-PredifferTest::doProcess
+  Solve maxiter 10
+SolverTest::doProcess
+  Operation: 4
+  StreamId:  0
+  ParmInfo 1
+SolverTest::doProcess
+  Operation: 4
+  StreamId:  0
+  ParmInfo 1
+SolverTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq
-PredifferTest::doProcess
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
   Operation: 6
   StreamId:  0
-  Solve
-PredifferTest::doProcess
+  Solve iteration: 0
+SolverTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq
-PredifferTest::doProcess
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
   Operation: 6
   StreamId:  0
-  Solve
-PredifferTest::doProcess
+  Solve iteration: 1
+SolverTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq
-PredifferTest::doProcess
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
   Operation: 6
   StreamId:  0
-  Solve
-PredifferTest::doProcess
+  Solve iteration: 2
+SolverTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq
-PredifferTest::doProcess
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
   Operation: 6
   StreamId:  0
-  Solve
-PredifferTest::doProcess
+  Solve iteration: 3
+SolverTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq
-PredifferTest::doProcess
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 4
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 5
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 6
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 7
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 8
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 9
+SolverTest::doProcess
+  Operation: 3
+  StreamId:  0
+  Solve maxiter 10
+SolverTest::doProcess
+  Operation: 4
+  StreamId:  0
+  ParmInfo 1
+SolverTest::doProcess
+  Operation: 4
+  StreamId:  0
+  ParmInfo 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
   Operation: 6
   StreamId:  0
-  Solve
-PredifferTest::doProcess
+  Solve iteration: 0
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq
-PredifferTest::doProcess
+  GetEq 1
+SolverTest::doProcess
   Operation: 6
   StreamId:  0
-  Solve
-PredifferTest::doProcess
+  Solve iteration: 1
+SolverTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq
-PredifferTest::doProcess
-  Operation: 6
-  StreamId:  0
-  Solve
-PredifferTest::doProcess
+  GetEq 1
+SolverTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq
-PredifferTest::doProcess
+  GetEq 1
+SolverTest::doProcess
   Operation: 6
   StreamId:  0
-  Solve
-PredifferTest::doProcess
+  Solve iteration: 2
+SolverTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq
-PredifferTest::doProcess
-  Operation: 6
-  StreamId:  0
-  Solve
-PredifferTest::doProcess
+  GetEq 1
+SolverTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq
-PredifferTest::doProcess
+  GetEq 1
+SolverTest::doProcess
   Operation: 6
   StreamId:  0
-  Solve
-PredifferTest::doProcess
-  Operation: 3
-  StreamId:  0
-  MWStepTester::visitCorrect,  streamId 0
-PredifferTest::doProcess
-  Operation: 3
+  Solve iteration: 3
+SolverTest::doProcess
+  Operation: 5
   StreamId:  0
-  MWStepTester::visitSolve,  streamId 0
-   Max nr. of iterations:  10
-   Convergence threshold:  1e-07
-   Min fraction converged: 0.95
-   Solvable parameters:    [PHASE:*]
-   Excluded parameters:    []
-   Domain shape:           1000 Hz,  1 s
-PredifferTest::doProcess
+  GetEq 1
+SolverTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq
-PredifferTest::doProcess
+  GetEq 1
+SolverTest::doProcess
   Operation: 6
   StreamId:  0
-  Solve
-PredifferTest::doProcess
+  Solve iteration: 4
+SolverTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq
-PredifferTest::doProcess
-  Operation: 6
-  StreamId:  0
-  Solve
-PredifferTest::doProcess
+  GetEq 1
+SolverTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq
-PredifferTest::doProcess
+  GetEq 1
+SolverTest::doProcess
   Operation: 6
   StreamId:  0
-  Solve
-PredifferTest::doProcess
+  Solve iteration: 5
+SolverTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq
-PredifferTest::doProcess
-  Operation: 6
-  StreamId:  0
-  Solve
-PredifferTest::doProcess
+  GetEq 1
+SolverTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq
-PredifferTest::doProcess
+  GetEq 1
+SolverTest::doProcess
   Operation: 6
   StreamId:  0
-  Solve
-PredifferTest::doProcess
+  Solve iteration: 6
+SolverTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq
-PredifferTest::doProcess
-  Operation: 6
-  StreamId:  0
-  Solve
-PredifferTest::doProcess
+  GetEq 1
+SolverTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq
-PredifferTest::doProcess
+  GetEq 1
+SolverTest::doProcess
   Operation: 6
   StreamId:  0
-  Solve
-PredifferTest::doProcess
+  Solve iteration: 7
+SolverTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq
-PredifferTest::doProcess
-  Operation: 6
-  StreamId:  0
-  Solve
-PredifferTest::doProcess
+  GetEq 1
+SolverTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq
-PredifferTest::doProcess
+  GetEq 1
+SolverTest::doProcess
   Operation: 6
   StreamId:  0
-  Solve
-PredifferTest::doProcess
+  Solve iteration: 8
+SolverTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq
-PredifferTest::doProcess
-  Operation: 6
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
   StreamId:  0
-  Solve
-PredifferTest::doProcess
-  Operation: 3
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
   StreamId:  0
-  MWStepTester::visitCorrect,  streamId 0
-prediffer rank 2
+  Solve iteration: 9
+localWorker rank 0
 PredifferTest::setInitInfo
-  MS:         /usr/local/xyz2.ms
+  MS:         /usr/local/xyz1.ms
   Column:     INDATA
   SkyParmDB:  test.gsm
   InstParmDB: test.mep
@@ -1186,11 +4591,11 @@ PredifferTest::setInitInfo
 PredifferTest::doProcess
   Operation: 2
   StreamId:  0
-  Set work domain: [20 Hz, 300 Hz, 0, 1]
+  Set work domain: [20 Hz, 300 Hz, 48490, 48500]
 PredifferTest::doProcess
   Operation: 3
   StreamId:  0
-  MWStepTester::visitSolve,  streamId 0
+  MWStepTester::visitGlobal,  streamId 0
    Max nr. of iterations:  10
    Convergence threshold:  1e-07
    Min fraction converged: 0.95
@@ -1280,11 +4685,23 @@ PredifferTest::doProcess
 PredifferTest::doProcess
   Operation: 3
   StreamId:  0
-  MWStepTester::visitCorrect,  streamId 0
+  MWStepTester::visitLocal,  streamId 0
+Baselines.Station1=[ CS*, CS*,  CS*,  RS1*, RS1*, RS2* ]
+Baselines.Station2=[ CS*, RS1*, RS2*, RS1*, RS2*, RS2* ]
+Correlation.Selection=CROSS
+Correlation.Type=[ XX, XY, YX, YY ]
+ExtraSources=[ M81 ]
+InstrumentModel=[ DirGain, Phase ]
+Integration.Freq=2
+Integration.Time=0.5
+Operation=CORRECT
+OutputData=OUTDATA2
+Sources=[ 3C343 ]
+Steps=[ sl1, sl2 ]
 PredifferTest::doProcess
   Operation: 3
   StreamId:  0
-  MWStepTester::visitSolve,  streamId 0
+  MWStepTester::visitGlobal,  streamId 0
    Max nr. of iterations:  10
    Convergence threshold:  1e-07
    Min fraction converged: 0.95
@@ -1374,282 +4791,228 @@ PredifferTest::doProcess
 PredifferTest::doProcess
   Operation: 3
   StreamId:  0
-  MWStepTester::visitCorrect,  streamId 0
-
-Doing MPI run on 4 nodes ...
-solver rank 1
-SolverTest::setInitInfo
-SolverTest::doProcess
+  MWStepTester::visitLocal,  streamId 0
+Baselines.Station1=[ CS*, CS*,  RS1* ]
+Baselines.Station2=[ CS*, RS1*, RS1* ]
+InstrumentModel=[ Phase ]
+Operation=PREDICT
+OutputData=OUTDATA3
+Sources=[ 3C343 ]
+Steps=[ sl1, sl3 ]
+PredifferTest::doProcess
   Operation: 2
   StreamId:  0
-  Set work domain: [20 Hz, 300 Hz, 0, 1]
-SolverTest::doProcess
+  Set work domain: [20 Hz, 300 Hz, 48500, 48510]
+PredifferTest::doProcess
   Operation: 3
   StreamId:  0
-  Solve maxiter 10
-SolverTest::doProcess
-  Operation: 4
-  StreamId:  0
-  ParmInfo 1
-SolverTest::doProcess
-  Operation: 4
-  StreamId:  0
-  ParmInfo 1
-SolverTest::doProcess
-  Operation: 5
-  StreamId:  0
-  GetEq 1
-SolverTest::doProcess
-  Operation: 5
-  StreamId:  0
-  GetEq 1
-SolverTest::doProcess
-  Operation: 6
-  StreamId:  0
-  Solve iteration: 0
-SolverTest::doProcess
-  Operation: 5
-  StreamId:  0
-  GetEq 1
-SolverTest::doProcess
-  Operation: 5
-  StreamId:  0
-  GetEq 1
-SolverTest::doProcess
-  Operation: 6
-  StreamId:  0
-  Solve iteration: 1
-SolverTest::doProcess
-  Operation: 5
-  StreamId:  0
-  GetEq 1
-SolverTest::doProcess
-  Operation: 5
-  StreamId:  0
-  GetEq 1
-SolverTest::doProcess
-  Operation: 6
-  StreamId:  0
-  Solve iteration: 2
-SolverTest::doProcess
-  Operation: 5
-  StreamId:  0
-  GetEq 1
-SolverTest::doProcess
-  Operation: 5
-  StreamId:  0
-  GetEq 1
-SolverTest::doProcess
-  Operation: 6
-  StreamId:  0
-  Solve iteration: 3
-SolverTest::doProcess
-  Operation: 5
-  StreamId:  0
-  GetEq 1
-SolverTest::doProcess
-  Operation: 5
-  StreamId:  0
-  GetEq 1
-SolverTest::doProcess
-  Operation: 6
-  StreamId:  0
-  Solve iteration: 4
-SolverTest::doProcess
+  MWStepTester::visitGlobal,  streamId 0
+   Max nr. of iterations:  10
+   Convergence threshold:  1e-07
+   Min fraction converged: 0.95
+   Solvable parameters:    [PHASE:*]
+   Excluded parameters:    []
+   Domain shape:           1000 Hz,  1 s
+PredifferTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq 1
-SolverTest::doProcess
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq 1
-SolverTest::doProcess
+  GetEq
+PredifferTest::doProcess
   Operation: 6
   StreamId:  0
-  Solve iteration: 5
-SolverTest::doProcess
+  Solve
+PredifferTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq 1
-SolverTest::doProcess
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq 1
-SolverTest::doProcess
+  GetEq
+PredifferTest::doProcess
   Operation: 6
   StreamId:  0
-  Solve iteration: 6
-SolverTest::doProcess
+  Solve
+PredifferTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq 1
-SolverTest::doProcess
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq 1
-SolverTest::doProcess
+  GetEq
+PredifferTest::doProcess
   Operation: 6
   StreamId:  0
-  Solve iteration: 7
-SolverTest::doProcess
+  Solve
+PredifferTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq 1
-SolverTest::doProcess
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq 1
-SolverTest::doProcess
+  GetEq
+PredifferTest::doProcess
   Operation: 6
   StreamId:  0
-  Solve iteration: 8
-SolverTest::doProcess
+  Solve
+PredifferTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq 1
-SolverTest::doProcess
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq 1
-SolverTest::doProcess
+  GetEq
+PredifferTest::doProcess
   Operation: 6
   StreamId:  0
-  Solve iteration: 9
-SolverTest::doProcess
+  Solve
+PredifferTest::doProcess
   Operation: 3
   StreamId:  0
-  Solve maxiter 10
-SolverTest::doProcess
-  Operation: 4
-  StreamId:  0
-  ParmInfo 1
-SolverTest::doProcess
-  Operation: 4
-  StreamId:  0
-  ParmInfo 1
-SolverTest::doProcess
-  Operation: 5
+  MWStepTester::visitLocal,  streamId 0
+Baselines.Station1=[ CS*, CS*,  CS*,  RS1*, RS1*, RS2* ]
+Baselines.Station2=[ CS*, RS1*, RS2*, RS1*, RS2*, RS2* ]
+Correlation.Selection=CROSS
+Correlation.Type=[ XX, XY, YX, YY ]
+ExtraSources=[ M81 ]
+InstrumentModel=[ DirGain, Phase ]
+Integration.Freq=2
+Integration.Time=0.5
+Operation=CORRECT
+OutputData=OUTDATA2
+Sources=[ 3C343 ]
+Steps=[ sl1, sl2 ]
+PredifferTest::doProcess
+  Operation: 3
   StreamId:  0
-  GetEq 1
-SolverTest::doProcess
+  MWStepTester::visitGlobal,  streamId 0
+   Max nr. of iterations:  10
+   Convergence threshold:  1e-07
+   Min fraction converged: 0.95
+   Solvable parameters:    [PHASE:*]
+   Excluded parameters:    []
+   Domain shape:           1000 Hz,  1 s
+PredifferTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq 1
-SolverTest::doProcess
+  GetEq
+PredifferTest::doProcess
   Operation: 6
   StreamId:  0
-  Solve iteration: 0
-SolverTest::doProcess
-  Operation: 5
-  StreamId:  0
-  GetEq 1
-SolverTest::doProcess
+  Solve
+PredifferTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq 1
-SolverTest::doProcess
+  GetEq
+PredifferTest::doProcess
   Operation: 6
   StreamId:  0
-  Solve iteration: 1
-SolverTest::doProcess
-  Operation: 5
-  StreamId:  0
-  GetEq 1
-SolverTest::doProcess
+  Solve
+PredifferTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq 1
-SolverTest::doProcess
+  GetEq
+PredifferTest::doProcess
   Operation: 6
   StreamId:  0
-  Solve iteration: 2
-SolverTest::doProcess
-  Operation: 5
-  StreamId:  0
-  GetEq 1
-SolverTest::doProcess
+  Solve
+PredifferTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq 1
-SolverTest::doProcess
+  GetEq
+PredifferTest::doProcess
   Operation: 6
   StreamId:  0
-  Solve iteration: 3
-SolverTest::doProcess
-  Operation: 5
-  StreamId:  0
-  GetEq 1
-SolverTest::doProcess
+  Solve
+PredifferTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq 1
-SolverTest::doProcess
+  GetEq
+PredifferTest::doProcess
   Operation: 6
   StreamId:  0
-  Solve iteration: 4
-SolverTest::doProcess
-  Operation: 5
-  StreamId:  0
-  GetEq 1
-SolverTest::doProcess
+  Solve
+PredifferTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq 1
-SolverTest::doProcess
+  GetEq
+PredifferTest::doProcess
   Operation: 6
   StreamId:  0
-  Solve iteration: 5
-SolverTest::doProcess
-  Operation: 5
-  StreamId:  0
-  GetEq 1
-SolverTest::doProcess
+  Solve
+PredifferTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq 1
-SolverTest::doProcess
+  GetEq
+PredifferTest::doProcess
   Operation: 6
   StreamId:  0
-  Solve iteration: 6
-SolverTest::doProcess
-  Operation: 5
-  StreamId:  0
-  GetEq 1
-SolverTest::doProcess
+  Solve
+PredifferTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq 1
-SolverTest::doProcess
+  GetEq
+PredifferTest::doProcess
   Operation: 6
   StreamId:  0
-  Solve iteration: 7
-SolverTest::doProcess
-  Operation: 5
-  StreamId:  0
-  GetEq 1
-SolverTest::doProcess
+  Solve
+PredifferTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq 1
-SolverTest::doProcess
+  GetEq
+PredifferTest::doProcess
   Operation: 6
   StreamId:  0
-  Solve iteration: 8
-SolverTest::doProcess
-  Operation: 5
-  StreamId:  0
-  GetEq 1
-SolverTest::doProcess
+  Solve
+PredifferTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq 1
-SolverTest::doProcess
+  GetEq
+PredifferTest::doProcess
   Operation: 6
   StreamId:  0
-  Solve iteration: 9
-prediffer rank 2
+  Solve
+PredifferTest::doProcess
+  Operation: 3
+  StreamId:  0
+  MWStepTester::visitLocal,  streamId 0
+Baselines.Station1=[ CS*, CS*,  RS1* ]
+Baselines.Station2=[ CS*, RS1*, RS1* ]
+InstrumentModel=[ Phase ]
+Operation=PREDICT
+OutputData=OUTDATA3
+Sources=[ 3C343 ]
+Steps=[ sl1, sl3 ]
+localWorker rank 0
 PredifferTest::setInitInfo
-  MS:         /usr/local/xyz1.ms
+  MS:         /usr/local/xyz2.ms
   Column:     INDATA
   SkyParmDB:  test.gsm
   InstParmDB: test.mep
@@ -1658,11 +5021,11 @@ PredifferTest::setInitInfo
 PredifferTest::doProcess
   Operation: 2
   StreamId:  0
-  Set work domain: [20 Hz, 300 Hz, 0, 1]
+  Set work domain: [20 Hz, 300 Hz, 48490, 48500]
 PredifferTest::doProcess
   Operation: 3
   StreamId:  0
-  MWStepTester::visitSolve,  streamId 0
+  MWStepTester::visitGlobal,  streamId 0
    Max nr. of iterations:  10
    Convergence threshold:  1e-07
    Min fraction converged: 0.95
@@ -1752,11 +5115,23 @@ PredifferTest::doProcess
 PredifferTest::doProcess
   Operation: 3
   StreamId:  0
-  MWStepTester::visitCorrect,  streamId 0
+  MWStepTester::visitLocal,  streamId 0
+Baselines.Station1=[ CS*, CS*,  CS*,  RS1*, RS1*, RS2* ]
+Baselines.Station2=[ CS*, RS1*, RS2*, RS1*, RS2*, RS2* ]
+Correlation.Selection=CROSS
+Correlation.Type=[ XX, XY, YX, YY ]
+ExtraSources=[ M81 ]
+InstrumentModel=[ DirGain, Phase ]
+Integration.Freq=2
+Integration.Time=0.5
+Operation=CORRECT
+OutputData=OUTDATA2
+Sources=[ 3C343 ]
+Steps=[ sl1, sl2 ]
 PredifferTest::doProcess
   Operation: 3
   StreamId:  0
-  MWStepTester::visitSolve,  streamId 0
+  MWStepTester::visitGlobal,  streamId 0
    Max nr. of iterations:  10
    Convergence threshold:  1e-07
    Min fraction converged: 0.95
@@ -1846,23 +5221,22 @@ PredifferTest::doProcess
 PredifferTest::doProcess
   Operation: 3
   StreamId:  0
-  MWStepTester::visitCorrect,  streamId 0
-prediffer rank 3
-PredifferTest::setInitInfo
-  MS:         /usr/local/xyz2.ms
-  Column:     INDATA
-  SkyParmDB:  test.gsm
-  InstParmDB: test.mep
-  Subband:    0
-  CalcUVW:    0
+  MWStepTester::visitLocal,  streamId 0
+Baselines.Station1=[ CS*, CS*,  RS1* ]
+Baselines.Station2=[ CS*, RS1*, RS1* ]
+InstrumentModel=[ Phase ]
+Operation=PREDICT
+OutputData=OUTDATA3
+Sources=[ 3C343 ]
+Steps=[ sl1, sl3 ]
 PredifferTest::doProcess
   Operation: 2
   StreamId:  0
-  Set work domain: [20 Hz, 300 Hz, 0, 1]
+  Set work domain: [20 Hz, 300 Hz, 48500, 48510]
 PredifferTest::doProcess
   Operation: 3
   StreamId:  0
-  MWStepTester::visitSolve,  streamId 0
+  MWStepTester::visitGlobal,  streamId 0
    Max nr. of iterations:  10
    Convergence threshold:  1e-07
    Min fraction converged: 0.95
@@ -1952,11 +5326,23 @@ PredifferTest::doProcess
 PredifferTest::doProcess
   Operation: 3
   StreamId:  0
-  MWStepTester::visitCorrect,  streamId 0
+  MWStepTester::visitLocal,  streamId 0
+Baselines.Station1=[ CS*, CS*,  CS*,  RS1*, RS1*, RS2* ]
+Baselines.Station2=[ CS*, RS1*, RS2*, RS1*, RS2*, RS2* ]
+Correlation.Selection=CROSS
+Correlation.Type=[ XX, XY, YX, YY ]
+ExtraSources=[ M81 ]
+InstrumentModel=[ DirGain, Phase ]
+Integration.Freq=2
+Integration.Time=0.5
+Operation=CORRECT
+OutputData=OUTDATA2
+Sources=[ 3C343 ]
+Steps=[ sl1, sl2 ]
 PredifferTest::doProcess
   Operation: 3
   StreamId:  0
-  MWStepTester::visitSolve,  streamId 0
+  MWStepTester::visitGlobal,  streamId 0
    Max nr. of iterations:  10
    Convergence threshold:  1e-07
    Min fraction converged: 0.95
@@ -2046,14 +5432,22 @@ PredifferTest::doProcess
 PredifferTest::doProcess
   Operation: 3
   StreamId:  0
-  MWStepTester::visitCorrect,  streamId 0
+  MWStepTester::visitLocal,  streamId 0
+Baselines.Station1=[ CS*, CS*,  RS1* ]
+Baselines.Station2=[ CS*, RS1*, RS1* ]
+InstrumentModel=[ Phase ]
+Operation=PREDICT
+OutputData=OUTDATA3
+Sources=[ 3C343 ]
+Steps=[ sl1, sl3 ]
 
-Doing socket run on 3 nodes ...
+Doing socket run on 4 nodes ...
+globalWorker rank 0
 SolverTest::setInitInfo
 SolverTest::doProcess
   Operation: 2
   StreamId:  0
-  Set work domain: [20 Hz, 300 Hz, 0, 1]
+  Set work domain: [20 Hz, 300 Hz, 48490, 48500]
 SolverTest::doProcess
   Operation: 3
   StreamId:  0
@@ -2318,228 +5712,277 @@ SolverTest::doProcess
   Operation: 6
   StreamId:  0
   Solve iteration: 9
-localWorker rank 0
-PredifferTest::setInitInfo
-  MS:         /usr/local/xyz1.ms
-  Column:     INDATA
-  SkyParmDB:  test.gsm
-  InstParmDB: test.mep
-  Subband:    0
-  CalcUVW:    0
-PredifferTest::doProcess
+SolverTest::doProcess
   Operation: 2
   StreamId:  0
-  Set work domain: [20 Hz, 300 Hz, 0, 1]
-PredifferTest::doProcess
+  Set work domain: [20 Hz, 300 Hz, 48500, 48510]
+SolverTest::doProcess
   Operation: 3
   StreamId:  0
-  MWStepTester::visitGlobal,  streamId 0
-   Max nr. of iterations:  10
-   Convergence threshold:  1e-07
-   Min fraction converged: 0.95
-   Solvable parameters:    [PHASE:*]
-   Excluded parameters:    []
-   Domain shape:           1000 Hz,  1 s
-PredifferTest::doProcess
+  Solve maxiter 10
+SolverTest::doProcess
+  Operation: 4
+  StreamId:  0
+  ParmInfo 1
+SolverTest::doProcess
+  Operation: 4
+  StreamId:  0
+  ParmInfo 1
+SolverTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq
-PredifferTest::doProcess
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
   Operation: 6
   StreamId:  0
-  Solve
-PredifferTest::doProcess
+  Solve iteration: 0
+SolverTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq
-PredifferTest::doProcess
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
   Operation: 6
   StreamId:  0
-  Solve
-PredifferTest::doProcess
+  Solve iteration: 1
+SolverTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq
-PredifferTest::doProcess
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
   Operation: 6
   StreamId:  0
-  Solve
-PredifferTest::doProcess
+  Solve iteration: 2
+SolverTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq
-PredifferTest::doProcess
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
   Operation: 6
   StreamId:  0
-  Solve
-PredifferTest::doProcess
+  Solve iteration: 3
+SolverTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq
-PredifferTest::doProcess
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
   Operation: 6
   StreamId:  0
-  Solve
-PredifferTest::doProcess
+  Solve iteration: 4
+SolverTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq
-PredifferTest::doProcess
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
   Operation: 6
   StreamId:  0
-  Solve
-PredifferTest::doProcess
+  Solve iteration: 5
+SolverTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq
-PredifferTest::doProcess
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
   Operation: 6
   StreamId:  0
-  Solve
-PredifferTest::doProcess
+  Solve iteration: 6
+SolverTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq
-PredifferTest::doProcess
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
   Operation: 6
   StreamId:  0
-  Solve
-PredifferTest::doProcess
+  Solve iteration: 7
+SolverTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq
-PredifferTest::doProcess
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
   Operation: 6
   StreamId:  0
-  Solve
-PredifferTest::doProcess
+  Solve iteration: 8
+SolverTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq
-PredifferTest::doProcess
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
   Operation: 6
   StreamId:  0
-  Solve
-PredifferTest::doProcess
+  Solve iteration: 9
+SolverTest::doProcess
   Operation: 3
   StreamId:  0
-  MWStepTester::visitLocal,  streamId 0
-Baselines.Station1="      [ CS*, CS*,  CS*,  RS1*, RS1*, RS2* ]"
-Baselines.Station2="      [ CS*, RS1*, RS2*, RS1*, RS2*, RS2* ]"
-Correlation.Selection=CROSS
-Correlation.Type=[ XX, XY,                               YX, YY ]
-ExtraSources=[ M81 ]
-InstrumentModel=[ DirGain, Phase ]
-Integration.Freq=2;
-Integration.Time=0.5;
-Operation=CORRECT
-OutputData=OUTDATA2
-Sources=[ 3C343 ]
-Steps=[ sl1, sl2 ]
-PredifferTest::doProcess
-  Operation: 3
+  Solve maxiter 10
+SolverTest::doProcess
+  Operation: 4
   StreamId:  0
-  MWStepTester::visitGlobal,  streamId 0
-   Max nr. of iterations:  10
-   Convergence threshold:  1e-07
-   Min fraction converged: 0.95
-   Solvable parameters:    [PHASE:*]
-   Excluded parameters:    []
-   Domain shape:           1000 Hz,  1 s
-PredifferTest::doProcess
+  ParmInfo 1
+SolverTest::doProcess
+  Operation: 4
+  StreamId:  0
+  ParmInfo 1
+SolverTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq
-PredifferTest::doProcess
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
   Operation: 6
   StreamId:  0
-  Solve
-PredifferTest::doProcess
+  Solve iteration: 0
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve iteration: 2
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq
-PredifferTest::doProcess
+  GetEq 1
+SolverTest::doProcess
   Operation: 6
   StreamId:  0
-  Solve
-PredifferTest::doProcess
+  Solve iteration: 3
+SolverTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq
-PredifferTest::doProcess
-  Operation: 6
-  StreamId:  0
-  Solve
-PredifferTest::doProcess
+  GetEq 1
+SolverTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq
-PredifferTest::doProcess
+  GetEq 1
+SolverTest::doProcess
   Operation: 6
   StreamId:  0
-  Solve
-PredifferTest::doProcess
+  Solve iteration: 4
+SolverTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq
-PredifferTest::doProcess
-  Operation: 6
-  StreamId:  0
-  Solve
-PredifferTest::doProcess
+  GetEq 1
+SolverTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq
-PredifferTest::doProcess
+  GetEq 1
+SolverTest::doProcess
   Operation: 6
   StreamId:  0
-  Solve
-PredifferTest::doProcess
+  Solve iteration: 5
+SolverTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq
-PredifferTest::doProcess
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
   Operation: 6
   StreamId:  0
-  Solve
-PredifferTest::doProcess
+  Solve iteration: 6
+SolverTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq
-PredifferTest::doProcess
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
   Operation: 6
   StreamId:  0
-  Solve
-PredifferTest::doProcess
+  Solve iteration: 7
+SolverTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq
-PredifferTest::doProcess
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
+  StreamId:  0
+  GetEq 1
+SolverTest::doProcess
   Operation: 6
   StreamId:  0
-  Solve
-PredifferTest::doProcess
+  Solve iteration: 8
+SolverTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq
-PredifferTest::doProcess
-  Operation: 6
+  GetEq 1
+SolverTest::doProcess
+  Operation: 5
   StreamId:  0
-  Solve
-PredifferTest::doProcess
-  Operation: 3
+  GetEq 1
+SolverTest::doProcess
+  Operation: 6
   StreamId:  0
-  MWStepTester::visitLocal,  streamId 0
-Baselines.Station1=[ CS*, CS*,  RS1* ]
-Baselines.Station2=[ CS*, RS1*, RS1* ]
-InstrumentModel=[ Phase ]
-Operation=PREDICT
-OutputData=OUTDATA3
-Sources=[ 3C343 ]
-Steps=[ sl1, sl3 ]
+  Solve iteration: 9
 localWorker rank 0
 PredifferTest::setInitInfo
-  MS:         /usr/local/xyz2.ms
+  MS:         /usr/local/xyz1.ms
   Column:     INDATA
   SkyParmDB:  test.gsm
   InstParmDB: test.mep
@@ -2548,7 +5991,7 @@ PredifferTest::setInitInfo
 PredifferTest::doProcess
   Operation: 2
   StreamId:  0
-  Set work domain: [20 Hz, 300 Hz, 0, 1]
+  Set work domain: [20 Hz, 300 Hz, 48490, 48500]
 PredifferTest::doProcess
   Operation: 3
   StreamId:  0
@@ -2643,14 +6086,14 @@ PredifferTest::doProcess
   Operation: 3
   StreamId:  0
   MWStepTester::visitLocal,  streamId 0
-Baselines.Station1="      [ CS*, CS*,  CS*,  RS1*, RS1*, RS2* ]"
-Baselines.Station2="      [ CS*, RS1*, RS2*, RS1*, RS2*, RS2* ]"
+Baselines.Station1=[ CS*, CS*,  CS*,  RS1*, RS1*, RS2* ]
+Baselines.Station2=[ CS*, RS1*, RS2*, RS1*, RS2*, RS2* ]
 Correlation.Selection=CROSS
-Correlation.Type=[ XX, XY,                               YX, YY ]
+Correlation.Type=[ XX, XY, YX, YY ]
 ExtraSources=[ M81 ]
 InstrumentModel=[ DirGain, Phase ]
-Integration.Freq=2;
-Integration.Time=0.5;
+Integration.Freq=2
+Integration.Time=0.5
 Operation=CORRECT
 OutputData=OUTDATA2
 Sources=[ 3C343 ]
@@ -2720,317 +6163,256 @@ PredifferTest::doProcess
 PredifferTest::doProcess
   Operation: 6
   StreamId:  0
-  Solve
-PredifferTest::doProcess
-  Operation: 5
-  StreamId:  0
-  GetEq
-PredifferTest::doProcess
-  Operation: 6
-  StreamId:  0
-  Solve
-PredifferTest::doProcess
-  Operation: 5
-  StreamId:  0
-  GetEq
-PredifferTest::doProcess
-  Operation: 6
-  StreamId:  0
-  Solve
-PredifferTest::doProcess
-  Operation: 5
-  StreamId:  0
-  GetEq
-PredifferTest::doProcess
-  Operation: 6
-  StreamId:  0
-  Solve
-PredifferTest::doProcess
-  Operation: 3
-  StreamId:  0
-  MWStepTester::visitLocal,  streamId 0
-Baselines.Station1=[ CS*, CS*,  RS1* ]
-Baselines.Station2=[ CS*, RS1*, RS1* ]
-InstrumentModel=[ Phase ]
-Operation=PREDICT
-OutputData=OUTDATA3
-Sources=[ 3C343 ]
-Steps=[ sl1, sl3 ]
-
-Doing socket run on 4 nodes ...
-globalWorker rank 0
-SolverTest::setInitInfo
-SolverTest::doProcess
-  Operation: 2
-  StreamId:  0
-  Set work domain: [20 Hz, 300 Hz, 0, 1]
-SolverTest::doProcess
-  Operation: 3
-  StreamId:  0
-  Solve maxiter 10
-SolverTest::doProcess
-  Operation: 4
-  StreamId:  0
-  ParmInfo 1
-SolverTest::doProcess
-  Operation: 4
-  StreamId:  0
-  ParmInfo 1
-SolverTest::doProcess
-  Operation: 5
-  StreamId:  0
-  GetEq 1
-SolverTest::doProcess
-  Operation: 5
-  StreamId:  0
-  GetEq 1
-SolverTest::doProcess
-  Operation: 6
-  StreamId:  0
-  Solve iteration: 0
-SolverTest::doProcess
-  Operation: 5
-  StreamId:  0
-  GetEq 1
-SolverTest::doProcess
-  Operation: 5
-  StreamId:  0
-  GetEq 1
-SolverTest::doProcess
-  Operation: 6
-  StreamId:  0
-  Solve iteration: 1
-SolverTest::doProcess
-  Operation: 5
-  StreamId:  0
-  GetEq 1
-SolverTest::doProcess
-  Operation: 5
-  StreamId:  0
-  GetEq 1
-SolverTest::doProcess
-  Operation: 6
-  StreamId:  0
-  Solve iteration: 2
-SolverTest::doProcess
-  Operation: 5
-  StreamId:  0
-  GetEq 1
-SolverTest::doProcess
-  Operation: 5
-  StreamId:  0
-  GetEq 1
-SolverTest::doProcess
-  Operation: 6
-  StreamId:  0
-  Solve iteration: 3
-SolverTest::doProcess
-  Operation: 5
-  StreamId:  0
-  GetEq 1
-SolverTest::doProcess
-  Operation: 5
-  StreamId:  0
-  GetEq 1
-SolverTest::doProcess
-  Operation: 6
-  StreamId:  0
-  Solve iteration: 4
-SolverTest::doProcess
-  Operation: 5
-  StreamId:  0
-  GetEq 1
-SolverTest::doProcess
-  Operation: 5
-  StreamId:  0
-  GetEq 1
-SolverTest::doProcess
-  Operation: 6
-  StreamId:  0
-  Solve iteration: 5
-SolverTest::doProcess
-  Operation: 5
-  StreamId:  0
-  GetEq 1
-SolverTest::doProcess
-  Operation: 5
-  StreamId:  0
-  GetEq 1
-SolverTest::doProcess
-  Operation: 6
-  StreamId:  0
-  Solve iteration: 6
-SolverTest::doProcess
-  Operation: 5
-  StreamId:  0
-  GetEq 1
-SolverTest::doProcess
-  Operation: 5
-  StreamId:  0
-  GetEq 1
-SolverTest::doProcess
-  Operation: 6
-  StreamId:  0
-  Solve iteration: 7
-SolverTest::doProcess
-  Operation: 5
-  StreamId:  0
-  GetEq 1
-SolverTest::doProcess
+  Solve
+PredifferTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq 1
-SolverTest::doProcess
+  GetEq
+PredifferTest::doProcess
   Operation: 6
   StreamId:  0
-  Solve iteration: 8
-SolverTest::doProcess
+  Solve
+PredifferTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq 1
-SolverTest::doProcess
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq 1
-SolverTest::doProcess
+  GetEq
+PredifferTest::doProcess
   Operation: 6
   StreamId:  0
-  Solve iteration: 9
-SolverTest::doProcess
+  Solve
+PredifferTest::doProcess
   Operation: 3
   StreamId:  0
-  Solve maxiter 10
-SolverTest::doProcess
-  Operation: 4
+  MWStepTester::visitLocal,  streamId 0
+Baselines.Station1=[ CS*, CS*,  RS1* ]
+Baselines.Station2=[ CS*, RS1*, RS1* ]
+InstrumentModel=[ Phase ]
+Operation=PREDICT
+OutputData=OUTDATA3
+Sources=[ 3C343 ]
+Steps=[ sl1, sl3 ]
+PredifferTest::doProcess
+  Operation: 2
   StreamId:  0
-  ParmInfo 1
-SolverTest::doProcess
-  Operation: 4
+  Set work domain: [20 Hz, 300 Hz, 48500, 48510]
+PredifferTest::doProcess
+  Operation: 3
   StreamId:  0
-  ParmInfo 1
-SolverTest::doProcess
+  MWStepTester::visitGlobal,  streamId 0
+   Max nr. of iterations:  10
+   Convergence threshold:  1e-07
+   Min fraction converged: 0.95
+   Solvable parameters:    [PHASE:*]
+   Excluded parameters:    []
+   Domain shape:           1000 Hz,  1 s
+PredifferTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq 1
-SolverTest::doProcess
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq 1
-SolverTest::doProcess
+  GetEq
+PredifferTest::doProcess
   Operation: 6
   StreamId:  0
-  Solve iteration: 0
-SolverTest::doProcess
+  Solve
+PredifferTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq 1
-SolverTest::doProcess
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq 1
-SolverTest::doProcess
+  GetEq
+PredifferTest::doProcess
   Operation: 6
   StreamId:  0
-  Solve iteration: 1
-SolverTest::doProcess
+  Solve
+PredifferTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq 1
-SolverTest::doProcess
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq 1
-SolverTest::doProcess
+  GetEq
+PredifferTest::doProcess
   Operation: 6
   StreamId:  0
-  Solve iteration: 2
-SolverTest::doProcess
+  Solve
+PredifferTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq 1
-SolverTest::doProcess
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq 1
-SolverTest::doProcess
+  GetEq
+PredifferTest::doProcess
   Operation: 6
   StreamId:  0
-  Solve iteration: 3
-SolverTest::doProcess
+  Solve
+PredifferTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq 1
-SolverTest::doProcess
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq 1
-SolverTest::doProcess
+  GetEq
+PredifferTest::doProcess
   Operation: 6
   StreamId:  0
-  Solve iteration: 4
-SolverTest::doProcess
+  Solve
+PredifferTest::doProcess
+  Operation: 3
+  StreamId:  0
+  MWStepTester::visitLocal,  streamId 0
+Baselines.Station1=[ CS*, CS*,  CS*,  RS1*, RS1*, RS2* ]
+Baselines.Station2=[ CS*, RS1*, RS2*, RS1*, RS2*, RS2* ]
+Correlation.Selection=CROSS
+Correlation.Type=[ XX, XY, YX, YY ]
+ExtraSources=[ M81 ]
+InstrumentModel=[ DirGain, Phase ]
+Integration.Freq=2
+Integration.Time=0.5
+Operation=CORRECT
+OutputData=OUTDATA2
+Sources=[ 3C343 ]
+Steps=[ sl1, sl2 ]
+PredifferTest::doProcess
+  Operation: 3
+  StreamId:  0
+  MWStepTester::visitGlobal,  streamId 0
+   Max nr. of iterations:  10
+   Convergence threshold:  1e-07
+   Min fraction converged: 0.95
+   Solvable parameters:    [PHASE:*]
+   Excluded parameters:    []
+   Domain shape:           1000 Hz,  1 s
+PredifferTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq 1
-SolverTest::doProcess
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq 1
-SolverTest::doProcess
+  GetEq
+PredifferTest::doProcess
   Operation: 6
   StreamId:  0
-  Solve iteration: 5
-SolverTest::doProcess
+  Solve
+PredifferTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq 1
-SolverTest::doProcess
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq 1
-SolverTest::doProcess
+  GetEq
+PredifferTest::doProcess
   Operation: 6
   StreamId:  0
-  Solve iteration: 6
-SolverTest::doProcess
+  Solve
+PredifferTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq 1
-SolverTest::doProcess
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq 1
-SolverTest::doProcess
+  GetEq
+PredifferTest::doProcess
   Operation: 6
   StreamId:  0
-  Solve iteration: 7
-SolverTest::doProcess
+  Solve
+PredifferTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq 1
-SolverTest::doProcess
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq 1
-SolverTest::doProcess
+  GetEq
+PredifferTest::doProcess
   Operation: 6
   StreamId:  0
-  Solve iteration: 8
-SolverTest::doProcess
+  Solve
+PredifferTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq 1
-SolverTest::doProcess
+  GetEq
+PredifferTest::doProcess
+  Operation: 6
+  StreamId:  0
+  Solve
+PredifferTest::doProcess
   Operation: 5
   StreamId:  0
-  GetEq 1
-SolverTest::doProcess
+  GetEq
+PredifferTest::doProcess
   Operation: 6
   StreamId:  0
-  Solve iteration: 9
+  Solve
+PredifferTest::doProcess
+  Operation: 3
+  StreamId:  0
+  MWStepTester::visitLocal,  streamId 0
+Baselines.Station1=[ CS*, CS*,  RS1* ]
+Baselines.Station2=[ CS*, RS1*, RS1* ]
+InstrumentModel=[ Phase ]
+Operation=PREDICT
+OutputData=OUTDATA3
+Sources=[ 3C343 ]
+Steps=[ sl1, sl3 ]
 localWorker rank 0
 PredifferTest::setInitInfo
-  MS:         /usr/local/xyz1.ms
+  MS:         /usr/local/xyz2.ms
   Column:     INDATA
   SkyParmDB:  test.gsm
   InstParmDB: test.mep
@@ -3039,7 +6421,7 @@ PredifferTest::setInitInfo
 PredifferTest::doProcess
   Operation: 2
   StreamId:  0
-  Set work domain: [20 Hz, 300 Hz, 0, 1]
+  Set work domain: [20 Hz, 300 Hz, 48490, 48500]
 PredifferTest::doProcess
   Operation: 3
   StreamId:  0
@@ -3134,14 +6516,14 @@ PredifferTest::doProcess
   Operation: 3
   StreamId:  0
   MWStepTester::visitLocal,  streamId 0
-Baselines.Station1="      [ CS*, CS*,  CS*,  RS1*, RS1*, RS2* ]"
-Baselines.Station2="      [ CS*, RS1*, RS2*, RS1*, RS2*, RS2* ]"
+Baselines.Station1=[ CS*, CS*,  CS*,  RS1*, RS1*, RS2* ]
+Baselines.Station2=[ CS*, RS1*, RS2*, RS1*, RS2*, RS2* ]
 Correlation.Selection=CROSS
-Correlation.Type=[ XX, XY,                               YX, YY ]
+Correlation.Type=[ XX, XY, YX, YY ]
 ExtraSources=[ M81 ]
 InstrumentModel=[ DirGain, Phase ]
-Integration.Freq=2;
-Integration.Time=0.5;
+Integration.Freq=2
+Integration.Time=0.5
 Operation=CORRECT
 OutputData=OUTDATA2
 Sources=[ 3C343 ]
@@ -3247,18 +6629,10 @@ Operation=PREDICT
 OutputData=OUTDATA3
 Sources=[ 3C343 ]
 Steps=[ sl1, sl3 ]
-localWorker rank 0
-PredifferTest::setInitInfo
-  MS:         /usr/local/xyz2.ms
-  Column:     INDATA
-  SkyParmDB:  test.gsm
-  InstParmDB: test.mep
-  Subband:    0
-  CalcUVW:    0
 PredifferTest::doProcess
   Operation: 2
   StreamId:  0
-  Set work domain: [20 Hz, 300 Hz, 0, 1]
+  Set work domain: [20 Hz, 300 Hz, 48500, 48510]
 PredifferTest::doProcess
   Operation: 3
   StreamId:  0
@@ -3353,14 +6727,14 @@ PredifferTest::doProcess
   Operation: 3
   StreamId:  0
   MWStepTester::visitLocal,  streamId 0
-Baselines.Station1="      [ CS*, CS*,  CS*,  RS1*, RS1*, RS2* ]"
-Baselines.Station2="      [ CS*, RS1*, RS2*, RS1*, RS2*, RS2* ]"
+Baselines.Station1=[ CS*, CS*,  CS*,  RS1*, RS1*, RS2* ]
+Baselines.Station2=[ CS*, RS1*, RS2*, RS1*, RS2*, RS2* ]
 Correlation.Selection=CROSS
-Correlation.Type=[ XX, XY,                               YX, YY ]
+Correlation.Type=[ XX, XY, YX, YY ]
 ExtraSources=[ M81 ]
 InstrumentModel=[ DirGain, Phase ]
-Integration.Freq=2;
-Integration.Time=0.5;
+Integration.Freq=2
+Integration.Time=0.5
 Operation=CORRECT
 OutputData=OUTDATA2
 Sources=[ 3C343 ]
diff --git a/CEP/Imager/MWControl/test/tMWSpec.cc b/CEP/Imager/MWControl/test/tMWSpec.cc
index 5991601a11f45887d2ffc7016a91bc49fe2c36f8..0a226930c31d41ad29cd7826fe4620f6bb613ffd 100644
--- a/CEP/Imager/MWControl/test/tMWSpec.cc
+++ b/CEP/Imager/MWControl/test/tMWSpec.cc
@@ -1,24 +1,24 @@
-//#  tMWSpec.cc: test program for the MWSpec class
+//# tMWSpec.cc: test program for the MWSpec class
 //#
-//#  Copyright (C) 2007
-//#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# Copyright (C) 2005
+//# ASTRON (Netherlands Foundation for Research in Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
 //#
-//#  This program is free software; you can redistribute it and/or modify
-//#  it under the terms of the GNU General Public License as published by
-//#  the Free Software Foundation; either version 2 of the License, or
-//#  (at your option) any later version.
+//# This program is free software; you can redistribute it and/or modify
+//# it under the terms of the GNU General Public License as published by
+//# the Free Software Foundation; either version 2 of the License, or
+//# (at your option) any later version.
 //#
-//#  This program is distributed in the hope that it will be useful,
-//#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//#  GNU General Public License for more details.
+//# This program is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//# GNU General Public License for more details.
 //#
-//#  You should have received a copy of the GNU General Public License
-//#  along with this program; if not, write to the Free Software
-//#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//# You should have received a copy of the GNU General Public License
+//# along with this program; if not, write to the Free Software
+//# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 //#
-//#  $Id$
+//# $Id$
 
 #include <lofar_config.h>
 #include <MWControl/MWMultiSpec.h>
diff --git a/CEP/Imager/MWControl/test/tMWSpec.stdout b/CEP/Imager/MWControl/test/tMWSpec.stdout
index d5b98dcef6accaaf684c8a7035a395e962fc0d4e..3cecfd408a23392ebbdb070f6a5486a8af296aed 100644
--- a/CEP/Imager/MWControl/test/tMWSpec.stdout
+++ b/CEP/Imager/MWControl/test/tMWSpec.stdout
@@ -2,12 +2,12 @@ MWMultiSpec specification:
  Full name: 
 . MWMultiSpec specification: xyz1
 .  Full name: xyz1
-Baselines.Station1="      [ CS*, CS*,  CS*,  RS1*, RS1*, RS2* ]"
-Baselines.Station2="      [ CS*, RS1*, RS2*, RS1*, RS2*, RS2* ]"
+Baselines.Station1=[ CS*, CS*,  CS*,  RS1*, RS1*, RS2* ]
+Baselines.Station2=[ CS*, RS1*, RS2*, RS1*, RS2*, RS2* ]
 Correlation.Selection=CROSS
-Correlation.Type=[ XX, XY,                               YX, YY ]
+Correlation.Type=[ XX, XY, YX, YY ]
 ExtraSources=[ M81 ]
-InstrumentModel=[ Bandpass,                           DirGain, Phase ]
+InstrumentModel=[ Bandpass, DirGain, Phase ]
 Integration.Freq=2;
 Integration.Time=0.5;
 Sources=[ 3C343 ]
@@ -17,7 +17,7 @@ Steps=[ sl1, sl2 ]
 Baselines.Station1=[ CS*,  RS1* ]
 Baselines.Station2=[ RS1*, RS2* ]
 Correlation.Selection=CROSS
-Correlation.Type=[ XX, XY,                               YX, YY ]
+Correlation.Type=[ XX, XY, YX, YY ]
 ExtraSources=[ M81 ]
 InstrumentModel=[ Bandpass, Phase ]
 Integration.Freq=2;
@@ -35,10 +35,10 @@ Sources=[ 3C343 ]
 Steps=[ sl1, sl2 ]
 . . MWLocalSpec specification: sl2
 . .  Full name: xyz1.sl2
-Baselines.Station1="      [ CS*, CS*,  CS*,  RS1*, RS1*, RS2* ]"
-Baselines.Station2="      [ CS*, RS1*, RS2*, RS1*, RS2*, RS2* ]"
+Baselines.Station1=[ CS*, CS*,  CS*,  RS1*, RS1*, RS2* ]
+Baselines.Station2=[ CS*, RS1*, RS2*, RS1*, RS2*, RS2* ]
 Correlation.Selection=CROSS
-Correlation.Type=[ XX, XY,                               YX, YY ]
+Correlation.Type=[ XX, XY, YX, YY ]
 ExtraSources=[ M81 ]
 InstrumentModel=[ DirGain, Phase ]
 Integration.Freq=2;