Compute Matched filter power

CMakeLists.txt

@@ -4,6 +4,10 @@
 # Minimum cmake verison 3.1 required for the variable CMAKE_CXX_STANDARD
 cmake_minimum_required (VERSION 3.1)
 
+#probably shouldn't go here like that but I don't know where it has to go
+#feel free to fix it
+add_compile_options(-march=native -mfma)
+
 
 # Define the project
 cmake_policy( SET CMP0048 NEW ) # version in project()
@@ -212,7 +216,8 @@ else (DLIB_FOUND)
 endif (DLIB_FOUND)
 
 # OpenMP
-#find_package (OpenMP)
+find_package (OpenMP)
+
 if (OPENMP_FOUND AND NOT Katydid_SINGLETHREADED)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")

Examples/ConfigFiles/MatchedFilterConfig.yaml

@@ -0,0 +1,97 @@
+processor-toolbox:
+
+    processors:
+
+        - type: egg-processor
+          name: egg1
+        - type: matrix-aggregator
+          name: matrix1
+        - type: template-converter
+          name: to-template
+
+        - type: egg-processor
+          name: egg2
+        - type: matrix-aggregator
+          name: matrix2
+
+        - type: inner-product
+          name: prod
+        - type: inner-product-optimizer
+          name: optimize
+
+    connections:
+
+        # First egg processing
+        - signal: "egg1:ts"
+          slot: "matrix1:ts-fftw"
+
+        - signal: "matrix1:matrix"
+          slot: "to-template:ts-matrix"
+
+        - signal: "to-template:template-matrix"
+          slot: "prod:template-matrix"
+
+        # Second egg processing
+        - signal: "egg2:ts"
+          slot: "matrix2:ts-fftw"
+
+        - signal: "matrix2:matrix"
+          slot: "prod:data-matrix"
+
+        - signal: "prod:snr-matrix"
+          slot: "optimize:snr-matrix"
+
+
+    run-queue:
+        - egg1
+        - egg2
+
+
+egg1:
+    filenames: ["locust_mc_Seed395_LO25.8781G_Radius0.100_Pos0.009.egg",
+               "locust_mc_Seed385_LO25.8781G_Radius0.100_Pos0.009.egg",
+               "locust_mc_Seed390_LO25.8781G_Radius0.100_Pos0.009.egg",
+               "locust_mc_Seed395_LO25.8781G_Radius0.100_Pos0.009.egg",
+               "locust_mc_Seed390_LO25.8781G_Radius0.100_Pos0.009.egg",
+               "locust_mc_Seed395_LO25.8781G_Radius0.100_Pos0.009.egg",
+               "locust_mc_Seed385_LO25.8781G_Radius0.100_Pos0.009.egg",
+               "locust_mc_Seed385_LO25.8781G_Radius0.100_Pos0.009.egg",
+               "locust_mc_Seed385_LO25.8781G_Radius0.100_Pos0.009.egg",
+               "locust_mc_Seed385_LO25.8781G_Radius0.100_Pos0.009.egg",
+               "locust_mc_Seed385_LO25.8781G_Radius0.100_Pos0.009.egg",
+               "locust_mc_Seed385_LO25.8781G_Radius0.100_Pos0.009.egg",
+               "locust_mc_Seed385_LO25.8781G_Radius0.100_Pos0.009.egg",
+               "locust_mc_Seed385_LO25.8781G_Radius0.100_Pos0.009.egg",
+               "locust_mc_Seed385_LO25.8781G_Radius0.100_Pos0.009.egg"]
+    egg-reader: egg3
+    slice-size: 8192
+
+egg2:
+    filenames: ["locust_mc_Seed395_LO25.8781G_Radius0.100_Pos0.009.egg",
+               "locust_mc_Seed385_LO25.8781G_Radius0.100_Pos0.009.egg",
+               "locust_mc_Seed390_LO25.8781G_Radius0.100_Pos0.009.egg",
+               "locust_mc_Seed395_LO25.8781G_Radius0.100_Pos0.009.egg",
+               "locust_mc_Seed390_LO25.8781G_Radius0.100_Pos0.009.egg",
+               "locust_mc_Seed395_LO25.8781G_Radius0.100_Pos0.009.egg",
+               "locust_mc_Seed385_LO25.8781G_Radius0.100_Pos0.009.egg",
+               "locust_mc_Seed385_LO25.8781G_Radius0.100_Pos0.009.egg",
+               "locust_mc_Seed385_LO25.8781G_Radius0.100_Pos0.009.egg",
+               "locust_mc_Seed385_LO25.8781G_Radius0.100_Pos0.009.egg",
+               "locust_mc_Seed385_LO25.8781G_Radius0.100_Pos0.009.egg",
+               "locust_mc_Seed385_LO25.8781G_Radius0.100_Pos0.009.egg",
+               "locust_mc_Seed385_LO25.8781G_Radius0.100_Pos0.009.egg",
+               "locust_mc_Seed385_LO25.8781G_Radius0.100_Pos0.009.egg",
+               "locust_mc_Seed385_LO25.8781G_Radius0.100_Pos0.009.egg"]
+    egg-reader: egg3
+    slice-size: 8192
+
+matrix1:
+    max-cols: 400
+
+matrix2:
+    max-cols: 400
+
+to-template:
+
+    T: 10
+    bandwidth: 200.0e6

Source/Data/CMakeLists.txt

@@ -23,6 +23,8 @@ set (DATA_HEADERFILES
     SpectrumAnalysis/KTTimeSeriesDistData.hh
     SpectrumAnalysis/KTWV2DData.hh
     SpectrumAnalysis/KTWignerVilleData.hh
+    SpectrumAnalysis/KTInnerProductData.hh
+    SpectrumAnalysis/KTInnerProductOptimizerData.hh
     EventAnalysis/KTClassifierResultsData.hh
     EventAnalysis/KTFrequencyCandidate.hh
     EventAnalysis/KTFrequencyCandidateData.hh
@@ -68,6 +70,8 @@ set (DATA_HEADERFILES
     Transform/KTTimeFrequency.hh
     Transform/KTTimeFrequencyDataPolar.hh
     Transform/KTTimeFrequencyPolar.hh
+    Transform/KTAggregatedTSMatrixData.hh
+    Transform/KTAggregatedTemplateMatrixData.hh
 )
 
 set (DATA_SOURCEFILES
@@ -89,6 +93,8 @@ set (DATA_SOURCEFILES
     SpectrumAnalysis/KTTimeSeriesDistData.cc
     SpectrumAnalysis/KTWV2DData.cc
     SpectrumAnalysis/KTWignerVilleData.cc
+    SpectrumAnalysis/KTInnerProductOptimizerData.cc
+    SpectrumAnalysis/KTInnerProductData.cc
     EventAnalysis/KTClassifierResultsData.cc
     EventAnalysis/KTFrequencyCandidate.cc
     EventAnalysis/KTFrequencyCandidateData.cc
@@ -134,6 +140,8 @@ set (DATA_SOURCEFILES
     Transform/KTTimeFrequency.cc
     Transform/KTTimeFrequencyDataPolar.cc
     Transform/KTTimeFrequencyPolar.cc
+    Transform/KTAggregatedTSMatrixData.cc
+    Transform/KTAggregatedTemplateMatrixData.cc
 )
 
 if (NOT FFTW_FOUND)

Source/Data/SpectrumAnalysis/KTInnerProductData.cc

@@ -0,0 +1,15 @@
+/*
+ * KTInnerProductData.cc
+ *
+ *  Created on: Apr 28, 2021
+ *      Author: F. Thomas
+ */
+
+#include "KTInnerProductData.hh"
+
+
+namespace Katydid
+{
+    const std::string KTInnerProductData::sName("snr-matrix");
+
+} /* namespace Katydid */

Source/Data/SpectrumAnalysis/KTInnerProductData.hh

@@ -0,0 +1,28 @@
+/*
+ * KTInnerProductData.hh
+ *
+ *  Created on: Apr 28, 2021
+ *      Author: F. Thomas
+ */
+
+#ifndef KTINNERPRODUCTDATA_HH_
+#define KTINNERPRODUCTDATA_HH_
+
+#include "KTData.hh"
+#include "KTPhysicalArrayComplex.hh"
+
+
+namespace Katydid
+{
+
+    class KTInnerProductData: public KTPhysicalArray<2, std::complex<double>>, public Nymph::KTExtensibleData< KTInnerProductData >
+    {
+        public:
+
+            static const std::string sName;
+
+    };
+
+} /* namespace Katydid */
+
+#endif /* KTINNERPRODUCTDATA_HH_ */

Source/Data/SpectrumAnalysis/KTInnerProductOptimizerData.cc

@@ -0,0 +1,15 @@
+/*
+ * KTInnerProductOptimizerData.cc
+ *
+ *  Created on: May 5, 2021
+ *      Author: F. Thomas
+ */
+
+#include "KTInnerProductOptimizerData.hh"
+
+
+namespace Katydid
+{
+    const std::string KTInnerProductOptimizerData::sName("match-result");
+
+} /* namespace Katydid */

Source/Data/SpectrumAnalysis/KTInnerProductOptimizerData.hh

@@ -0,0 +1,33 @@
+/*
+ * KTInnerProductOptimizerData.hh
+ *
+ *  Created on: May 5, 2021
+ *      Author: F. Thomas
+ */
+
+#ifndef KTINNERPRODUCTOPTIMIZERDATA_HH_
+#define KTINNERPRODUCTOPTIMIZERDATA_HH_
+
+#include "KTData.hh"
+#include "KTPhysicalArrayComplex.hh"
+
+#include <eigen3/Eigen/Dense>
+
+
+namespace Katydid
+{
+
+    class KTInnerProductOptimizerData: public Nymph::KTExtensibleData< KTInnerProductOptimizerData >
+    {
+        public:
+
+            static const std::string sName;
+
+            Eigen::ArrayXd fMaxVals;
+            Eigen::Array< Eigen::MatrixXf::Index, Eigen::Dynamic, 1> fMaxInds;
+
+    };
+
+} /* namespace Katydid */
+
+#endif /* KTINNERPRODUCTOPTIMIZERDATA_HH_ */

Source/Data/Time/KTTimeSeriesFFTW.cc

@@ -23,13 +23,13 @@ namespace Katydid
 
     KTTimeSeriesFFTW::KTTimeSeriesFFTW() :
             KTTimeSeries(),
-            KTPhysicalArray< 1, fftw_complex >()
+            KTPhysicalArray< 1, std::complex<double> >()
     {
     }
 
     KTTimeSeriesFFTW::KTTimeSeriesFFTW(size_t nBins, double rangeMin, double rangeMax) :
             KTTimeSeries(),
-            KTPhysicalArray< 1, fftw_complex >(nBins, rangeMin, rangeMax)
+            KTPhysicalArray< 1, std::complex<double> >(nBins, rangeMin, rangeMax)
     {
     }
 
@@ -42,26 +42,11 @@ namespace Katydid
         }
         for (unsigned iBin = 0; iBin < nBins; ++iBin)
         {
-            std::copy(value.begin(), value.end(), fData[iBin]);
+            std::copy(value.begin(), value.end(), &fData[iBin]);
         }
+
     }
-
-    KTTimeSeriesFFTW::KTTimeSeriesFFTW(const KTTimeSeriesFFTW& orig) :
-            KTTimeSeries(),
-            KTPhysicalArray< 1, fftw_complex >(orig)
-    {
-    }
-
-    KTTimeSeriesFFTW::~KTTimeSeriesFFTW()
-    {
-    }
-
-    KTTimeSeriesFFTW& KTTimeSeriesFFTW::operator=(const KTTimeSeriesFFTW& rhs)
-    {
-        KTPhysicalArray< 1, fftw_complex >::operator=(rhs);
-        return *this;
-    }
-
+
     void KTTimeSeriesFFTW::Print(unsigned startPrint, unsigned nToPrint) const
     {
         stringstream printStream;
@@ -81,7 +66,7 @@ namespace Katydid
         TH1D* hist = new TH1D(name.c_str(), "Time Series", (int)nBins, GetRangeMin(), GetRangeMax());
         for (unsigned iBin=0; iBin<nBins; ++iBin)
         {
-            hist->SetBinContent((int)iBin+1, (*this)(iBin)[0]);
+            hist->SetBinContent((int)iBin+1, (*this)(iBin).real());
         }
         hist->SetXTitle("Time (s)");
         hist->SetYTitle("Voltage (V)");
@@ -96,7 +81,7 @@ namespace Katydid
         double value;
         for (unsigned iBin=0; iBin<nBins; ++iBin)
         {
-            value = (*this)(iBin)[0];
+            value = (*this)(iBin).real();
             //value *= value;
             if (value < tMinMag) tMinMag = value;
             if (value > tMaxMag) tMaxMag = value;
@@ -107,7 +92,7 @@ namespace Katydid
         {
             //value = (*this)(iBin)[0];
             //hist->Fill(value*value);
-            hist->Fill((*this)(iBin)[0]);
+            hist->Fill((*this)(iBin).real());
         }
         hist->SetXTitle("Voltage (V)");
         return hist;