From a04596290d8e9375e1ab2bcad9e4574ccfd8189b Mon Sep 17 00:00:00 2001
From: Jan David Mol <mol@astron.nl>
Date: Tue, 29 Jul 2014 06:18:32 +0000
Subject: [PATCH] Task #5905: Renamed BeamFormerFactories -> KernelFactories

---
 RTCP/Cobalt/GPUProc/src/CMakeLists.txt                      | 2 +-
 .../{BeamFormerFactories.h => KernelFactories.h}            | 6 +++---
 RTCP/Cobalt/GPUProc/src/cuda/Pipelines/BeamFormerPipeline.h | 4 ++--
 .../GPUProc/src/cuda/SubbandProcs/BeamFormerCoherentStep.h  | 2 +-
 .../{BeamFormerFactories.cc => KernelFactories.cc}          | 6 +++---
 .../{BeamFormerFactories.h => KernelFactories.h}            | 6 +++---
 RTCP/Cobalt/GPUProc/src/cuda/SubbandProcs/SubbandProc.cc    | 4 ++--
 RTCP/Cobalt/GPUProc/src/cuda/SubbandProcs/SubbandProc.h     | 4 ++--
 .../test/SubbandProcs/tBeamFormerSubbandProcProcessSb.cc    | 4 ++--
 .../tCoherentStokesBeamFormerSubbandProcProcessSb.cc        | 4 ++--
 .../test/SubbandProcs/tCorrelatorSubbandProcProcessSb.cc    | 4 ++--
 .../SubbandProcs/tFlysEyeBeamFormerSubbandProcProcessSb.cc  | 4 ++--
 12 files changed, 25 insertions(+), 25 deletions(-)
 rename RTCP/Cobalt/GPUProc/src/SubbandProcs/{BeamFormerFactories.h => KernelFactories.h} (89%)
 rename RTCP/Cobalt/GPUProc/src/cuda/SubbandProcs/{BeamFormerFactories.cc => KernelFactories.cc} (93%)
 rename RTCP/Cobalt/GPUProc/src/cuda/SubbandProcs/{BeamFormerFactories.h => KernelFactories.h} (94%)

diff --git a/RTCP/Cobalt/GPUProc/src/CMakeLists.txt b/RTCP/Cobalt/GPUProc/src/CMakeLists.txt
index 44ee8edd998..c1182b55f46 100644
--- a/RTCP/Cobalt/GPUProc/src/CMakeLists.txt
+++ b/RTCP/Cobalt/GPUProc/src/CMakeLists.txt
@@ -58,7 +58,7 @@ if(USE_CUDA)
     cuda/SubbandProcs/SubbandProc.cc
     cuda/SubbandProcs/SubbandProcInputData.cc
     cuda/SubbandProcs/SubbandProcOutputData.cc
-    cuda/SubbandProcs/BeamFormerFactories.cc
+    cuda/SubbandProcs/KernelFactories.cc
     cuda/SubbandProcs/CorrelatorStep.cc
     cuda/SubbandProcs/BeamFormerPreprocessingStep.cc
     cuda/SubbandProcs/BeamFormerCoherentStep.cc
diff --git a/RTCP/Cobalt/GPUProc/src/SubbandProcs/BeamFormerFactories.h b/RTCP/Cobalt/GPUProc/src/SubbandProcs/KernelFactories.h
similarity index 89%
rename from RTCP/Cobalt/GPUProc/src/SubbandProcs/BeamFormerFactories.h
rename to RTCP/Cobalt/GPUProc/src/SubbandProcs/KernelFactories.h
index fbcebcdcff7..5990243f2e8 100644
--- a/RTCP/Cobalt/GPUProc/src/SubbandProcs/BeamFormerFactories.h
+++ b/RTCP/Cobalt/GPUProc/src/SubbandProcs/KernelFactories.h
@@ -1,4 +1,4 @@
-//# BeamFormerFactories.h
+//# KernelFactories.h
 //#
 //# Copyright (C) 2013  ASTRON (Netherlands Institute for Radio Astronomy)
 //# P.O. Box 2, 7990 AA Dwingeloo, The Netherlands
@@ -30,9 +30,9 @@
 #endif
 
 #if defined (USE_CUDA)
-# include <GPUProc/cuda/SubbandProcs/BeamFormerFactories.h>
+# include <GPUProc/cuda/SubbandProcs/KernelFactories.h>
 #elif defined (USE_OPENCL)
-# include <GPUProc/opencl/SubbandProcs/BeamFormerFactories.h>
+# include <GPUProc/opencl/SubbandProcs/KernelFactories.h>
 #else
 # error "Either CUDA or OpenCL must be enabled, not neither"
 #endif
diff --git a/RTCP/Cobalt/GPUProc/src/cuda/Pipelines/BeamFormerPipeline.h b/RTCP/Cobalt/GPUProc/src/cuda/Pipelines/BeamFormerPipeline.h
index 7ad287c2403..bb945fa0987 100644
--- a/RTCP/Cobalt/GPUProc/src/cuda/Pipelines/BeamFormerPipeline.h
+++ b/RTCP/Cobalt/GPUProc/src/cuda/Pipelines/BeamFormerPipeline.h
@@ -30,7 +30,7 @@
 
 #include <MACIO/RTmetadata.h>
 
-#include <GPUProc/SubbandProcs/BeamFormerFactories.h>
+#include <GPUProc/SubbandProcs/KernelFactories.h>
 
 namespace LOFAR
 {
@@ -76,7 +76,7 @@ namespace LOFAR
       TABTranspose::MultiSender multiSender;
 
     private:
-      BeamFormerFactories factories;
+      KernelFactories factories;
     };
   }
 }
diff --git a/RTCP/Cobalt/GPUProc/src/cuda/SubbandProcs/BeamFormerCoherentStep.h b/RTCP/Cobalt/GPUProc/src/cuda/SubbandProcs/BeamFormerCoherentStep.h
index 12572f7953f..f345dafe64d 100644
--- a/RTCP/Cobalt/GPUProc/src/cuda/SubbandProcs/BeamFormerCoherentStep.h
+++ b/RTCP/Cobalt/GPUProc/src/cuda/SubbandProcs/BeamFormerCoherentStep.h
@@ -50,7 +50,7 @@ namespace LOFAR
   namespace Cobalt
   {
     //# Forward declarations
-    struct BeamFormerFactories;
+    struct KernelFactories;
 
     class BeamFormerCoherentStep: public ProcessStep
     {
diff --git a/RTCP/Cobalt/GPUProc/src/cuda/SubbandProcs/BeamFormerFactories.cc b/RTCP/Cobalt/GPUProc/src/cuda/SubbandProcs/KernelFactories.cc
similarity index 93%
rename from RTCP/Cobalt/GPUProc/src/cuda/SubbandProcs/BeamFormerFactories.cc
rename to RTCP/Cobalt/GPUProc/src/cuda/SubbandProcs/KernelFactories.cc
index 1b90590e423..1f4791af45e 100644
--- a/RTCP/Cobalt/GPUProc/src/cuda/SubbandProcs/BeamFormerFactories.cc
+++ b/RTCP/Cobalt/GPUProc/src/cuda/SubbandProcs/KernelFactories.cc
@@ -1,4 +1,4 @@
-//# BeamFormerFactories.cc
+//# KernelFactories.cc
 //#
 //# Copyright (C) 2012-2013  ASTRON (Netherlands Institute for Radio Astronomy)
 //# P.O. Box 2, 7990 AA Dwingeloo, The Netherlands
@@ -21,13 +21,13 @@
 
 #include <lofar_config.h>
 
-#include "BeamFormerFactories.h"
+#include "KernelFactories.h"
 
 namespace LOFAR
 {
   namespace Cobalt
   {
-    BeamFormerFactories::BeamFormerFactories(const Parset &ps,
+    KernelFactories::KernelFactories(const Parset &ps,
                                              size_t nrSubbandsPerSubbandProc) :
       correlator(ps.settings.correlator.enabled
         ? new CorrelatorStep::Factories(ps, nrSubbandsPerSubbandProc)
diff --git a/RTCP/Cobalt/GPUProc/src/cuda/SubbandProcs/BeamFormerFactories.h b/RTCP/Cobalt/GPUProc/src/cuda/SubbandProcs/KernelFactories.h
similarity index 94%
rename from RTCP/Cobalt/GPUProc/src/cuda/SubbandProcs/BeamFormerFactories.h
rename to RTCP/Cobalt/GPUProc/src/cuda/SubbandProcs/KernelFactories.h
index dad94bb9a11..c58eaaf914f 100644
--- a/RTCP/Cobalt/GPUProc/src/cuda/SubbandProcs/BeamFormerFactories.h
+++ b/RTCP/Cobalt/GPUProc/src/cuda/SubbandProcs/KernelFactories.h
@@ -1,4 +1,4 @@
-//# BeamFormerFactories.h
+//# KernelFactories.h
 //#
 //# Copyright (C) 2012-2013  ASTRON (Netherlands Institute for Radio Astronomy)
 //# P.O. Box 2, 7990 AA Dwingeloo, The Netherlands
@@ -34,9 +34,9 @@ namespace LOFAR
 {
   namespace Cobalt
   {
-    struct BeamFormerFactories
+    struct KernelFactories
     {
-      BeamFormerFactories(const Parset &ps, 
+      KernelFactories(const Parset &ps, 
                             size_t nrSubbandsPerSubbandProc = 1);
 
       SmartPtr<CorrelatorStep::Factories> correlator;
diff --git a/RTCP/Cobalt/GPUProc/src/cuda/SubbandProcs/SubbandProc.cc b/RTCP/Cobalt/GPUProc/src/cuda/SubbandProcs/SubbandProc.cc
index ea4a4018017..e1aaae070a6 100644
--- a/RTCP/Cobalt/GPUProc/src/cuda/SubbandProcs/SubbandProc.cc
+++ b/RTCP/Cobalt/GPUProc/src/cuda/SubbandProcs/SubbandProc.cc
@@ -21,7 +21,7 @@
 #include <lofar_config.h>
 
 #include "SubbandProc.h"
-#include "BeamFormerFactories.h"
+#include "KernelFactories.h"
 
 #include <GPUProc/global_defines.h>
 #include <GPUProc/gpu_wrapper.h>
@@ -41,7 +41,7 @@ namespace LOFAR
     SubbandProc::SubbandProc(
       const Parset &ps,
       gpu::Context &context,
-      BeamFormerFactories &factories,
+      KernelFactories &factories,
       size_t nrSubbandsPerSubbandProc)
     :
       inputPool("SubbandProc::inputPool"),
diff --git a/RTCP/Cobalt/GPUProc/src/cuda/SubbandProcs/SubbandProc.h b/RTCP/Cobalt/GPUProc/src/cuda/SubbandProcs/SubbandProc.h
index dd9c8112997..ecf9b8043ee 100644
--- a/RTCP/Cobalt/GPUProc/src/cuda/SubbandProcs/SubbandProc.h
+++ b/RTCP/Cobalt/GPUProc/src/cuda/SubbandProcs/SubbandProc.h
@@ -54,7 +54,7 @@ namespace LOFAR
   namespace Cobalt
   {
     //# Forward declarations
-    struct BeamFormerFactories;
+    struct KernelFactories;
 
     /*
      * The SubbandProc does the following transformation:
@@ -98,7 +98,7 @@ namespace LOFAR
     class SubbandProc {
     public:
       SubbandProc(const Parset &ps, gpu::Context &context,
-                  BeamFormerFactories &factories,
+                  KernelFactories &factories,
                   size_t nrSubbandsPerSubbandProc = 1);
 
       class Flagger
diff --git a/RTCP/Cobalt/GPUProc/test/SubbandProcs/tBeamFormerSubbandProcProcessSb.cc b/RTCP/Cobalt/GPUProc/test/SubbandProcs/tBeamFormerSubbandProcProcessSb.cc
index 920fdcff6c5..b841e8008cf 100644
--- a/RTCP/Cobalt/GPUProc/test/SubbandProcs/tBeamFormerSubbandProcProcessSb.cc
+++ b/RTCP/Cobalt/GPUProc/test/SubbandProcs/tBeamFormerSubbandProcProcessSb.cc
@@ -30,7 +30,7 @@
 #include <CoInterface/fpequals.h>
 #include <GPUProc/gpu_utils.h>
 #include <GPUProc/SubbandProcs/SubbandProc.h>
-#include <GPUProc/SubbandProcs/BeamFormerFactories.h>
+#include <GPUProc/SubbandProcs/KernelFactories.h>
 
 using namespace std;
 using namespace LOFAR::Cobalt;
@@ -112,7 +112,7 @@ int main() {
   // correction (but that kernel will run to convert int to float and to
   // transform the data order).
 
-  BeamFormerFactories factories(ps);
+  KernelFactories factories(ps);
   SubbandProc bwq(ps, ctx, factories);
 
   SubbandProcInputData in(ps, ctx);
diff --git a/RTCP/Cobalt/GPUProc/test/SubbandProcs/tCoherentStokesBeamFormerSubbandProcProcessSb.cc b/RTCP/Cobalt/GPUProc/test/SubbandProcs/tCoherentStokesBeamFormerSubbandProcProcessSb.cc
index e7934ad830e..2924f7e99cd 100644
--- a/RTCP/Cobalt/GPUProc/test/SubbandProcs/tCoherentStokesBeamFormerSubbandProcProcessSb.cc
+++ b/RTCP/Cobalt/GPUProc/test/SubbandProcs/tCoherentStokesBeamFormerSubbandProcProcessSb.cc
@@ -30,7 +30,7 @@
 #include <CoInterface/fpequals.h>
 #include <GPUProc/gpu_utils.h>
 #include <GPUProc/SubbandProcs/SubbandProc.h>
-#include <GPUProc/SubbandProcs/BeamFormerFactories.h>
+#include <GPUProc/SubbandProcs/KernelFactories.h>
 
 #include "../Kernels/KernelTestHelpers.h"
 
@@ -141,7 +141,7 @@ int main(/*int argc, char *argv[]*/) {
   // correction (but that kernel will run to convert int to float and to
   // transform the data order).
 
-  BeamFormerFactories factories(ps);
+  KernelFactories factories(ps);
   SubbandProc bwq(ps, ctx, factories);
 
   SubbandProcInputData in(
diff --git a/RTCP/Cobalt/GPUProc/test/SubbandProcs/tCorrelatorSubbandProcProcessSb.cc b/RTCP/Cobalt/GPUProc/test/SubbandProcs/tCorrelatorSubbandProcProcessSb.cc
index bc9f88f9f00..fa970874313 100644
--- a/RTCP/Cobalt/GPUProc/test/SubbandProcs/tCorrelatorSubbandProcProcessSb.cc
+++ b/RTCP/Cobalt/GPUProc/test/SubbandProcs/tCorrelatorSubbandProcProcessSb.cc
@@ -26,7 +26,7 @@
 #include <CoInterface/fpequals.h>
 #include <CoInterface/Parset.h>
 #include <GPUProc/gpu_utils.h>
-#include <GPUProc/SubbandProcs/BeamFormerFactories.h>
+#include <GPUProc/SubbandProcs/KernelFactories.h>
 #include <GPUProc/SubbandProcs/SubbandProc.h>
 
 using namespace std;
@@ -83,7 +83,7 @@ int main() {
   // correction (but that kernel will run to convert int to float and to
   // transform the data order).
 
-  BeamFormerFactories factories(ps, 1);
+  KernelFactories factories(ps, 1);
   SubbandProc cwq(ps, ctx, factories);
 
   SubbandProcInputData in(
diff --git a/RTCP/Cobalt/GPUProc/test/SubbandProcs/tFlysEyeBeamFormerSubbandProcProcessSb.cc b/RTCP/Cobalt/GPUProc/test/SubbandProcs/tFlysEyeBeamFormerSubbandProcProcessSb.cc
index 7fd3b2d02f1..c746e079f14 100644
--- a/RTCP/Cobalt/GPUProc/test/SubbandProcs/tFlysEyeBeamFormerSubbandProcProcessSb.cc
+++ b/RTCP/Cobalt/GPUProc/test/SubbandProcs/tFlysEyeBeamFormerSubbandProcProcessSb.cc
@@ -31,7 +31,7 @@
 #include <CoInterface/fpequals.h>
 #include <GPUProc/gpu_utils.h>
 #include <GPUProc/SubbandProcs/SubbandProc.h>
-#include <GPUProc/SubbandProcs/BeamFormerFactories.h>
+#include <GPUProc/SubbandProcs/KernelFactories.h>
 
 using namespace std;
 using namespace LOFAR::Cobalt;
@@ -129,7 +129,7 @@ int main() {
   // correction (but that kernel will run to convert int to float and to
   // transform the data order).
 
-  BeamFormerFactories factories(ps);
+  KernelFactories factories(ps);
   SubbandProc bwq(ps, ctx, factories);
 
   SubbandProcInputData in(
-- 
GitLab