Bug #1289: Changed handling of Squasher=0 and added generating VDS file

CEP/DP3/DPPP/configure.in

@@ -50,8 +50,12 @@ dnl Check for LOFAR specific things
 dnl
 lofar_GENERAL(1)
 lofar_AIPSPP(1)
-lofar_INTERNAL(LCS/Common,Common,,1,Common/LofarTypes.h)
-lofar_INTERNAL(LCS/ACC/PLC,PLC,,1,PLC/ProcessControl.h)
+lofar_INTERNAL(LCS/Common,Common,,1,Common/LofarTypes.h,,)
+lofar_INTERNAL(LCS/ACC/PLC,PLC,,1,PLC/ProcessControl.h,,)
+lofar_INTERNAL(LCS/Blob,Blob,,1,Blob/BlobHeader.h,,)
+lofar_INTERNAL(LCS/Transport,Transport,,1,Transport/DataHolder.h,,)
+lofar_INTERNAL(CEP/Imager/MWCommon,MWCommon,,1,MWCommon/ClusterDesc.h,,)
+lofar_INTERNAL(CEP/MS,MS,,1,MS/VdsMaker.h,bbms,)
 
 dnl
 dnl Output Makefiles

CEP/DP3/DPPP/include/DPPP/MsFile.h

@@ -47,7 +47,7 @@ namespace LOFAR
       /// Iterator to process all data from one integration time at the same time
       casa::TableIterator TimeIterator();
       /// creates a new measurement set
-      void Init(MsInfo& Info, RunDetails& Details);
+      void Init(MsInfo& Info, RunDetails& Details, int Squashing);
       void PrintInfo(void); ///< prints some numbers for debug purposes
       /// processes the tables from TimeIterator to fill the next timeslot to be processed in DataBuffer
       void UpdateTimeslotData(casa::TableIterator& Data_iter,

CEP/DP3/DPPP/include/DPPP/PipelineProcessControl.h

@@ -48,6 +48,7 @@ namespace LOFAR
     private:
       std::string  itsInMS; ///< Name and location of input MS
       std::string  itsOutMS; ///< Name and location of output MS
+      std::string  itsClusterDesc; ///< Name and location of ClusterDesc file
       unsigned int itsBandpass; ///< from ParameterSet
       unsigned int itsFlagger; ///< From ParameterSet
       unsigned int itsSquasher; ///< From ParameterSet

CEP/DP3/DPPP/src/MsFile.cc

@@ -92,7 +92,7 @@ void MsFile::TableResize(TableDesc tdesc, IPosition ipos, string name, Table& ta
 }
 
 //===============>>> MsFile::PrintInfo  <<<===============
-void MsFile::Init(MsInfo& Info, RunDetails& Details)
+void MsFile::Init(MsInfo& Info, RunDetails& Details, int Squashing)
 {
   cout << "Please wait, preparing output MS" << endl;
   Block<String> tempblock(SELECTblock);
@@ -115,8 +115,17 @@ void MsFile::Init(MsInfo& Info, RunDetails& Details)
   Vector<Int> temp_pos = ipos.asVector();
   std::cout << "Old shape: " << temp_pos(0) << ":" <<  temp_pos(1) << std::endl;
   int old_nchan = temp_pos(1);
-  int new_nchan = Details.NChan/Details.Step;
-  temp_pos(1)   = new_nchan;
+  int new_nchan;
+  if (Squashing)
+  { new_nchan     = Details.NChan/Details.Step;
+    temp_pos(1)   = new_nchan;
+  }
+  else
+  { new_nchan     = old_nchan;
+    Details.NChan = old_nchan;
+    Details.Step  = 1;
+    Details.Start = 0;
+  }
   std::cout << "New shape: " << temp_pos(0) << ":" <<  temp_pos(1) << std::endl;
   IPosition data_ipos(temp_pos);
 

CEP/DP3/DPPP/src/PipelineProcessControl.cc

@@ -23,6 +23,8 @@
 #include <casa/Inputs/Input.h>
 #include <ms/MeasurementSets.h>
 
+#include <MS/VdsMaker.h>
+
 #include <DPPP/PipelineProcessControl.h>
 #include <DPPP/MsInfo.h>
 #include <DPPP/MsFile.h>
@@ -39,6 +41,7 @@
 
 #define PIPELINE_VERSION "0.23"
 // 0.23 Added AbsoluteThreshold for MADFlagger
+// 0.24 Added writing VDS file
 
 namespace LOFAR
 {
@@ -83,6 +86,7 @@ namespace LOFAR
       myDetails->TimeStep     = ParamSet->getUint32("timestep", 1);     //DataSquasher
       itsInMS                 = ParamSet->getString("msin");
       itsOutMS                = ParamSet->getString("msout");
+      itsClusterDesc          = ParamSet->getString("clusterdesc");
       itsBandpass             = ParamSet->getUint32("bandpass", 0);
       itsFlagger              = ParamSet->getUint32("flagger", 0);
       itsSquasher             = ParamSet->getUint32("squasher", 0);
@@ -98,12 +102,15 @@ namespace LOFAR
     {
       try{
       std::cout << "Runnning pipeline please wait..." << std::endl;
-        myFile->Init(*myInfo, *myDetails);
+        myFile->Init(*myInfo, *myDetails, itsSquasher);
         MsInfo* outInfo = new MsInfo(itsOutMS);
         outInfo->Update();
         outInfo->PrintInfo();
         myPipeline->Run(outInfo, myDetails->Columns);
         delete outInfo;
+        if (!itsClusterDesc.empty())
+        { LOFAR::VdsMaker::create (itsClusterDesc, itsOutMS + ".vds", itsOutMS, "", true);
+        }
       }
       catch(casa::AipsError& err)
       {