Changeset 3431

Timestamp:

04/18/07 14:49:12 (6 years ago)

Author:

jgaeddert

Message:

Normalizing filter bank coefficients

Location:

SigProc/trunk/SigProc

Files:

• autotest_sources/FIRPolyphaseFilterBank_testsuite.h (modified) (2 diffs)
• filters.cpp (modified) (2 diffs)

SigProc/trunk/SigProc/autotest_sources/FIRPolyphaseFilterBank_testsuite.h

@@ -42 +42 @@
         
         for (unsigned int i=0; i<12; i++) {
-            TS_ASSERT_DELTA( H[0 +i], f0[i], 0.00001f );
-            TS_ASSERT_DELTA( H[12+i], f1[i], 0.00001f );
-            TS_ASSERT_DELTA( H[24+i], f2[i], 0.00001f );
-            TS_ASSERT_DELTA( H[36+i], f3[i], 0.00001f );
+            // Need to multiply by 'k' to compensate for filterbank scaling
+            TS_ASSERT_DELTA( H[0 +i]*k, f0[i], 0.00001f );
+            TS_ASSERT_DELTA( H[12+i]*k, f1[i], 0.00001f );
+            TS_ASSERT_DELTA( H[24+i]*k, f2[i], 0.00001f );
+            TS_ASSERT_DELTA( H[36+i]*k, f3[i], 0.00001f );
         }
     }
@@ -77 +78 @@
         
         for (unsigned int i=0; i<12; i++) {
-            TS_ASSERT_DELTA( H[0 +i], f0[i], 0.00001f );
-            TS_ASSERT_DELTA( H[12+i], f1[i], 0.00001f );
-            TS_ASSERT_DELTA( H[24+i], f2[i], 0.00001f );
-            TS_ASSERT_DELTA( H[36+i], f3[i], 0.00001f );
+            // Need to multiply by 'k' to compensate for filterbank scaling
+            TS_ASSERT_DELTA( H[0 +i]*k, f0[i], 0.00001f );
+            TS_ASSERT_DELTA( H[12+i]*k, f1[i], 0.00001f );
+            TS_ASSERT_DELTA( H[24+i]*k, f2[i], 0.00001f );
+            TS_ASSERT_DELTA( H[36+i]*k, f3[i], 0.00001f );
         }
 

SigProc/trunk/SigProc/filters.cpp

@@ -280 +280 @@
 
     // Ensure yf is within the scope of short int
-    if ( yf < SHRT_MIN )
+    if ( yf < SHRT_MIN ) {
         y = SHRT_MIN;
-    else if ( yf > SHRT_MAX )
+    } else if ( yf > SHRT_MAX ) {
         y = SHRT_MAX;
-    else
+    } else {
         y = (short) yf;
+    }
 
 }
@@ -360 +361 @@
     // create over-sampled pulse
     SigProc::DesignRRCFilter(Npfb*k, m, beta, H, h_len);
+
+    // Apply scaling factor to filter coefficients
+    float h_scale = float(k);
+    for (unsigned int i=0; i<h_len; i++)
+        H[i] /= h_scale;
 
     //