Task #3877: Reverted r23182 (which was merging the release branch into the trunk)

CEP/DP3/DPPP/src/Averager.cc

@@ -25,7 +25,7 @@
 #include <DPPP/Averager.h>
 #include <DPPP/DPBuffer.h>
 #include <DPPP/DPInfo.h>
-#include <Common/ParameterSet.h>
+#include <DPPP/ParSet.h>
 #include <Common/LofarLogger.h>
 #include <casa/Arrays/ArrayMath.h>
 #include <iostream>
@@ -37,8 +37,7 @@ namespace LOFAR {
   namespace DPPP {
 
     Averager::Averager (DPInput* input,
-                        const ParameterSet& parset,
-                        const string& prefix)
+                        const ParSet& parset, const string& prefix)
       : itsInput     (input),
         itsName      (prefix),
         itsNChanAvg  (parset.getUint  (prefix+"freqstep", 1)),

CEP/DP3/DPPP/src/BaselineSelection.cc

@@ -25,8 +25,6 @@
 #include <DPPP/BaselineSelection.h>
 #include <DPPP/DPLogger.h>
 #include <MS/BaselineSelect.h>
-#include <Common/ParameterSet.h>
-#include <Common/ParameterValue.h>
 #include <Common/LofarLogger.h>
 #include <Common/StreamUtil.h>
 
@@ -39,7 +37,7 @@ namespace LOFAR {
     BaselineSelection::BaselineSelection()
     {}
 
-    BaselineSelection::BaselineSelection (const ParameterSet& parset,
+    BaselineSelection::BaselineSelection (const ParSet& parset,
                                           const string& prefix,
                                           bool minmax,
 					  const string& defaultCorrType)

CEP/DP3/DPPP/src/CMakeLists.txt

@@ -6,7 +6,7 @@ include(PythonInstall)
 lofar_add_library(dppp
   Package__Version.cc
   DPRun.cc DPStep.cc DPInput.cc DPBuffer.cc DPInfo.cc
-  DPLogger.cc ProgressMeter.cc FlagCounter.cc
+  ParSet.cc DPLogger.cc ProgressMeter.cc FlagCounter.cc
   UVWCalculator.cc  BaselineSelection.cc
   MSReader.cc MultiMSReader.cc MSWriter.cc MSUpdater.cc Counter.cc
   Averager.cc MedFlagger.cc AORFlagger.cc PreFlagger.cc UVWFlagger.cc

CEP/DP3/DPPP/src/Counter.cc

@@ -24,7 +24,7 @@
 #include <lofar_config.h>
 #include <DPPP/Counter.h>
 #include <DPPP/DPInfo.h>
-#include <Common/ParameterSet.h>
+#include <DPPP/ParSet.h>
 #include <iostream>
 
 using namespace casa;
@@ -33,8 +33,7 @@ namespace LOFAR {
   namespace DPPP {
 
     Counter::Counter (DPInput* input,
-                      const ParameterSet& parset,
-                      const string& prefix)
+                      const ParSet& parset, const string& prefix)
       : itsName        (prefix),
         itsCount       (0),
         itsFlagCounter (input->msName(), parset, prefix)

CEP/DP3/DPPP/src/DPRun.cc

@@ -39,7 +39,7 @@
 #include <DPPP/StationAdder.h>
 #include <DPPP/Filter.h>
 #include <DPPP/Counter.h>
-#include <DPPP/ApplyCal.h>
+#include <DPPP/ParSet.h>
 #include <DPPP/ProgressMeter.h>
 #include <DPPP/DPLogger.h>
 #include <Common/Timer.h>
@@ -57,9 +57,9 @@ namespace LOFAR {
       casa::Timer timer;
       NSTimer nstimer;
       nstimer.start();
-      ParameterSet parset (parsetName);
+      ParSet parset ((ParameterSet(parsetName)));
       DPLogger::useLogger = parset.getBool ("uselogger", false);
-      int  checkparset    = parset.getInt  ("checkparset", 0);
+      bool checkparset    = parset.getBool ("checkparset", false);
       bool showProgress   = parset.getBool ("showprogress", true);
       bool showTimings    = parset.getBool ("showtimings", true);
       string msName;
@@ -73,19 +73,17 @@ namespace LOFAR {
         DPLOG_INFO (os.str(), true);
         step = step->getNextStep();
       }
-      if (checkparset >= 0) {
-        // Show unused parameters (might be misspelled).
-        vector<string> unused = parset.unusedKeys();
-        if (! unused.empty()) {
-          DPLOG_WARN_STR
-            (endl
-             << "*** WARNING: the following parset keywords were not used ***"
-             << endl
-             << "             maybe they are misspelled"
-             << endl
-             << "    " << unused << endl);
-          ASSERTSTR (checkparset==0, "Unused parset keywords found");
-        }
+      // Show unused parameters (might be misspelled).
+      vector<string> unused = parset.unusedKeys();
+      if (! unused.empty()) {
+        DPLOG_WARN_STR
+          (endl
+           << "*** WARNING: the following parset keywords were not used ***"
+           << endl
+           << "             maybe they are misspelled"
+           << endl
+           << "    " << unused << endl);
+        ASSERTSTR (!checkparset, "Unused parset keywords found");
       }
       // Process until the end.
       uint ntodo = firstStep->getInfo().ntime();
@@ -159,7 +157,7 @@ namespace LOFAR {
       // The destructors are called automatically at this point.
     }
 
-    DPStep::ShPtr DPRun::makeSteps (const ParameterSet& parset, string& msName)
+    DPStep::ShPtr DPRun::makeSteps (const ParSet& parset, string& msName)
     {
       DPStep::ShPtr firstStep;
       DPStep::ShPtr lastStep;
@@ -254,8 +252,6 @@ namespace LOFAR {
           step = DPStep::ShPtr(new StationAdder (reader, parset, prefix));
         } else if (type == "filter") {
           step = DPStep::ShPtr(new Filter (reader, parset, prefix));
-          ///        } else if (type == "applycal"  ||  type == "correct") {
-          ///          step = DPStep::ShPtr(new ApplyCal (reader, parset, prefix));
         } else {
           THROW (LOFAR::Exception, "DPPP step type " << type << " is unknown");
         }

CEP/DP3/DPPP/src/Demixer.cc

@@ -30,6 +30,7 @@
 #include <DPPP/DPInfo.h>
 #include <DPPP/EstimateMixed.h>
 #include <DPPP/PhaseShift.h>
+#include <DPPP/ParSet.h>
 #include <DPPP/Simulate.h>
 #include <DPPP/SourceDBUtil.h>
 #include <DPPP/SubtractMixed.h>
@@ -41,7 +42,6 @@
 #include <ParmDB/ParmCache.h>
 #include <ParmDB/Parm.h>
 
-#include <Common/ParameterSet.h>
 #include <Common/LofarLogger.h>
 #include <Common/OpenMP.h>
 #include <Common/StreamUtil.h>
@@ -70,8 +70,7 @@ namespace LOFAR {
     } //# end unnamed namespace
 
     Demixer::Demixer (DPInput* input,
-                      const ParameterSet& parset,
-                      const string& prefix)
+                      const ParSet& parset, const string& prefix)
       : itsInput          (input),
         itsName           (prefix),
         itsSkyName        (parset.getString(prefix+"skymodel", "sky")),
@@ -361,21 +360,8 @@ namespace LOFAR {
       }
       os << "  targetsource:       " << itsTargetSource << std::endl;
       os << "  subtractsources:    " << itsSubtrSources << std::endl;
-      uint inx=0;
-      for (uint i=0; i<itsSubtrSources.size(); ++i ) {
-        os << "                        "
-           << itsPhaseShifts[inx++]->getPhaseCenter() << std::endl;
-      }
       os << "  modelsources:       " << itsModelSources << std::endl;
-      for (uint i=0; i<itsModelSources.size(); ++i ) {
-        os << "                        "
-           << itsPhaseShifts[inx++]->getPhaseCenter() << std::endl;
-      }
       os << "  extrasources:       " << itsExtraSources << std::endl;
-      for (uint i=0; i<itsExtraSources.size(); ++i ) {
-        os << "                        "
-           << itsPhaseShifts[inx++]->getPhaseCenter() << std::endl;
-      }
 //      os << "  elevationcutoffs: " << itsCutOffs << std::endl;
 //      os << "  jointsolve:     " << itsJointSolve << std::endl;
       os << "  propagatesolutions: " << std::boolalpha << itsPropagateSolutions

CEP/DP3/DPPP/src/Filter.cc

@@ -25,8 +25,8 @@
 #include <DPPP/Filter.h>
 #include <DPPP/DPBuffer.h>
 #include <DPPP/DPInfo.h>
+#include <DPPP/ParSet.h>
 #include <DPPP/DPLogger.h>
-#include <Common/ParameterSet.h>
 
 #include <tables/Tables/ExprNode.h>
 #include <tables/Tables/RecordGram.h>
@@ -38,8 +38,7 @@ namespace LOFAR {
   namespace DPPP {
 
     Filter::Filter (DPInput* input,
-                    const ParameterSet& parset,
-                    const string& prefix)
+                    const ParSet& parset, const string& prefix)
       : itsInput        (input),
         itsName         (prefix),
         itsStartChanStr (parset.getString(prefix+"startchan", "0")),

CEP/DP3/DPPP/src/FlagCounter.cc

@@ -24,7 +24,7 @@
 #include <lofar_config.h>
 #include <DPPP/FlagCounter.h>
 #include <DPPP/DPInput.h>
-#include <Common/ParameterSet.h>
+#include <DPPP/ParSet.h>
 #include <Common/StreamUtil.h>
 #include <Common/LofarLogger.h>
 #include <tables/Tables/Table.h>
@@ -50,8 +50,7 @@ namespace LOFAR {
     {}
 
     FlagCounter::FlagCounter (const string& msName,
-                              const ParameterSet& parset,
-                              const string& prefix)
+                              const ParSet& parset, const string& prefix)
     {
       itsWarnPerc = parset.getDouble (prefix+"warnperc", 0);
       itsShowFF   = parset.getBool   (prefix+"showfullyflagged", false);

CEP/DP3/DPPP/src/MSReader.cc

@@ -26,7 +26,7 @@
 #include <DPPP/DPBuffer.h>
 #include <DPPP/DPInfo.h>
 #include <DPPP/DPLogger.h>
-#include <Common/ParameterSet.h>
+#include <DPPP/ParSet.h>
 #include <Common/LofarLogger.h>
 
 #include <tables/Tables/TableRecord.h>
@@ -58,8 +58,7 @@ namespace LOFAR {
     {}
 
     MSReader::MSReader (const string& msName,
-                        const ParameterSet& parset,
-                        const string& prefix,
+                        const ParSet& parset, const string& prefix,
                         bool missingData)
       : itsReadVisData (False),
         itsMissingData (missingData),
@@ -745,7 +744,6 @@ namespace LOFAR {
       return flags;
     }
 
-    /*
     Cube<Complex> MSReader::getData (const String& columnName,
                                      const RefRows& rowNrs)
     {
@@ -758,7 +756,6 @@ namespace LOFAR {
       Cube<Complex> data = dataCol.getColumnCells (rowNrs);
       return (itsUseAllChan ? data : data(itsArrSlicer));
     }
-    */
 
     void MSReader::putFlags (const RefRows& rowNrs,
                              const Cube<bool>& flags)

CEP/DP3/DPPP/src/MSUpdater.cc

@@ -26,7 +26,7 @@
 #include <DPPP/MSReader.h>
 #include <DPPP/MSWriter.h>
 #include <DPPP/DPBuffer.h>
-#include <Common/ParameterSet.h>
+#include <DPPP/ParSet.h>
 #include <iostream>
 
 using namespace casa;
@@ -34,7 +34,7 @@ using namespace casa;
 namespace LOFAR {
   namespace DPPP {
 
-    MSUpdater::MSUpdater (MSReader* reader, const ParameterSet& parset,
+    MSUpdater::MSUpdater (MSReader* reader, const ParSet& parset,
                           const string&)
       : itsReader      (reader),
         itsNrCorr      (reader->getInfo().ncorr()),
@@ -43,7 +43,7 @@ namespace LOFAR {
         itsNrTimes     (0)
     {
       NSTimer::StartStop sstime(itsTimer);
-      MSWriter::writeHistory (reader->table(), parset);
+      MSWriter::writeHistory (reader->table(), parset.parameterSet());
     }
 
     MSUpdater::~MSUpdater()

CEP/DP3/DPPP/src/MSWriter.cc

@@ -27,9 +27,9 @@
 #include <DPPP/MSUpdater.h>
 #include <DPPP/DPBuffer.h>
 #include <DPPP/DPInfo.h>
+#include <DPPP/ParSet.h>
 #include <DPPP/DPLogger.h>
 #include <MS/VdsMaker.h>
-#include <Common/ParameterSet.h>
 #include <tables/Tables/TableCopy.h>
 #include <tables/Tables/DataManInfo.h>
 #include <tables/Tables/SetupNewTab.h>
@@ -50,7 +50,7 @@ namespace LOFAR {
 
     MSWriter::MSWriter (MSReader* reader, const std::string& outName,
                         const DPInfo& info,
-                        const ParameterSet& parset, const string& prefix)
+                        const ParSet& parset, const string& prefix)
       : itsReader       (reader),
         itsInterval     (info.timeInterval()),
         itsNrCorr       (info.ncorr()),
@@ -80,7 +80,7 @@ namespace LOFAR {
       }
       createMS (outName, info, tileSize, tileNChan);
       // Write the parset info into the history.
-      writeHistory (itsMS, parset);
+      writeHistory (itsMS, parset.parameterSet());
       itsMS.flush (true, true);
       DPLOG_INFO ("Finished preparing output MS", false);
     }

CEP/DP3/DPPP/src/MedFlagger.cc

@@ -25,7 +25,7 @@
 #include <DPPP/MedFlagger.h>
 #include <DPPP/DPBuffer.h>
 #include <DPPP/DPInfo.h>
-#include <Common/ParameterSet.h>
+#include <DPPP/ParSet.h>
 #include <Common/StreamUtil.h>
 #include <Common/LofarLogger.h>
 #include <casa/Arrays/ArrayMath.h>
@@ -42,8 +42,7 @@ namespace LOFAR {
   namespace DPPP {
 
     MedFlagger::MedFlagger (DPInput* input,
-                            const ParameterSet& parset,
-                            const string& prefix)
+                            const ParSet& parset, const string& prefix)
       : itsInput         (input),
         itsName          (prefix),
         itsThresholdStr  (parset.getString (prefix+"threshold", "1")),

CEP/DP3/DPPP/src/MultiMSReader.cc

@@ -25,7 +25,7 @@
 #include <DPPP/MultiMSReader.h>
 #include <DPPP/DPBuffer.h>
 #include <DPPP/DPInfo.h>
-#include <Common/ParameterSet.h>
+#include <DPPP/ParSet.h>
 #include <Common/StreamUtil.h>
 #include <Common/LofarLogger.h>
 #include <tables/Tables/TableRecord.h>
@@ -48,8 +48,7 @@ namespace LOFAR {
   namespace DPPP {
 
     MultiMSReader::MultiMSReader (const vector<string>& msNames,
-                                  const ParameterSet& parset,
-                                  const string& prefix)
+                                  const ParSet& parset, const string& prefix)
       : itsFirst    (-1),
         itsNMissing (0),
         itsMSNames  (msNames)
@@ -404,7 +403,6 @@ namespace LOFAR {
       return flags;
     }
 
-    /*
     Cube<Complex> MultiMSReader::getData (const String& columnName,
                                           const RefRows& rowNrs)
     {
@@ -424,7 +422,6 @@ namespace LOFAR {
       }
       return data;
     }
-    */
 
     void MultiMSReader::combineFullResFlags (const vector<Cube<bool> >& vec,
                                              Cube<bool>& flags) const

CEP/DP3/DPPP/src/ParSet.cc

+//# ParSet.cc: Wrapper around ParaMeterSet to keep track of parameters asked for
+//# Copyright (C) 2010
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
+//#
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite 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 3 of the License, or
+//# (at your option) any later version.
+//#
+//# The LOFAR software suite 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 the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
+//#
+//# $Id$
+//#
+//# @author Ger van Diepen
+
+#include <DPPP/ParSet.h>
+#include <Common/ParameterRecord.h>
+#include <set>
+
+namespace LOFAR {
+  namespace DPPP {
+
+    ParSet::ParSet (const ParameterSet& parset )
+      : itsParSet (parset)
+    {}
+
+    bool   ParSet::getBool  (const string& aKey) const
+    {
+      itsAskedParms.insert (aKey);
+      return itsParSet.getBool (aKey);
+    }
+
+    bool   ParSet::getBool  (const string& aKey, bool aValue) const
+    {
+      itsAskedParms.insert (aKey);
+      return itsParSet.getBool (aKey, aValue);
+    }
+
+    int    ParSet::getInt   (const string& aKey) const
+    {
+      itsAskedParms.insert (aKey);
+      return itsParSet.getInt (aKey);
+    }
+
+    int    ParSet::getInt   (const string& aKey, int aValue) const
+    {
+      itsAskedParms.insert (aKey);
+      return itsParSet.getInt (aKey, aValue);
+    }
+
+    uint   ParSet::getUint  (const string& aKey) const
+    {
+      itsAskedParms.insert (aKey);
+      return itsParSet.getUint (aKey);
+    }
+
+    uint   ParSet::getUint  (const string& aKey, uint aValue) const
+    {
+      itsAskedParms.insert (aKey);
+      return itsParSet.getUint (aKey, aValue);
+    }
+
+    float  ParSet::getFloat (const string& aKey) const
+    {
+      itsAskedParms.insert (aKey);
+      return itsParSet.getFloat (aKey);
+    }
+
+    float  ParSet::getFloat (const string& aKey, float aValue) const
+    {
+      itsAskedParms.insert (aKey);
+      return itsParSet.getFloat (aKey, aValue);
+    }
+
+    double ParSet::getDouble(const string& aKey) const
+    {
+      itsAskedParms.insert (aKey);
+      return itsParSet.getDouble (aKey);
+    }
+
+    double ParSet::getDouble(const string& aKey, double aValue) const
+    {
+      itsAskedParms.insert (aKey);
+      return itsParSet.getDouble (aKey, aValue);
+    }
+
+    string ParSet::getString(const string& aKey) const
+    {
+      itsAskedParms.insert (aKey);
+      return itsParSet.getString (aKey);
+    }
+
+    string ParSet::getString(const string& aKey, const string& aValue) const
+    {
+      itsAskedParms.insert (aKey);
+      return itsParSet.getString (aKey, aValue);
+    }
+
+    vector<bool>   ParSet::getBoolVector  (const string& aKey,
+                                           bool expandable) const
+    {
+      itsAskedParms.insert (aKey);
+      return itsParSet.getBoolVector (aKey, expandable);
+    }
+
+    vector<bool>   ParSet::getBoolVector  (const string& aKey,
+                                           const vector<bool>& aValue,
+                                           bool expandable) const
+    {
+      itsAskedParms.insert (aKey);
+      return itsParSet.getBoolVector (aKey, aValue, expandable);
+    }
+
+    vector<int>    ParSet::getIntVector   (const string& aKey,
+                                           bool expandable) const
+    {
+      itsAskedParms.insert (aKey);
+      return itsParSet.getIntVector (aKey, expandable);
+    }
+
+    vector<int>    ParSet::getIntVector   (const string& aKey,
+                                           const vector<int>& aValue,
+                                           bool expandable) const
+    {
+      itsAskedParms.insert (aKey);
+      return itsParSet.getIntVector (aKey, aValue, expandable);
+    }
+
+    vector<uint>   ParSet::getUintVector  (const string& aKey,
+                                           bool expandable) const
+    {
+      itsAskedParms.insert (aKey);
+      return itsParSet.getUintVector (aKey, expandable);
+    }
+
+    vector<uint>   ParSet::getUintVector  (const string& aKey,
+                                           const vector<uint>& aValue,
+                                           bool expandable) const
+    {
+      itsAskedParms.insert (aKey);
+      return itsParSet.getUintVector (aKey, aValue, expandable);
+    }
+
+    vector<float>  ParSet::getFloatVector (const string& aKey,
+                                           bool expandable) const
+    {
+      itsAskedParms.insert (aKey);
+      return itsParSet.getFloatVector (aKey, expandable);
+    }
+
+    vector<float>  ParSet::getFloatVector (const string& aKey,
+                                           const vector<float>& aValue,
+                                           bool expandable) const
+    {
+      itsAskedParms.insert (aKey);
+      return itsParSet.getFloatVector (aKey, aValue, expandable);
+    }
+
+    vector<double> ParSet::getDoubleVector(const string& aKey,
+                                           bool expandable) const
+    {
+      itsAskedParms.insert (aKey);
+      return itsParSet.getDoubleVector (aKey, expandable);
+    }
+
+    vector<double> ParSet::getDoubleVector(const string& aKey,
+                                           const vector<double>& aValue,
+                                           bool expandable) const
+    {
+      itsAskedParms.insert (aKey);
+      return itsParSet.getDoubleVector (aKey, aValue, expandable);
+    }
+
+    vector<string> ParSet::getStringVector(const string& aKey,
+                                           bool expandable) const
+    {
+      itsAskedParms.insert (aKey);
+      return itsParSet.getStringVector (aKey, expandable);
+    }
+
+    vector<string> ParSet::getStringVector(const string& aKey,
+                                           const vector<string>& aValue,
+                                           bool expandable) const
+    {
+      itsAskedParms.insert (aKey);
+      return itsParSet.getStringVector (aKey, aValue, expandable);
+    }
+
+    ParameterRecord ParSet::getRecord(const string& aKey) const
+    {
+      itsAskedParms.insert (aKey);
+      return itsParSet.getRecord (aKey);
+    }
+
+    vector<string> ParSet::unusedKeys() const
+    {
+      vector<string> vec;
+      for (ParameterSet::const_iterator iter = itsParSet.begin();
+           iter != itsParSet.end(); ++iter) {
+        if (itsAskedParms.find (iter->first) == itsAskedParms.end()) {
+          vec.push_back (iter->first);
+        }
+      }
+      return vec;
+    }
+
+
+  } //# end namespace
+}

CEP/DP3/DPPP/src/PhaseShift.cc

@@ -25,7 +25,7 @@
 #include <DPPP/PhaseShift.h>
 #include <DPPP/DPBuffer.h>
 #include <DPPP/DPInfo.h>
-#include <Common/ParameterSet.h>
+#include <DPPP/ParSet.h>
 #include <Common/LofarLogger.h>
 #include <Common/StreamUtil.h>
 #include <casa/Arrays/ArrayMath.h>
@@ -43,16 +43,14 @@ namespace LOFAR {
   namespace DPPP {
 
     PhaseShift::PhaseShift (DPInput* input,
-                            const ParameterSet& parset,
-                            const string& prefix)
+                            const ParSet& parset, const string& prefix)
       : itsInput   (input),
         itsName    (prefix),
         itsCenter  (parset.getStringVector(prefix+"phasecenter"))
     {}
 
     PhaseShift::PhaseShift (DPInput* input,
-                            const ParameterSet& parset,
-                            const string& prefix,
+                            const ParSet& parset, const string& prefix,
                             const vector<string>& defVal)
       : itsInput   (input),
         itsName    (prefix),

CEP/DP3/DPPP/src/PreFlagger.cc

@@ -25,8 +25,8 @@
 #include <DPPP/PreFlagger.h>
 #include <DPPP/DPBuffer.h>
 #include <DPPP/DPInfo.h>
+#include <DPPP/ParSet.h>
 #include <DPPP/DPLogger.h>
-#include <Common/ParameterSet.h>
 #include <Common/StreamUtil.h>
 #include <Common/LofarLogger.h>
 
@@ -51,8 +51,7 @@ namespace LOFAR {
   namespace DPPP {
 
     PreFlagger::PreFlagger (DPInput* input,
-                            const ParameterSet& parset,
-                            const string& prefix)
+                            const ParSet& parset, const string& prefix)
       : itsName        (prefix),
         itsInput       (input),
         itsMode        (SetFlag),
@@ -226,8 +225,7 @@ namespace LOFAR {
 
 
     PreFlagger::PSet::PSet (DPInput* input,
-                            const ParameterSet& parset,
-                            const string& prefix)
+                            const ParSet& parset, const string& prefix)
       : itsInput (input),
         itsName  (prefix),
         itsFlagOnUV    (false),

CEP/DP3/DPPP/src/StationAdder.cc

@@ -25,8 +25,8 @@
 #include <DPPP/StationAdder.h>
 #include <DPPP/DPBuffer.h>
 #include <DPPP/DPInfo.h>
+#include <DPPP/ParSet.h>
 #include <DPPP/DPLogger.h>
-#include <Common/ParameterSet.h>
 #include <Common/ParameterRecord.h>
 
 #include <measures/Measures/MPosition.h>
@@ -48,8 +48,7 @@ namespace LOFAR {
   namespace DPPP {
 
     StationAdder::StationAdder (DPInput* input,
-                                const ParameterSet& parset,
-                                const string& prefix)
+                                const ParSet& parset, const string& prefix)
       : itsInput        (input),
         itsName         (prefix),
         itsStatRec      (parset.getRecord(prefix+"stations")),

CEP/DP3/DPPP/src/UVWFlagger.cc

@@ -25,7 +25,7 @@
 #include <DPPP/UVWFlagger.h>
 #include <DPPP/DPBuffer.h>
 #include <DPPP/DPInfo.h>
-#include <Common/ParameterSet.h>
+#include <DPPP/ParSet.h>
 #include <Common/StreamUtil.h>
 #include <Common/LofarLogger.h>
 #include <casa/Arrays/ArrayMath.h>
@@ -42,8 +42,7 @@ namespace LOFAR {
   namespace DPPP {
 
     UVWFlagger::UVWFlagger (DPInput* input,
-                            const ParameterSet& parset,
-                            const string& prefix)
+                            const ParSet& parset, const string& prefix)
       : itsInput       (input),
         itsName        (prefix),
         itsNTimes      (0),
@@ -243,7 +242,7 @@ namespace LOFAR {
       }
     }
 
-    vector<double> UVWFlagger::fillUVW (const ParameterSet& parset,
+    vector<double> UVWFlagger::fillUVW (const ParSet& parset,
                                         const string& prefix,
                                         const string& name,
                                         bool square)

CEP/DP3/DPPP/test/CMakeLists.txt

@@ -16,6 +16,7 @@ lofar_add_test(tFilter tFilter.cc)
 #lofar_add_test(tDemixer tDemixer.cc)
 lofar_add_test(tNDPPP tNDPPP.cc)
 lofar_add_test(tparse tparse.cc)
+lofar_add_test(tParSet tParSet.cc)
 lofar_add_test(tBaselineSelection tBaselineSelection.cc)
 # lofar_add_test(tExpr tExpr.cc)
 # lofar_add_test(tmeqarray tmeqarray.cc)

CEP/DP3/DPPP/test/tAORFlagger.cc

@@ -26,7 +26,7 @@
 #include <DPPP/DPInput.h>
 #include <DPPP/DPBuffer.h>
 #include <DPPP/DPInfo.h>
-#include <Common/ParameterSet.h>
+#include <DPPP/ParSet.h>
 #include <Common/StringUtil.h>
 #include <casa/Arrays/ArrayMath.h>
 #include <casa/Arrays/ArrayLogical.h>