TAsk #8157: Merging branch DPPP-Task8157 into trunk (NOT reintegrate!)

CEP/DP3/DPPP/include/DPPP/DPStep.h

@@ -67,6 +67,11 @@ namespace LOFAR {
       // Define the shared pointer for this type.
       typedef shared_ptr<DPStep> ShPtr;
 
+      // Constructor to initialize.
+      DPStep()
+        : itsPrevStep(0)
+      {}
+
       // Destructor.
       virtual ~DPStep();
 

CEP/DP3/DPPP/src/AORFlagger.cc

@@ -271,6 +271,7 @@ namespace LOFAR {
 
     void AORFlagger::addToMS (const string& msName)
     {
+      getPrevStep()->addToMS(msName);
       itsTimer.start();
       if (itsDoRfiStats) {
         itsQualityTimer.start();

CEP/DP3/DPPP/src/DPRun.cc

@@ -172,6 +172,9 @@ namespace LOFAR {
       DPLOG_INFO_STR ("Finishing processing ...");
       firstStep->finish();
       // Give all steps the option to add something to the MS written.
+      // It starts with the last step to get the name of the output MS,
+      // but each step must first call its previous step before
+      // it adds something itself.
       lastStep->addToMS("");
 
       // Show the counts where needed.

CEP/DP3/DPPP/src/DPStep.cc

@@ -46,7 +46,7 @@ namespace LOFAR {
 
     void DPStep::addToMS (const string& msName)
     {
-      itsPrevStep->addToMS(msName);
+      if (itsPrevStep) itsPrevStep->addToMS(msName);
     }
 
     void DPStep::showCounts (std::ostream&) const

CEP/DP3/DPPP/src/Filter.cc

@@ -249,6 +249,7 @@ namespace LOFAR {
 
     void Filter::addToMS (const string& msName)
     {
+      getPrevStep()->addToMS(msName);
       if (! itsRemoveAnt) {
         return;
       }