bug 1656:

Added synonyms msin.name and msout.name (for SAS/MAC)

CEP/DP3/DPPP/src/DPRun.cc

@@ -138,8 +138,17 @@ namespace LOFAR {
       DPStep::ShPtr firstStep;
       DPStep::ShPtr lastStep;
       // Get input and output MS name.
-      string inName  = parset.getString ("msin");
-      string outName = parset.getString ("msout");
+      // Those parameters were always called msin and msout.
+      // However, SAS/MAC cannot handle a parameter and a group with the same
+      // name, hence it uses msin.name and msout.name.
+      string inName = parset.getString ("msin.name", "");
+      if (inName.empty()) {
+        inName = parset.getString ("msin");
+      }
+      string outName = parset.getString ("msout.name", "");
+      if (outName.empty()) {
+        outName = parset.getString ("msout");
+      }
       // Get the steps.
       vector<string> steps = parset.getStringVector ("steps");
       // Currently the input MS must be given.

CEP/DP3/DPPP/test/tNDPPP.cc

@@ -224,11 +224,11 @@ void testAvg1()
   {
     // Average in a single step.
     ofstream ostr("tNDPPP_tmp.parset");
-    ostr << "msin=tNDPPP_tmp.MS" << endl;
+    ostr << "msin.name=tNDPPP_tmp.MS" << endl;
     // Give start and end time as actual, hence no missing timeslots.
     ostr << "msin.starttime=03-Aug-2000/13:22:20" << endl;
     ostr << "msin.endtime=03-Aug-2000/13:31:45" << endl;
-    ostr << "msout=tNDPPP_tmp.MS2" << endl;
+    ostr << "msout.name=tNDPPP_tmp.MS2" << endl;
     ostr << "msout.overwrite=true" << endl;
     ostr << "steps=[avg,count]" << endl;
     ostr << "avg.type=average" << endl;