From 049fb8ed8b5e7ccd9e83ecc0b78c9d3c100e69e5 Mon Sep 17 00:00:00 2001
From: Adriaan Renting <renting@astron.nl>
Date: Wed, 13 Aug 2008 12:38:52 +0000
Subject: [PATCH] Bug #1218: Fixed lofarconf.in and most .cc files were missing
 lofarconfig.h

---
 .../src/BandpassCorrector.cc                  |  1 +
 .../CS1_BandpassCorrector/src/Corrector.cc    |  4 +---
 .../src/CorrectorProcessControl.cc            |  1 +
 .../CS1/CS1_BandpassCorrector/src/MS_File.cc  |  3 ++-
 .../CS1_BinningFlagger/src/BinningFlagger.cc  |  1 +
 .../CEP/CS1/CS1_BinningFlagger/src/Flagger.cc |  4 +---
 .../src/FlaggerProcessControl.cc              |  1 +
 .../CEP/CS1/CS1_BinningFlagger/src/MS_File.cc |  1 +
 Appl/CEP/CS1/CS1_DFTImager/src/DFTImager.cc   |  1 +
 Appl/CEP/CS1/CS1_DFTImager/src/Image_File.cc  |  3 ++-
 Appl/CEP/CS1/CS1_DFTImager/src/Imager.cc      |  4 +---
 .../CS1_DFTImager/src/ImagerProcessControl.cc |  1 +
 Appl/CEP/CS1/CS1_DFTImager/src/MS_File.cc     |  1 +
 .../CS1/CS1_DataSquasher/src/DataSquasher.cc  |  1 +
 .../CEP/CS1/CS1_DataSquasher/src/MS_Reader.cc |  1 +
 Appl/CEP/CS1/CS1_DataSquasher/src/Squasher.cc |  5 +----
 .../src/SquasherProcessControl.cc             |  1 +
 .../CS1_Flagger/src/ComplexMedianFlagger.cc   |  1 +
 Appl/CEP/CS1/CS1_Flagger/src/Flagger.cc       |  4 +---
 .../CS1_Flagger/src/FlaggerProcessControl.cc  |  1 +
 Appl/CEP/CS1/CS1_Flagger/src/MS_File.cc       |  2 ++
 .../CS1_Flagger2/src/ComplexMedianFlagger2.cc |  1 +
 Appl/CEP/CS1/CS1_Flagger2/src/Flagger.cc      |  5 +----
 .../CS1_Flagger2/src/FlaggerProcessControl.cc |  1 +
 Appl/CEP/CS1/CS1_Flagger2/src/MS_File.cc      |  1 +
 .../CS1/CS1_FrequencyFlagger/src/Flagger.cc   |  4 +---
 .../src/FlaggerProcessControl.cc              |  1 +
 .../src/FrequencyFlagger.cc                   |  1 +
 .../CS1/CS1_FrequencyFlagger/src/MS_File.cc   |  1 +
 Appl/CEP/CS1/CS1_SPWCombine/src/Combiner.cc   |  5 +----
 .../src/CombinerProcessControl.cc             |  1 +
 Appl/CEP/CS1/CS1_SPWCombine/src/SPWCombine.cc |  1 +
 Appl/CEP/CS1/lofarconf.in                     | 20 +++++++++++++++----
 33 files changed, 51 insertions(+), 33 deletions(-)

diff --git a/Appl/CEP/CS1/CS1_BandpassCorrector/src/BandpassCorrector.cc b/Appl/CEP/CS1/CS1_BandpassCorrector/src/BandpassCorrector.cc
index f4e9dd23ef1..8cb03029635 100644
--- a/Appl/CEP/CS1/CS1_BandpassCorrector/src/BandpassCorrector.cc
+++ b/Appl/CEP/CS1/CS1_BandpassCorrector/src/BandpassCorrector.cc
@@ -18,6 +18,7 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
+#include <lofar_config.h>
 #include <tables/Tables.h>
 #include <tables/Tables/TableIter.h>
 #include "BandpassCorrector.h"
diff --git a/Appl/CEP/CS1/CS1_BandpassCorrector/src/Corrector.cc b/Appl/CEP/CS1/CS1_BandpassCorrector/src/Corrector.cc
index e57ae8923d4..61d40df9702 100644
--- a/Appl/CEP/CS1/CS1_BandpassCorrector/src/Corrector.cc
+++ b/Appl/CEP/CS1/CS1_BandpassCorrector/src/Corrector.cc
@@ -19,9 +19,7 @@
  ***************************************************************************/
 
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include <lofar_config.h>
 #include <libgen.h>
 #include <PLC/ACCmain.h>
 #include <casa/Exceptions.h>
diff --git a/Appl/CEP/CS1/CS1_BandpassCorrector/src/CorrectorProcessControl.cc b/Appl/CEP/CS1/CS1_BandpassCorrector/src/CorrectorProcessControl.cc
index 74c09737fa4..cf4fc1090d1 100644
--- a/Appl/CEP/CS1/CS1_BandpassCorrector/src/CorrectorProcessControl.cc
+++ b/Appl/CEP/CS1/CS1_BandpassCorrector/src/CorrectorProcessControl.cc
@@ -18,6 +18,7 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
+#include <lofar_config.h>
 #include <iostream>
 #include <cstdlib>
 #include <iostream>
diff --git a/Appl/CEP/CS1/CS1_BandpassCorrector/src/MS_File.cc b/Appl/CEP/CS1/CS1_BandpassCorrector/src/MS_File.cc
index ecf6e7a2221..ee5f53f1ae5 100644
--- a/Appl/CEP/CS1/CS1_BandpassCorrector/src/MS_File.cc
+++ b/Appl/CEP/CS1/CS1_BandpassCorrector/src/MS_File.cc
@@ -17,6 +17,7 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
+#include <lofar_config.h>
 #include <casa/BasicMath/Math.h>
 #include <casa/Arrays.h>
 //#include <casa/Quanta/MVTime.h>
@@ -147,4 +148,4 @@ namespace LOFAR
     }
     //===============>>> MS_File  <<<===============
   }; // namespace CS1
-}; // namespace LOFAR
\ No newline at end of file
+}; // namespace LOFAR
diff --git a/Appl/CEP/CS1/CS1_BinningFlagger/src/BinningFlagger.cc b/Appl/CEP/CS1/CS1_BinningFlagger/src/BinningFlagger.cc
index 6fad83e8312..30ea0d2b1fc 100644
--- a/Appl/CEP/CS1/CS1_BinningFlagger/src/BinningFlagger.cc
+++ b/Appl/CEP/CS1/CS1_BinningFlagger/src/BinningFlagger.cc
@@ -17,6 +17,7 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
+#include <lofar_config.h>
 #include <tables/Tables.h>
 #include <scimath/Mathematics/StatAcc.h>
 #include <scimath/Mathematics/StatAcc.cc>
diff --git a/Appl/CEP/CS1/CS1_BinningFlagger/src/Flagger.cc b/Appl/CEP/CS1/CS1_BinningFlagger/src/Flagger.cc
index 6434a9a8947..47e03d6e280 100644
--- a/Appl/CEP/CS1/CS1_BinningFlagger/src/Flagger.cc
+++ b/Appl/CEP/CS1/CS1_BinningFlagger/src/Flagger.cc
@@ -19,9 +19,7 @@
  ***************************************************************************/
 
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include <lofar_config.h>
 #include <libgen.h>
 #include <PLC/ACCmain.h>
 #include <casa/Exceptions.h>
diff --git a/Appl/CEP/CS1/CS1_BinningFlagger/src/FlaggerProcessControl.cc b/Appl/CEP/CS1/CS1_BinningFlagger/src/FlaggerProcessControl.cc
index 965eb56e338..8c08d434072 100644
--- a/Appl/CEP/CS1/CS1_BinningFlagger/src/FlaggerProcessControl.cc
+++ b/Appl/CEP/CS1/CS1_BinningFlagger/src/FlaggerProcessControl.cc
@@ -18,6 +18,7 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
+#include <lofar_config.h>
 #include <iostream>
 #include <cstdlib>
 #include <iostream>
diff --git a/Appl/CEP/CS1/CS1_BinningFlagger/src/MS_File.cc b/Appl/CEP/CS1/CS1_BinningFlagger/src/MS_File.cc
index 8199ca7885b..b5060f1c2df 100644
--- a/Appl/CEP/CS1/CS1_BinningFlagger/src/MS_File.cc
+++ b/Appl/CEP/CS1/CS1_BinningFlagger/src/MS_File.cc
@@ -17,6 +17,7 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
+#include <lofar_config.h>
 #include <casa/BasicMath/Math.h>
 #include <casa/Arrays.h>
 //#include <casa/Quanta/MVTime.h>
diff --git a/Appl/CEP/CS1/CS1_DFTImager/src/DFTImager.cc b/Appl/CEP/CS1/CS1_DFTImager/src/DFTImager.cc
index 7ea02509383..a94533abfe3 100644
--- a/Appl/CEP/CS1/CS1_DFTImager/src/DFTImager.cc
+++ b/Appl/CEP/CS1/CS1_DFTImager/src/DFTImager.cc
@@ -17,6 +17,7 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
+#include <lofar_config.h>
 #include <tables/Tables.h>
 #include <tables/Tables/TableIter.h>
 #include "DFTImager.h"
diff --git a/Appl/CEP/CS1/CS1_DFTImager/src/Image_File.cc b/Appl/CEP/CS1/CS1_DFTImager/src/Image_File.cc
index a59e5ab2e32..88fc2fea207 100644
--- a/Appl/CEP/CS1/CS1_DFTImager/src/Image_File.cc
+++ b/Appl/CEP/CS1/CS1_DFTImager/src/Image_File.cc
@@ -18,6 +18,7 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
+#include <lofar_config.h>
 #include<casa/aips.h>
 #include <images/Images/PagedImage.h>
 #include <images/Images/ImageInfo.h>
@@ -417,4 +418,4 @@ void testArrayofImagesAndAssignmentOperator()
 */
     //===============>>> Image_File  <<<===============
   }
-}
\ No newline at end of file
+}
diff --git a/Appl/CEP/CS1/CS1_DFTImager/src/Imager.cc b/Appl/CEP/CS1/CS1_DFTImager/src/Imager.cc
index 445f23511e4..bb5721a1a59 100644
--- a/Appl/CEP/CS1/CS1_DFTImager/src/Imager.cc
+++ b/Appl/CEP/CS1/CS1_DFTImager/src/Imager.cc
@@ -19,9 +19,7 @@
  ***************************************************************************/
 
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include <lofar_config.h>
 #include <libgen.h>
 #include <PLC/ACCmain.h>
 #include <casa/Exceptions.h>
diff --git a/Appl/CEP/CS1/CS1_DFTImager/src/ImagerProcessControl.cc b/Appl/CEP/CS1/CS1_DFTImager/src/ImagerProcessControl.cc
index 5336aa90beb..b138f46e619 100644
--- a/Appl/CEP/CS1/CS1_DFTImager/src/ImagerProcessControl.cc
+++ b/Appl/CEP/CS1/CS1_DFTImager/src/ImagerProcessControl.cc
@@ -18,6 +18,7 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
+#include <lofar_config.h>
 #include <iostream>
 #include <cstdlib>
 #include <iostream>
diff --git a/Appl/CEP/CS1/CS1_DFTImager/src/MS_File.cc b/Appl/CEP/CS1/CS1_DFTImager/src/MS_File.cc
index 60272f89f46..e31f1df3160 100644
--- a/Appl/CEP/CS1/CS1_DFTImager/src/MS_File.cc
+++ b/Appl/CEP/CS1/CS1_DFTImager/src/MS_File.cc
@@ -17,6 +17,7 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
+#include <lofar_config.h>
 #include <casa/BasicMath/Math.h>
 #include <casa/Arrays.h>
 //#include <casa/Quanta/MVTime.h>
diff --git a/Appl/CEP/CS1/CS1_DataSquasher/src/DataSquasher.cc b/Appl/CEP/CS1/CS1_DataSquasher/src/DataSquasher.cc
index 34c8f00efa4..077c7bf8794 100644
--- a/Appl/CEP/CS1/CS1_DataSquasher/src/DataSquasher.cc
+++ b/Appl/CEP/CS1/CS1_DataSquasher/src/DataSquasher.cc
@@ -17,6 +17,7 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
+#include <lofar_config.h>
 //#include <casa/Arrays/ArrayLogical.h>
 
 #include "DataSquasher.h"
diff --git a/Appl/CEP/CS1/CS1_DataSquasher/src/MS_Reader.cc b/Appl/CEP/CS1/CS1_DataSquasher/src/MS_Reader.cc
index a70c2b57281..1c27d2870ad 100644
--- a/Appl/CEP/CS1/CS1_DataSquasher/src/MS_Reader.cc
+++ b/Appl/CEP/CS1/CS1_DataSquasher/src/MS_Reader.cc
@@ -17,6 +17,7 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
+#include <lofar_config.h>
 #include <casa/BasicMath/Math.h>
 #include <casa/Arrays.h>
 //#include <casa/Quanta/MVTime.h>
diff --git a/Appl/CEP/CS1/CS1_DataSquasher/src/Squasher.cc b/Appl/CEP/CS1/CS1_DataSquasher/src/Squasher.cc
index 1ac0ce20251..9ebd27f5134 100644
--- a/Appl/CEP/CS1/CS1_DataSquasher/src/Squasher.cc
+++ b/Appl/CEP/CS1/CS1_DataSquasher/src/Squasher.cc
@@ -18,10 +18,7 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include <lofar_config.h>
 #include <libgen.h>
 #include <PLC/ACCmain.h>
 #include <casa/Exceptions.h>
diff --git a/Appl/CEP/CS1/CS1_DataSquasher/src/SquasherProcessControl.cc b/Appl/CEP/CS1/CS1_DataSquasher/src/SquasherProcessControl.cc
index 9c068f23580..521796ab23b 100644
--- a/Appl/CEP/CS1/CS1_DataSquasher/src/SquasherProcessControl.cc
+++ b/Appl/CEP/CS1/CS1_DataSquasher/src/SquasherProcessControl.cc
@@ -18,6 +18,7 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
+#include <lofar_config.h>
 #include <iostream>
 #include <cstdlib>
 #include <string>
diff --git a/Appl/CEP/CS1/CS1_Flagger/src/ComplexMedianFlagger.cc b/Appl/CEP/CS1/CS1_Flagger/src/ComplexMedianFlagger.cc
index a32d7e89fb8..db8569c8c6b 100644
--- a/Appl/CEP/CS1/CS1_Flagger/src/ComplexMedianFlagger.cc
+++ b/Appl/CEP/CS1/CS1_Flagger/src/ComplexMedianFlagger.cc
@@ -17,6 +17,7 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
+#include <lofar_config.h>
 #include <tables/Tables.h>
 #include <tables/Tables/TableIter.h>
 #include "ComplexMedianFlagger.h"
diff --git a/Appl/CEP/CS1/CS1_Flagger/src/Flagger.cc b/Appl/CEP/CS1/CS1_Flagger/src/Flagger.cc
index de83a958788..e1915910818 100644
--- a/Appl/CEP/CS1/CS1_Flagger/src/Flagger.cc
+++ b/Appl/CEP/CS1/CS1_Flagger/src/Flagger.cc
@@ -19,9 +19,7 @@
  ***************************************************************************/
 
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include <lofar_config.h>
 #include <libgen.h>
 #include <PLC/ACCmain.h>
 #include <casa/Exceptions.h>
diff --git a/Appl/CEP/CS1/CS1_Flagger/src/FlaggerProcessControl.cc b/Appl/CEP/CS1/CS1_Flagger/src/FlaggerProcessControl.cc
index 6a25c656d76..f03bfdd2378 100644
--- a/Appl/CEP/CS1/CS1_Flagger/src/FlaggerProcessControl.cc
+++ b/Appl/CEP/CS1/CS1_Flagger/src/FlaggerProcessControl.cc
@@ -18,6 +18,7 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
+#include <lofar_config.h>
 #include <iostream>
 #include <cstdlib>
 #include <iostream>
diff --git a/Appl/CEP/CS1/CS1_Flagger/src/MS_File.cc b/Appl/CEP/CS1/CS1_Flagger/src/MS_File.cc
index e2bf6e9830c..ddb935788f2 100644
--- a/Appl/CEP/CS1/CS1_Flagger/src/MS_File.cc
+++ b/Appl/CEP/CS1/CS1_Flagger/src/MS_File.cc
@@ -17,6 +17,8 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
+
+#include <lofar_config.h>
 #include <casa/BasicMath/Math.h>
 #include <casa/Arrays.h>
 //#include <casa/Quanta/MVTime.h>
diff --git a/Appl/CEP/CS1/CS1_Flagger2/src/ComplexMedianFlagger2.cc b/Appl/CEP/CS1/CS1_Flagger2/src/ComplexMedianFlagger2.cc
index f578afd287f..9ca299a8a7c 100644
--- a/Appl/CEP/CS1/CS1_Flagger2/src/ComplexMedianFlagger2.cc
+++ b/Appl/CEP/CS1/CS1_Flagger2/src/ComplexMedianFlagger2.cc
@@ -17,6 +17,7 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
+#include <lofar_config.h>
 #include <tables/Tables.h>
 #include <tables/Tables/TableIter.h>
 #include "ComplexMedianFlagger2.h"
diff --git a/Appl/CEP/CS1/CS1_Flagger2/src/Flagger.cc b/Appl/CEP/CS1/CS1_Flagger2/src/Flagger.cc
index d215eea77e2..c60e12edde6 100644
--- a/Appl/CEP/CS1/CS1_Flagger2/src/Flagger.cc
+++ b/Appl/CEP/CS1/CS1_Flagger2/src/Flagger.cc
@@ -18,10 +18,7 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include <lofar_config.h>
 #include <libgen.h>
 #include <PLC/ACCmain.h>
 #include <casa/Exceptions.h>
diff --git a/Appl/CEP/CS1/CS1_Flagger2/src/FlaggerProcessControl.cc b/Appl/CEP/CS1/CS1_Flagger2/src/FlaggerProcessControl.cc
index 0ed081245cc..7c6d940658b 100644
--- a/Appl/CEP/CS1/CS1_Flagger2/src/FlaggerProcessControl.cc
+++ b/Appl/CEP/CS1/CS1_Flagger2/src/FlaggerProcessControl.cc
@@ -18,6 +18,7 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
+#include <lofar_config.h>
 #include <iostream>
 #include <cstdlib>
 #include <iostream>
diff --git a/Appl/CEP/CS1/CS1_Flagger2/src/MS_File.cc b/Appl/CEP/CS1/CS1_Flagger2/src/MS_File.cc
index 3f32c23bff6..e823789d0a8 100644
--- a/Appl/CEP/CS1/CS1_Flagger2/src/MS_File.cc
+++ b/Appl/CEP/CS1/CS1_Flagger2/src/MS_File.cc
@@ -17,6 +17,7 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
+#include <lofar_config.h>
 #include <casa/BasicMath/Math.h>
 #include <casa/Arrays.h>
 //#include <casa/Quanta/MVTime.h>
diff --git a/Appl/CEP/CS1/CS1_FrequencyFlagger/src/Flagger.cc b/Appl/CEP/CS1/CS1_FrequencyFlagger/src/Flagger.cc
index de83a958788..e1915910818 100644
--- a/Appl/CEP/CS1/CS1_FrequencyFlagger/src/Flagger.cc
+++ b/Appl/CEP/CS1/CS1_FrequencyFlagger/src/Flagger.cc
@@ -19,9 +19,7 @@
  ***************************************************************************/
 
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include <lofar_config.h>
 #include <libgen.h>
 #include <PLC/ACCmain.h>
 #include <casa/Exceptions.h>
diff --git a/Appl/CEP/CS1/CS1_FrequencyFlagger/src/FlaggerProcessControl.cc b/Appl/CEP/CS1/CS1_FrequencyFlagger/src/FlaggerProcessControl.cc
index bb389bfb3dd..0a0e0a78b0b 100644
--- a/Appl/CEP/CS1/CS1_FrequencyFlagger/src/FlaggerProcessControl.cc
+++ b/Appl/CEP/CS1/CS1_FrequencyFlagger/src/FlaggerProcessControl.cc
@@ -18,6 +18,7 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
+#include <lofar_config.h>
 #include <iostream>
 #include <cstdlib>
 #include <iostream>
diff --git a/Appl/CEP/CS1/CS1_FrequencyFlagger/src/FrequencyFlagger.cc b/Appl/CEP/CS1/CS1_FrequencyFlagger/src/FrequencyFlagger.cc
index cbde4f5c52e..8c3defc344c 100644
--- a/Appl/CEP/CS1/CS1_FrequencyFlagger/src/FrequencyFlagger.cc
+++ b/Appl/CEP/CS1/CS1_FrequencyFlagger/src/FrequencyFlagger.cc
@@ -17,6 +17,7 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
+#include <lofar_config.h>
 #include <tables/Tables.h>
 #include <tables/Tables/TableIter.h>
 #include "FrequencyFlagger.h"
diff --git a/Appl/CEP/CS1/CS1_FrequencyFlagger/src/MS_File.cc b/Appl/CEP/CS1/CS1_FrequencyFlagger/src/MS_File.cc
index 92968f9ed91..1ffbe9771c3 100644
--- a/Appl/CEP/CS1/CS1_FrequencyFlagger/src/MS_File.cc
+++ b/Appl/CEP/CS1/CS1_FrequencyFlagger/src/MS_File.cc
@@ -17,6 +17,7 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
+#include <lofar_config.h>
 #include <casa/BasicMath/Math.h>
 #include <casa/Arrays.h>
 //#include <casa/Quanta/MVTime.h>
diff --git a/Appl/CEP/CS1/CS1_SPWCombine/src/Combiner.cc b/Appl/CEP/CS1/CS1_SPWCombine/src/Combiner.cc
index caf8a9bb7c5..88d3a5d1989 100644
--- a/Appl/CEP/CS1/CS1_SPWCombine/src/Combiner.cc
+++ b/Appl/CEP/CS1/CS1_SPWCombine/src/Combiner.cc
@@ -18,10 +18,7 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include <lofar_config.h>
 #include <libgen.h>
 #include <PLC/ACCmain.h>
 #include <casa/Exceptions.h>
diff --git a/Appl/CEP/CS1/CS1_SPWCombine/src/CombinerProcessControl.cc b/Appl/CEP/CS1/CS1_SPWCombine/src/CombinerProcessControl.cc
index 4521d66a8bd..973c5a76015 100644
--- a/Appl/CEP/CS1/CS1_SPWCombine/src/CombinerProcessControl.cc
+++ b/Appl/CEP/CS1/CS1_SPWCombine/src/CombinerProcessControl.cc
@@ -18,6 +18,7 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
+#include <lofar_config.h>
 #include <iostream>
 #include <cstdlib>
 #include <string>
diff --git a/Appl/CEP/CS1/CS1_SPWCombine/src/SPWCombine.cc b/Appl/CEP/CS1/CS1_SPWCombine/src/SPWCombine.cc
index 84df4896987..0c44ea25185 100644
--- a/Appl/CEP/CS1/CS1_SPWCombine/src/SPWCombine.cc
+++ b/Appl/CEP/CS1/CS1_SPWCombine/src/SPWCombine.cc
@@ -17,6 +17,7 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
+#include <lofar_config.h>
 #include "SPWCombine.h"
 namespace LOFAR
 {
diff --git a/Appl/CEP/CS1/lofarconf.in b/Appl/CEP/CS1/lofarconf.in
index 3d60d2ef36e..098729e5bcd 100644
--- a/Appl/CEP/CS1/lofarconf.in
+++ b/Appl/CEP/CS1/lofarconf.in
@@ -1,7 +1,19 @@
 CS1_BGLProc			#short description
-CS1_DelayCompensation		#short description
-CS1_Flagger			#short description
-CS1_Imager			#short description
-CS1_IONProc			#short description
+CS1_DFTImager   #Discrete Fourrier Transform Imager
+CS1_FrequencyFlagger    #Frequency Flagger
+CS1_Flagger			#Complex Median Imager
+CS1_Flagger2		#Complex Median Imager 2
+CS1_Imager			#Wrapper for AIPS++ imager
+CS1_BinningFlagger    # Binning Flagger
+CS1_pp_lib    # postprocessing library and (I)DPPP
+#CS1_Run     #short description
+CS1_BandpassCorrector # bandpass corrector
+#CS1_BBS   #wrapper for BBS
+CS1_DataSquasher    #Data compression
+CS1_ObserverTool    # tool for observers
+CS1_SPWCombine    #SPW combiner
+#CS1_IONProc   #short description
+#CS1_Generator   #short description
 CS1_Interface			#short description
 CS1_Storage			#short description
+#CS1_Tools     #short description
-- 
GitLab