Changeset 6326

Timestamp:

02/01/08 15:02:31 (5 years ago)

Author:

jgaeddert

Message:

updating decimator to use calculated coefficients only when none are specified in the properties list

Location:

components/Decimator/branches/Decimator-0.6.2

Files:

• Decimator.cpp (modified) (2 diffs)
• Decimator.h (modified) (2 diffs)

components/Decimator/branches/Decimator-0.6.2/Decimator.cpp

@@ -32 +32 @@
     //#define PRINT_ENERGY 1
 
-Decimator_i::Decimator_i(const char *uuid, omni_condition *condition) : Resource_impl(uuid), component_running(condition), M(1), sample_count(0), previous_length(0)
+Decimator_i::Decimator_i(const char *uuid, omni_condition *condition) :
+    Resource_impl(uuid),
+    component_running(condition),
+    calculateFilterCoefficients(true),
+    M(1),
+    sample_count(0),
+    previous_length(0)
 {
     // Create the port for output data
@@ -115 +121 @@
             std::cout << "Decimation factor set to " << M << std::endl;
 
-            // calculate filter coefficients dynamically
-            unsigned int m(3);      // filter delay (symbols)
-            float beta(0.5f);       // excess bandwidth factor
-            len_h = 2*D*m+1;        // filter length (samples)
-            delete [] h;
-            h = new float[len_h];
-            SigProc::DesignRRCFilter(D, m, beta, h);
-
-            // delete old filters
-            delete i_filter;
-            delete q_filter;
-
-            // print coefficients
-            unsigned int k;
-            for (k=0; k<len_h; k++)
-                printf("  h[%u] = %E\n", k, h[k]);
-
-            i_filter = new SigProc::fir_filter(h, len_h);
-            q_filter = new SigProc::fir_filter(h, len_h);
+            if (calculateFilterCoefficients) {
+                // calculate filter coefficients dynamically
+                unsigned int m(3);      // filter delay (symbols)
+                float beta(0.5f);       // excess bandwidth factor
+                len_h = 2*D*m+1;        // filter length (samples)
+                delete [] h;
+                h = new float[len_h];
+                SigProc::DesignRRCFilter(D, m, beta, h);
+
+                // delete old filters
+                delete i_filter;
+                delete q_filter;
+
+                // print coefficients
+                for (unsigned int k=0; k<len_h; k++)
+                    DEBUG(2, Decimator, " h[" << k << "] = " << h[k]);
+
+                i_filter = new SigProc::fir_filter(h, len_h);
+                q_filter = new SigProc::fir_filter(h, len_h);
+            }
         } else if (strcmp(props[i].id, "DCE:134e5dd8-c773-47af-a557-2837076358c4") == 0) {
             // filter property, Filter coefficients
-            std::cout << "WARNING: Decimator::configure(), ignoring coefficients property"
-                      << std::endl;
-            break;
-
             CORBA::FloatSeq *coeff_ptr;
             props[i].value >>= coeff_ptr;
 
             len_h = coeff_ptr->length();
-
-            delete []h;
-            delete i_filter;
-            delete q_filter;
-
-            h = new float[len_h];
-            std::cout << "Decimator filter length = " << len_h << std::endl;
-            for (unsigned int k = 0; k < len_h; k++) {
-                h[k] = (*coeff_ptr)[k];
-                std::cout << "Coeff[" << k << "] = " << h[k] << std::endl;
+            
+            if (len_h < 2) {
+                calculateFilterCoefficients = true;
+            } else {
+                calculateFilterCoefficients = false;
+
+                delete []h;
+                delete i_filter;
+                delete q_filter;
+
+                h = new float[len_h];
+                std::cout << "Decimator filter length = " << len_h << std::endl;
+                for (unsigned int k = 0; k < len_h; k++) {
+                    h[k] = (*coeff_ptr)[k];
+                    DEBUG(3, Decimator, "Coeff[" << k << "] = " << h[k])
+                }
+                i_filter = new SigProc::fir_filter(h, len_h);
+                q_filter = new SigProc::fir_filter(h, len_h);
             }
-            i_filter = new SigProc::fir_filter(h, len_h);
-            q_filter = new SigProc::fir_filter(h, len_h);
 
         } else {

components/Decimator/branches/Decimator-0.6.2/Decimator.h

@@ -26 +26 @@
 #include "ossie/cf.h"
 #include "ossie/PortTypes.h"
+#include "ossie/debug.h"
 
 #include "standardinterfaces/complexShort.h"
@@ -67 +68 @@
 
     // For decimation operation
-    float *h;  // Array for filter coefficients
-    unsigned int len_h;  // Length of filter
+    float *h;                           ///< Array for filter coefficients
+    unsigned int len_h;                 ///< Length of filter
+
+    /// Automatically calculate filter coefficients?  This will only happen
+    /// if length of the filter coefficient property is zero
+    bool calculateFilterCoefficients;
 
     unsigned int M;  // Decimation factor