From 65df319167fc5e8506fa142c6b17c85bab32801c Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Sat, 12 May 2018 08:05:46 +0200
Subject: [PATCH] RTL-SDR: fixed inf/sup decimators (2)

---
 sdrbase/dsp/decimatorsu.h | 2210 ++++++++++++++++++++-----------------
 1 file changed, 1222 insertions(+), 988 deletions(-)

diff --git a/sdrbase/dsp/decimatorsu.h b/sdrbase/dsp/decimatorsu.h
index 91a3f1994..36f897634 100644
--- a/sdrbase/dsp/decimatorsu.h
+++ b/sdrbase/dsp/decimatorsu.h
@@ -238,14 +238,14 @@ void DecimatorsU<StorageType, T, SdrBits, InputBits, Shift>::decimate2_inf(Sampl
     for (int pos = 0; pos < len - 7; pos += 8)
     {
         m_decimator2.myDecimateInf(
-                buf[pos+0] << decimation_shifts<SdrBits, InputBits>::pre2,
-                buf[pos+1] << decimation_shifts<SdrBits, InputBits>::pre2,
-                buf[pos+2] << decimation_shifts<SdrBits, InputBits>::pre2,
-                buf[pos+3] << decimation_shifts<SdrBits, InputBits>::pre2,
-                buf[pos+4] << decimation_shifts<SdrBits, InputBits>::pre2,
-                buf[pos+5] << decimation_shifts<SdrBits, InputBits>::pre2,
-                buf[pos+6] << decimation_shifts<SdrBits, InputBits>::pre2,
-                buf[pos+7] << decimation_shifts<SdrBits, InputBits>::pre2,
+                (buf[pos+0] - Shift) << decimation_shifts<SdrBits, InputBits>::pre2,
+                (buf[pos+1] - Shift) << decimation_shifts<SdrBits, InputBits>::pre2,
+                (buf[pos+2] - Shift) << decimation_shifts<SdrBits, InputBits>::pre2,
+                (buf[pos+3] - Shift) << decimation_shifts<SdrBits, InputBits>::pre2,
+                (buf[pos+4] - Shift) << decimation_shifts<SdrBits, InputBits>::pre2,
+                (buf[pos+5] - Shift) << decimation_shifts<SdrBits, InputBits>::pre2,
+                (buf[pos+6] - Shift) << decimation_shifts<SdrBits, InputBits>::pre2,
+                (buf[pos+7] - Shift) << decimation_shifts<SdrBits, InputBits>::pre2,
                 &buf2[0]);
 
         (**it).setReal(buf2[0] >> decimation_shifts<SdrBits, InputBits>::post2);
@@ -266,14 +266,14 @@ void DecimatorsU<StorageType, T, SdrBits, InputBits, Shift>::decimate2_sup(Sampl
     for (int pos = 0; pos < len - 7; pos += 8)
     {
         m_decimator2.myDecimateSup(
-                buf[pos+0] << decimation_shifts<SdrBits, InputBits>::pre2,
-                buf[pos+1] << decimation_shifts<SdrBits, InputBits>::pre2,
-                buf[pos+2] << decimation_shifts<SdrBits, InputBits>::pre2,
-                buf[pos+3] << decimation_shifts<SdrBits, InputBits>::pre2,
-                buf[pos+4] << decimation_shifts<SdrBits, InputBits>::pre2,
-                buf[pos+5] << decimation_shifts<SdrBits, InputBits>::pre2,
-                buf[pos+6] << decimation_shifts<SdrBits, InputBits>::pre2,
-                buf[pos+7] << decimation_shifts<SdrBits, InputBits>::pre2,
+                (buf[pos+0] - Shift) << decimation_shifts<SdrBits, InputBits>::pre2,
+                (buf[pos+1] - Shift) << decimation_shifts<SdrBits, InputBits>::pre2,
+                (buf[pos+2] - Shift) << decimation_shifts<SdrBits, InputBits>::pre2,
+                (buf[pos+3] - Shift) << decimation_shifts<SdrBits, InputBits>::pre2,
+                (buf[pos+4] - Shift) << decimation_shifts<SdrBits, InputBits>::pre2,
+                (buf[pos+5] - Shift) << decimation_shifts<SdrBits, InputBits>::pre2,
+                (buf[pos+6] - Shift) << decimation_shifts<SdrBits, InputBits>::pre2,
+                (buf[pos+7] - Shift) << decimation_shifts<SdrBits, InputBits>::pre2,
                 &buf2[0]);
 
         (**it).setReal(buf2[0] >> decimation_shifts<SdrBits, InputBits>::post2);
@@ -294,25 +294,25 @@ void DecimatorsU<StorageType, T, SdrBits, InputBits, Shift>::decimate4_inf(Sampl
     for (int pos = 0; pos < len - 15; pos += 16)
     {
         m_decimator2.myDecimateInf(
-                buf[pos+0] << decimation_shifts<SdrBits, InputBits>::pre4,
-                buf[pos+1] << decimation_shifts<SdrBits, InputBits>::pre4,
-                buf[pos+2] << decimation_shifts<SdrBits, InputBits>::pre4,
-                buf[pos+3] << decimation_shifts<SdrBits, InputBits>::pre4,
-                buf[pos+4] << decimation_shifts<SdrBits, InputBits>::pre4,
-                buf[pos+5] << decimation_shifts<SdrBits, InputBits>::pre4,
-                buf[pos+6] << decimation_shifts<SdrBits, InputBits>::pre4,
-                buf[pos+7] << decimation_shifts<SdrBits, InputBits>::pre4,
+                (buf[pos+0] - Shift) << decimation_shifts<SdrBits, InputBits>::pre4,
+                (buf[pos+1] - Shift) << decimation_shifts<SdrBits, InputBits>::pre4,
+                (buf[pos+2] - Shift) << decimation_shifts<SdrBits, InputBits>::pre4,
+                (buf[pos+3] - Shift) << decimation_shifts<SdrBits, InputBits>::pre4,
+                (buf[pos+4] - Shift) << decimation_shifts<SdrBits, InputBits>::pre4,
+                (buf[pos+5] - Shift) << decimation_shifts<SdrBits, InputBits>::pre4,
+                (buf[pos+6] - Shift) << decimation_shifts<SdrBits, InputBits>::pre4,
+                (buf[pos+7] - Shift) << decimation_shifts<SdrBits, InputBits>::pre4,
                 &buf2[0]);
 
         m_decimator2.myDecimateInf(
-                buf[pos+8] << decimation_shifts<SdrBits, InputBits>::pre4,
-                buf[pos+9] << decimation_shifts<SdrBits, InputBits>::pre4,
-                buf[pos+10] << decimation_shifts<SdrBits, InputBits>::pre4,
-                buf[pos+11] << decimation_shifts<SdrBits, InputBits>::pre4,
-                buf[pos+12] << decimation_shifts<SdrBits, InputBits>::pre4,
-                buf[pos+13] << decimation_shifts<SdrBits, InputBits>::pre4,
-                buf[pos+14] << decimation_shifts<SdrBits, InputBits>::pre4,
-                buf[pos+15] << decimation_shifts<SdrBits, InputBits>::pre4,
+                (buf[pos+8] - Shift) << decimation_shifts<SdrBits, InputBits>::pre4,
+                (buf[pos+9] - Shift) << decimation_shifts<SdrBits, InputBits>::pre4,
+                (buf[pos+10] - Shift) << decimation_shifts<SdrBits, InputBits>::pre4,
+                (buf[pos+11] - Shift) << decimation_shifts<SdrBits, InputBits>::pre4,
+                (buf[pos+12] - Shift) << decimation_shifts<SdrBits, InputBits>::pre4,
+                (buf[pos+13] - Shift) << decimation_shifts<SdrBits, InputBits>::pre4,
+                (buf[pos+14] - Shift) << decimation_shifts<SdrBits, InputBits>::pre4,
+                (buf[pos+15] - Shift) << decimation_shifts<SdrBits, InputBits>::pre4,
                 &buf2[4]);
 
         m_decimator4.myDecimateSup(
@@ -344,25 +344,25 @@ void DecimatorsU<StorageType, T, SdrBits, InputBits, Shift>::decimate4_sup(Sampl
     for (int pos = 0; pos < len - 15; pos += 16)
     {
         m_decimator2.myDecimateSup(
-                buf[pos+0] << decimation_shifts<SdrBits, InputBits>::pre4,
-                buf[pos+1] << decimation_shifts<SdrBits, InputBits>::pre4,
-                buf[pos+2] << decimation_shifts<SdrBits, InputBits>::pre4,
-                buf[pos+3] << decimation_shifts<SdrBits, InputBits>::pre4,
-                buf[pos+4] << decimation_shifts<SdrBits, InputBits>::pre4,
-                buf[pos+5] << decimation_shifts<SdrBits, InputBits>::pre4,
-                buf[pos+6] << decimation_shifts<SdrBits, InputBits>::pre4,
-                buf[pos+7] << decimation_shifts<SdrBits, InputBits>::pre4,
+                (buf[pos+0] - Shift) << decimation_shifts<SdrBits, InputBits>::pre4,
+                (buf[pos+1] - Shift) << decimation_shifts<SdrBits, InputBits>::pre4,
+                (buf[pos+2] - Shift) << decimation_shifts<SdrBits, InputBits>::pre4,
+                (buf[pos+3] - Shift) << decimation_shifts<SdrBits, InputBits>::pre4,
+                (buf[pos+4] - Shift) << decimation_shifts<SdrBits, InputBits>::pre4,
+                (buf[pos+5] - Shift) << decimation_shifts<SdrBits, InputBits>::pre4,
+                (buf[pos+6] - Shift) << decimation_shifts<SdrBits, InputBits>::pre4,
+                (buf[pos+7] - Shift) << decimation_shifts<SdrBits, InputBits>::pre4,
                 &buf2[0]);
 
         m_decimator2.myDecimateSup(
-                buf[pos+8] << decimation_shifts<SdrBits, InputBits>::pre4,
-                buf[pos+9] << decimation_shifts<SdrBits, InputBits>::pre4,
-                buf[pos+10] << decimation_shifts<SdrBits, InputBits>::pre4,
-                buf[pos+11] << decimation_shifts<SdrBits, InputBits>::pre4,
-                buf[pos+12] << decimation_shifts<SdrBits, InputBits>::pre4,
-                buf[pos+13] << decimation_shifts<SdrBits, InputBits>::pre4,
-                buf[pos+14] << decimation_shifts<SdrBits, InputBits>::pre4,
-                buf[pos+15] << decimation_shifts<SdrBits, InputBits>::pre4,
+                (buf[pos+8] - Shift) << decimation_shifts<SdrBits, InputBits>::pre4,
+                (buf[pos+9] - Shift) << decimation_shifts<SdrBits, InputBits>::pre4,
+                (buf[pos+10] - Shift) << decimation_shifts<SdrBits, InputBits>::pre4,
+                (buf[pos+11] - Shift) << decimation_shifts<SdrBits, InputBits>::pre4,
+                (buf[pos+12] - Shift) << decimation_shifts<SdrBits, InputBits>::pre4,
+                (buf[pos+13] - Shift) << decimation_shifts<SdrBits, InputBits>::pre4,
+                (buf[pos+14] - Shift) << decimation_shifts<SdrBits, InputBits>::pre4,
+                (buf[pos+15] - Shift) << decimation_shifts<SdrBits, InputBits>::pre4,
                 &buf2[4]);
 
         m_decimator4.myDecimateInf(
@@ -389,11 +389,75 @@ void DecimatorsU<StorageType, T, SdrBits, InputBits, Shift>::decimate4_sup(Sampl
 template<typename StorageType, typename T, uint SdrBits, uint InputBits, int Shift>
 void DecimatorsU<StorageType, T, SdrBits, InputBits, Shift>::decimate8_inf(SampleVector::iterator* it, const T* buf __attribute__((unused)), qint32 len)
 {
-    for (int pos = 0; pos < len - 15; pos += 8)
-    {
-        (**it).setReal(0);
-        (**it).setImag(0);
+    StorageType buf2[16], buf4[8], buf8[4];
 
+    for (int pos = 0; pos < len - 31; pos += 32)
+    {
+        m_decimator2.myDecimateInf(
+                (buf[pos+0] - Shift) << decimation_shifts<SdrBits, InputBits>::pre8,
+                (buf[pos+1] - Shift) << decimation_shifts<SdrBits, InputBits>::pre8,
+                (buf[pos+2] - Shift) << decimation_shifts<SdrBits, InputBits>::pre8,
+                (buf[pos+3] - Shift) << decimation_shifts<SdrBits, InputBits>::pre8,
+                (buf[pos+4] - Shift) << decimation_shifts<SdrBits, InputBits>::pre8,
+                (buf[pos+5] - Shift) << decimation_shifts<SdrBits, InputBits>::pre8,
+                (buf[pos+6] - Shift) << decimation_shifts<SdrBits, InputBits>::pre8,
+                (buf[pos+7] - Shift) << decimation_shifts<SdrBits, InputBits>::pre8,
+                &buf2[0]);
+
+
+        m_decimator2.myDecimateInf(
+                (buf[pos+8] - Shift) << decimation_shifts<SdrBits, InputBits>::pre8,
+                (buf[pos+9] - Shift) << decimation_shifts<SdrBits, InputBits>::pre8,
+                (buf[pos+10] - Shift) << decimation_shifts<SdrBits, InputBits>::pre8,
+                (buf[pos+11] - Shift) << decimation_shifts<SdrBits, InputBits>::pre8,
+                (buf[pos+12] - Shift) << decimation_shifts<SdrBits, InputBits>::pre8,
+                (buf[pos+13] - Shift) << decimation_shifts<SdrBits, InputBits>::pre8,
+                (buf[pos+14] - Shift) << decimation_shifts<SdrBits, InputBits>::pre8,
+                (buf[pos+15] - Shift) << decimation_shifts<SdrBits, InputBits>::pre8,
+                &buf2[4]);
+
+
+        m_decimator2.myDecimateInf(
+                (buf[pos+16] - Shift) << decimation_shifts<SdrBits, InputBits>::pre8,
+                (buf[pos+17] - Shift) << decimation_shifts<SdrBits, InputBits>::pre8,
+                (buf[pos+18] - Shift) << decimation_shifts<SdrBits, InputBits>::pre8,
+                (buf[pos+19] - Shift) << decimation_shifts<SdrBits, InputBits>::pre8,
+                (buf[pos+20] - Shift) << decimation_shifts<SdrBits, InputBits>::pre8,
+                (buf[pos+21] - Shift) << decimation_shifts<SdrBits, InputBits>::pre8,
+                (buf[pos+22] - Shift) << decimation_shifts<SdrBits, InputBits>::pre8,
+                (buf[pos+23] - Shift) << decimation_shifts<SdrBits, InputBits>::pre8,
+                &buf2[8]);
+
+
+        m_decimator2.myDecimateInf(
+                (buf[pos+24] - Shift) << decimation_shifts<SdrBits, InputBits>::pre8,
+                (buf[pos+25] - Shift) << decimation_shifts<SdrBits, InputBits>::pre8,
+                (buf[pos+26] - Shift) << decimation_shifts<SdrBits, InputBits>::pre8,
+                (buf[pos+27] - Shift) << decimation_shifts<SdrBits, InputBits>::pre8,
+                (buf[pos+28] - Shift) << decimation_shifts<SdrBits, InputBits>::pre8,
+                (buf[pos+29] - Shift) << decimation_shifts<SdrBits, InputBits>::pre8,
+                (buf[pos+30] - Shift) << decimation_shifts<SdrBits, InputBits>::pre8,
+                (buf[pos+31] - Shift) << decimation_shifts<SdrBits, InputBits>::pre8,
+                &buf2[12]);
+
+        m_decimator4.myDecimateSup(
+                &buf2[0],
+                &buf4[0]);
+
+        m_decimator4.myDecimateSup(
+                &buf2[8],
+                &buf4[4]);
+
+        m_decimator8.myDecimateCen(
+                &buf4[0],
+                &buf8[0]);
+
+        (**it).setReal(buf8[0] >> decimation_shifts<SdrBits, InputBits>::post8);
+        (**it).setImag(buf8[1] >> decimation_shifts<SdrBits, InputBits>::post8);
+        ++(*it);
+
+        (**it).setReal(buf8[2] >> decimation_shifts<SdrBits, InputBits>::post8);
+        (**it).setImag(buf8[3] >> decimation_shifts<SdrBits, InputBits>::post8);
         ++(*it);
     }
 }
@@ -401,11 +465,75 @@ void DecimatorsU<StorageType, T, SdrBits, InputBits, Shift>::decimate8_inf(Sampl
 template<typename StorageType, typename T, uint SdrBits, uint InputBits, int Shift>
 void DecimatorsU<StorageType, T, SdrBits, InputBits, Shift>::decimate8_sup(SampleVector::iterator* it, const T* buf __attribute__((unused)), qint32 len)
 {
-    for (int pos = 0; pos < len - 15; pos += 8)
-    {
-        (**it).setReal(0);
-        (**it).setImag(0);
+    StorageType buf2[16], buf4[8], buf8[4];
 
+    for (int pos = 0; pos < len - 31; pos += 32)
+    {
+        m_decimator2.myDecimateSup(
+                (buf[pos+0] - Shift) << decimation_shifts<SdrBits, InputBits>::pre8,
+                (buf[pos+1] - Shift) << decimation_shifts<SdrBits, InputBits>::pre8,
+                (buf[pos+2] - Shift) << decimation_shifts<SdrBits, InputBits>::pre8,
+                (buf[pos+3] - Shift) << decimation_shifts<SdrBits, InputBits>::pre8,
+                (buf[pos+4] - Shift) << decimation_shifts<SdrBits, InputBits>::pre8,
+                (buf[pos+5] - Shift) << decimation_shifts<SdrBits, InputBits>::pre8,
+                (buf[pos+6] - Shift) << decimation_shifts<SdrBits, InputBits>::pre8,
+                (buf[pos+7] - Shift) << decimation_shifts<SdrBits, InputBits>::pre8,
+                &buf2[0]);
+
+
+        m_decimator2.myDecimateSup(
+                (buf[pos+8] - Shift) << decimation_shifts<SdrBits, InputBits>::pre8,
+                (buf[pos+9] - Shift) << decimation_shifts<SdrBits, InputBits>::pre8,
+                (buf[pos+10] - Shift) << decimation_shifts<SdrBits, InputBits>::pre8,
+                (buf[pos+11] - Shift) << decimation_shifts<SdrBits, InputBits>::pre8,
+                (buf[pos+12] - Shift) << decimation_shifts<SdrBits, InputBits>::pre8,
+                (buf[pos+13] - Shift) << decimation_shifts<SdrBits, InputBits>::pre8,
+                (buf[pos+14] - Shift) << decimation_shifts<SdrBits, InputBits>::pre8,
+                (buf[pos+15] - Shift) << decimation_shifts<SdrBits, InputBits>::pre8,
+                &buf2[4]);
+
+
+        m_decimator2.myDecimateSup(
+                (buf[pos+16] - Shift) << decimation_shifts<SdrBits, InputBits>::pre8,
+                (buf[pos+17] - Shift) << decimation_shifts<SdrBits, InputBits>::pre8,
+                (buf[pos+18] - Shift) << decimation_shifts<SdrBits, InputBits>::pre8,
+                (buf[pos+19] - Shift) << decimation_shifts<SdrBits, InputBits>::pre8,
+                (buf[pos+20] - Shift) << decimation_shifts<SdrBits, InputBits>::pre8,
+                (buf[pos+21] - Shift) << decimation_shifts<SdrBits, InputBits>::pre8,
+                (buf[pos+22] - Shift) << decimation_shifts<SdrBits, InputBits>::pre8,
+                (buf[pos+23] - Shift) << decimation_shifts<SdrBits, InputBits>::pre8,
+                &buf2[8]);
+
+
+        m_decimator2.myDecimateSup(
+                (buf[pos+24] - Shift) << decimation_shifts<SdrBits, InputBits>::pre8,
+                (buf[pos+25] - Shift) << decimation_shifts<SdrBits, InputBits>::pre8,
+                (buf[pos+26] - Shift) << decimation_shifts<SdrBits, InputBits>::pre8,
+                (buf[pos+27] - Shift) << decimation_shifts<SdrBits, InputBits>::pre8,
+                (buf[pos+28] - Shift) << decimation_shifts<SdrBits, InputBits>::pre8,
+                (buf[pos+29] - Shift) << decimation_shifts<SdrBits, InputBits>::pre8,
+                (buf[pos+30] - Shift) << decimation_shifts<SdrBits, InputBits>::pre8,
+                (buf[pos+31] - Shift) << decimation_shifts<SdrBits, InputBits>::pre8,
+                &buf2[12]);
+
+        m_decimator4.myDecimateInf(
+                &buf2[0],
+                &buf4[0]);
+
+        m_decimator4.myDecimateInf(
+                &buf2[8],
+                &buf4[4]);
+
+        m_decimator8.myDecimateCen(
+                &buf4[0],
+                &buf8[0]);
+
+        (**it).setReal(buf8[0] >> decimation_shifts<SdrBits, InputBits>::post8);
+        (**it).setImag(buf8[1] >> decimation_shifts<SdrBits, InputBits>::post8);
+        ++(*it);
+
+        (**it).setReal(buf8[2] >> decimation_shifts<SdrBits, InputBits>::post8);
+        (**it).setImag(buf8[3] >> decimation_shifts<SdrBits, InputBits>::post8);
         ++(*it);
     }
 }
@@ -418,91 +546,98 @@ void DecimatorsU<StorageType, T, SdrBits, InputBits, Shift>::decimate16_inf(Samp
     for (int pos = 0; pos < len - 63; pos += 64)
     {
         m_decimator2.myDecimateInf(
-                buf[pos+0] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+1] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+2] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+3] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+4] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+5] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+6] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+7] << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+0] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+1] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+2] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+3] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+4] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+5] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+6] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+7] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
                 &buf2[0]);
 
+
         m_decimator2.myDecimateInf(
-                buf[pos+8] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+9] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+10] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+11] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+12] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+13] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+14] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+15] << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+8] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+9] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+10] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+11] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+12] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+13] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+14] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+15] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
                 &buf2[4]);
 
+
         m_decimator2.myDecimateInf(
-                buf[pos+16] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+17] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+18] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+19] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+20] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+21] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+22] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+23] << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+16] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+17] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+18] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+19] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+20] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+21] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+22] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+23] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
                 &buf2[8]);
 
+
         m_decimator2.myDecimateInf(
-                buf[pos+24] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+25] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+26] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+27] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+28] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+29] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+30] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+31] << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+24] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+25] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+26] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+27] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+28] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+29] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+30] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+31] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
                 &buf2[12]);
 
+
         m_decimator2.myDecimateInf(
-                buf[pos+32] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+33] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+34] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+35] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+36] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+37] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+38] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+39] << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+32] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+33] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+34] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+35] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+36] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+37] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+38] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+39] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
                 &buf2[16]);
 
+
         m_decimator2.myDecimateInf(
-                buf[pos+40] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+41] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+42] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+43] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+44] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+45] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+46] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+47] << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+40] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+41] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+42] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+43] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+44] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+45] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+46] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+47] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
                 &buf2[20]);
 
-        m_decimator2.myDecimateInf(
-                buf[pos+48] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+49] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+50] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+51] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+52] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+53] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+54] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+55] << decimation_shifts<SdrBits, InputBits>::pre16,
-                &buf2[24]);
 
         m_decimator2.myDecimateInf(
-                buf[pos+56] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+57] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+58] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+59] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+60] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+61] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+62] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+63] << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+48] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+49] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+50] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+51] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+52] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+53] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+54] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+55] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                &buf2[24]);
+
+
+        m_decimator2.myDecimateInf(
+                (buf[pos+56] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+57] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+58] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+59] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+60] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+61] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+62] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+63] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
                 &buf2[28]);
 
         m_decimator4.myDecimateSup(
@@ -551,91 +686,98 @@ void DecimatorsU<StorageType, T, SdrBits, InputBits, Shift>::decimate16_sup(Samp
     for (int pos = 0; pos < len - 63; pos += 64)
     {
         m_decimator2.myDecimateSup(
-                buf[pos+0] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+1] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+2] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+3] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+4] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+5] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+6] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+7] << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+0] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+1] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+2] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+3] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+4] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+5] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+6] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+7] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
                 &buf2[0]);
 
+
         m_decimator2.myDecimateSup(
-                buf[pos+8] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+9] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+10] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+11] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+12] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+13] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+14] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+15] << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+8] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+9] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+10] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+11] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+12] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+13] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+14] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+15] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
                 &buf2[4]);
 
+
         m_decimator2.myDecimateSup(
-                buf[pos+16] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+17] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+18] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+19] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+20] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+21] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+22] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+23] << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+16] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+17] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+18] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+19] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+20] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+21] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+22] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+23] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
                 &buf2[8]);
 
+
         m_decimator2.myDecimateSup(
-                buf[pos+24] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+25] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+26] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+27] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+28] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+29] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+30] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+31] << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+24] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+25] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+26] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+27] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+28] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+29] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+30] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+31] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
                 &buf2[12]);
 
+
         m_decimator2.myDecimateSup(
-                buf[pos+32] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+33] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+34] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+35] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+36] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+37] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+38] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+39] << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+32] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+33] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+34] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+35] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+36] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+37] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+38] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+39] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
                 &buf2[16]);
 
+
         m_decimator2.myDecimateSup(
-                buf[pos+40] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+41] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+42] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+43] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+44] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+45] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+46] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+47] << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+40] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+41] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+42] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+43] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+44] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+45] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+46] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+47] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
                 &buf2[20]);
 
-        m_decimator2.myDecimateSup(
-                buf[pos+48] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+49] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+50] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+51] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+52] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+53] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+54] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+55] << decimation_shifts<SdrBits, InputBits>::pre16,
-                &buf2[24]);
 
         m_decimator2.myDecimateSup(
-                buf[pos+56] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+57] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+58] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+59] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+60] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+61] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+62] << decimation_shifts<SdrBits, InputBits>::pre16,
-                buf[pos+63] << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+48] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+49] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+50] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+51] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+52] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+53] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+54] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+55] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                &buf2[24]);
+
+
+        m_decimator2.myDecimateSup(
+                (buf[pos+56] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+57] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+58] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+59] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+60] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+61] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+62] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
+                (buf[pos+63] - Shift) << decimation_shifts<SdrBits, InputBits>::pre16,
                 &buf2[28]);
 
         m_decimator4.myDecimateInf(
@@ -684,179 +826,194 @@ void DecimatorsU<StorageType, T, SdrBits, InputBits, Shift>::decimate32_inf(Samp
     for (int pos = 0; pos < len - 127; pos += 128)
     {
         m_decimator2.myDecimateInf(
-                buf[pos+0] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+1] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+2] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+3] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+4] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+5] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+6] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+7] << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+0] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+1] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+2] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+3] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+4] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+5] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+6] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+7] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
                 &buf2[0]);
 
+
         m_decimator2.myDecimateInf(
-                buf[pos+8] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+9] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+10] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+11] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+12] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+13] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+14] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+15] << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+8] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+9] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+10] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+11] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+12] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+13] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+14] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+15] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
                 &buf2[4]);
 
+
         m_decimator2.myDecimateInf(
-                buf[pos+16] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+17] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+18] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+19] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+20] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+21] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+22] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+23] << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+16] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+17] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+18] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+19] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+20] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+21] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+22] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+23] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
                 &buf2[8]);
 
+
         m_decimator2.myDecimateInf(
-                buf[pos+24] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+25] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+26] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+27] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+28] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+29] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+30] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+31] << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+24] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+25] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+26] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+27] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+28] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+29] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+30] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+31] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
                 &buf2[12]);
 
+
         m_decimator2.myDecimateInf(
-                buf[pos+32] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+33] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+34] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+35] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+36] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+37] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+38] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+39] << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+32] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+33] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+34] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+35] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+36] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+37] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+38] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+39] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
                 &buf2[16]);
 
+
         m_decimator2.myDecimateInf(
-                buf[pos+40] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+41] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+42] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+43] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+44] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+45] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+46] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+47] << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+40] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+41] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+42] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+43] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+44] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+45] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+46] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+47] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
                 &buf2[20]);
 
+
         m_decimator2.myDecimateInf(
-                buf[pos+48] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+49] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+50] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+51] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+52] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+53] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+54] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+55] << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+48] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+49] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+50] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+51] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+52] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+53] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+54] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+55] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
                 &buf2[24]);
 
+
         m_decimator2.myDecimateInf(
-                buf[pos+56] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+57] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+58] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+59] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+60] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+61] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+62] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+63] << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+56] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+57] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+58] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+59] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+60] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+61] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+62] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+63] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
                 &buf2[28]);
 
+
         m_decimator2.myDecimateInf(
-                buf[pos+64] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+65] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+66] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+67] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+68] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+69] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+70] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+71] << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+64] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+65] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+66] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+67] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+68] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+69] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+70] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+71] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
                 &buf2[32]);
 
+
         m_decimator2.myDecimateInf(
-                buf[pos+72] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+73] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+74] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+75] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+76] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+77] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+78] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+79] << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+72] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+73] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+74] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+75] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+76] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+77] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+78] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+79] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
                 &buf2[36]);
 
+
         m_decimator2.myDecimateInf(
-                buf[pos+80] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+81] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+82] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+83] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+84] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+85] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+86] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+87] << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+80] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+81] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+82] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+83] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+84] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+85] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+86] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+87] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
                 &buf2[40]);
 
+
         m_decimator2.myDecimateInf(
-                buf[pos+88] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+89] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+90] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+91] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+92] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+93] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+94] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+95] << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+88] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+89] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+90] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+91] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+92] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+93] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+94] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+95] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
                 &buf2[44]);
 
+
         m_decimator2.myDecimateInf(
-                buf[pos+96] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+97] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+98] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+99] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+100] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+101] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+102] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+103] << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+96] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+97] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+98] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+99] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+100] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+101] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+102] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+103] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
                 &buf2[48]);
 
+
         m_decimator2.myDecimateInf(
-                buf[pos+104] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+105] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+106] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+107] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+108] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+109] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+110] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+111] << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+104] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+105] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+106] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+107] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+108] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+109] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+110] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+111] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
                 &buf2[52]);
 
-        m_decimator2.myDecimateInf(
-                buf[pos+112] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+113] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+114] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+115] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+116] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+117] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+118] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+119] << decimation_shifts<SdrBits, InputBits>::pre32,
-                &buf2[56]);
 
         m_decimator2.myDecimateInf(
-                buf[pos+120] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+121] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+122] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+123] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+124] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+125] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+126] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+127] << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+112] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+113] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+114] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+115] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+116] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+117] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+118] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+119] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                &buf2[56]);
+
+
+        m_decimator2.myDecimateInf(
+                (buf[pos+120] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+121] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+122] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+123] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+124] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+125] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+126] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+127] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
                 &buf2[60]);
 
         m_decimator4.myDecimateSup(
@@ -937,179 +1094,194 @@ void DecimatorsU<StorageType, T, SdrBits, InputBits, Shift>::decimate32_sup(Samp
     for (int pos = 0; pos < len - 127; pos += 128)
     {
         m_decimator2.myDecimateSup(
-                buf[pos+0] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+1] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+2] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+3] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+4] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+5] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+6] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+7] << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+0] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+1] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+2] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+3] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+4] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+5] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+6] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+7] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
                 &buf2[0]);
 
+
         m_decimator2.myDecimateSup(
-                buf[pos+8] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+9] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+10] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+11] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+12] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+13] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+14] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+15] << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+8] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+9] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+10] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+11] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+12] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+13] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+14] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+15] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
                 &buf2[4]);
 
+
         m_decimator2.myDecimateSup(
-                buf[pos+16] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+17] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+18] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+19] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+20] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+21] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+22] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+23] << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+16] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+17] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+18] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+19] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+20] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+21] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+22] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+23] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
                 &buf2[8]);
 
+
         m_decimator2.myDecimateSup(
-                buf[pos+24] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+25] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+26] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+27] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+28] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+29] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+30] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+31] << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+24] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+25] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+26] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+27] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+28] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+29] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+30] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+31] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
                 &buf2[12]);
 
+
         m_decimator2.myDecimateSup(
-                buf[pos+32] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+33] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+34] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+35] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+36] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+37] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+38] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+39] << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+32] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+33] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+34] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+35] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+36] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+37] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+38] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+39] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
                 &buf2[16]);
 
+
         m_decimator2.myDecimateSup(
-                buf[pos+40] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+41] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+42] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+43] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+44] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+45] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+46] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+47] << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+40] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+41] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+42] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+43] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+44] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+45] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+46] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+47] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
                 &buf2[20]);
 
+
         m_decimator2.myDecimateSup(
-                buf[pos+48] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+49] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+50] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+51] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+52] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+53] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+54] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+55] << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+48] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+49] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+50] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+51] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+52] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+53] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+54] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+55] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
                 &buf2[24]);
 
+
         m_decimator2.myDecimateSup(
-                buf[pos+56] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+57] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+58] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+59] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+60] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+61] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+62] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+63] << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+56] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+57] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+58] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+59] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+60] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+61] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+62] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+63] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
                 &buf2[28]);
 
+
         m_decimator2.myDecimateSup(
-                buf[pos+64] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+65] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+66] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+67] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+68] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+69] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+70] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+71] << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+64] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+65] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+66] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+67] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+68] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+69] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+70] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+71] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
                 &buf2[32]);
 
+
         m_decimator2.myDecimateSup(
-                buf[pos+72] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+73] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+74] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+75] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+76] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+77] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+78] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+79] << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+72] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+73] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+74] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+75] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+76] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+77] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+78] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+79] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
                 &buf2[36]);
 
+
         m_decimator2.myDecimateSup(
-                buf[pos+80] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+81] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+82] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+83] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+84] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+85] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+86] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+87] << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+80] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+81] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+82] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+83] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+84] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+85] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+86] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+87] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
                 &buf2[40]);
 
+
         m_decimator2.myDecimateSup(
-                buf[pos+88] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+89] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+90] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+91] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+92] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+93] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+94] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+95] << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+88] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+89] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+90] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+91] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+92] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+93] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+94] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+95] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
                 &buf2[44]);
 
+
         m_decimator2.myDecimateSup(
-                buf[pos+96] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+97] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+98] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+99] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+100] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+101] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+102] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+103] << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+96] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+97] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+98] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+99] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+100] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+101] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+102] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+103] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
                 &buf2[48]);
 
+
         m_decimator2.myDecimateSup(
-                buf[pos+104] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+105] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+106] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+107] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+108] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+109] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+110] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+111] << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+104] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+105] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+106] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+107] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+108] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+109] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+110] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+111] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
                 &buf2[52]);
 
-        m_decimator2.myDecimateSup(
-                buf[pos+112] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+113] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+114] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+115] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+116] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+117] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+118] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+119] << decimation_shifts<SdrBits, InputBits>::pre32,
-                &buf2[56]);
 
         m_decimator2.myDecimateSup(
-                buf[pos+120] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+121] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+122] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+123] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+124] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+125] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+126] << decimation_shifts<SdrBits, InputBits>::pre32,
-                buf[pos+127] << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+112] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+113] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+114] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+115] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+116] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+117] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+118] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+119] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                &buf2[56]);
+
+
+        m_decimator2.myDecimateSup(
+                (buf[pos+120] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+121] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+122] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+123] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+124] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+125] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+126] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
+                (buf[pos+127] - Shift) << decimation_shifts<SdrBits, InputBits>::pre32,
                 &buf2[60]);
 
         m_decimator4.myDecimateInf(
@@ -1190,355 +1362,386 @@ void DecimatorsU<StorageType, T, SdrBits, InputBits, Shift>::decimate64_inf(Samp
     for (int pos = 0; pos < len - 255; pos += 256)
     {
         m_decimator2.myDecimateInf(
-                buf[pos+0] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+1] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+2] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+3] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+4] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+5] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+6] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+7] << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+0] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+1] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+2] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+3] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+4] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+5] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+6] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+7] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
                 &buf2[0]);
 
+
         m_decimator2.myDecimateInf(
-                buf[pos+8] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+9] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+10] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+11] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+12] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+13] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+14] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+15] << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+8] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+9] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+10] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+11] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+12] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+13] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+14] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+15] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
                 &buf2[4]);
 
+
         m_decimator2.myDecimateInf(
-                buf[pos+16] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+17] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+18] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+19] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+20] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+21] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+22] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+23] << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+16] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+17] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+18] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+19] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+20] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+21] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+22] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+23] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
                 &buf2[8]);
 
+
         m_decimator2.myDecimateInf(
-                buf[pos+24] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+25] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+26] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+27] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+28] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+29] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+30] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+31] << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+24] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+25] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+26] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+27] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+28] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+29] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+30] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+31] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
                 &buf2[12]);
 
+
         m_decimator2.myDecimateInf(
-                buf[pos+32] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+33] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+34] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+35] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+36] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+37] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+38] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+39] << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+32] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+33] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+34] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+35] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+36] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+37] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+38] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+39] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
                 &buf2[16]);
 
+
         m_decimator2.myDecimateInf(
-                buf[pos+40] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+41] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+42] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+43] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+44] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+45] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+46] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+47] << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+40] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+41] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+42] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+43] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+44] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+45] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+46] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+47] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
                 &buf2[20]);
 
+
         m_decimator2.myDecimateInf(
-                buf[pos+48] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+49] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+50] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+51] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+52] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+53] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+54] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+55] << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+48] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+49] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+50] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+51] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+52] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+53] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+54] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+55] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
                 &buf2[24]);
 
+
         m_decimator2.myDecimateInf(
-                buf[pos+56] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+57] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+58] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+59] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+60] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+61] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+62] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+63] << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+56] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+57] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+58] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+59] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+60] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+61] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+62] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+63] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
                 &buf2[28]);
 
+
         m_decimator2.myDecimateInf(
-                buf[pos+64] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+65] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+66] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+67] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+68] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+69] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+70] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+71] << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+64] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+65] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+66] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+67] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+68] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+69] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+70] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+71] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
                 &buf2[32]);
 
+
         m_decimator2.myDecimateInf(
-                buf[pos+72] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+73] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+74] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+75] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+76] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+77] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+78] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+79] << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+72] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+73] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+74] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+75] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+76] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+77] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+78] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+79] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
                 &buf2[36]);
 
+
         m_decimator2.myDecimateInf(
-                buf[pos+80] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+81] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+82] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+83] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+84] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+85] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+86] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+87] << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+80] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+81] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+82] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+83] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+84] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+85] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+86] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+87] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
                 &buf2[40]);
 
+
         m_decimator2.myDecimateInf(
-                buf[pos+88] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+89] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+90] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+91] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+92] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+93] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+94] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+95] << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+88] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+89] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+90] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+91] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+92] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+93] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+94] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+95] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
                 &buf2[44]);
 
+
         m_decimator2.myDecimateInf(
-                buf[pos+96] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+97] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+98] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+99] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+100] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+101] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+102] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+103] << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+96] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+97] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+98] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+99] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+100] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+101] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+102] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+103] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
                 &buf2[48]);
 
+
         m_decimator2.myDecimateInf(
-                buf[pos+104] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+105] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+106] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+107] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+108] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+109] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+110] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+111] << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+104] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+105] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+106] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+107] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+108] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+109] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+110] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+111] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
                 &buf2[52]);
 
+
         m_decimator2.myDecimateInf(
-                buf[pos+112] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+113] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+114] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+115] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+116] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+117] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+118] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+119] << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+112] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+113] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+114] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+115] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+116] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+117] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+118] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+119] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
                 &buf2[56]);
 
+
         m_decimator2.myDecimateInf(
-                buf[pos+120] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+121] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+122] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+123] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+124] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+125] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+126] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+127] << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+120] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+121] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+122] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+123] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+124] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+125] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+126] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+127] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
                 &buf2[60]);
 
+
         m_decimator2.myDecimateInf(
-                buf[pos+128] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+129] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+130] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+131] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+132] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+133] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+134] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+135] << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+128] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+129] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+130] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+131] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+132] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+133] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+134] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+135] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
                 &buf2[64]);
 
+
         m_decimator2.myDecimateInf(
-                buf[pos+136] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+137] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+138] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+139] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+140] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+141] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+142] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+143] << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+136] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+137] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+138] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+139] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+140] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+141] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+142] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+143] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
                 &buf2[68]);
 
+
         m_decimator2.myDecimateInf(
-                buf[pos+144] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+145] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+146] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+147] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+148] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+149] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+150] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+151] << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+144] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+145] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+146] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+147] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+148] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+149] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+150] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+151] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
                 &buf2[72]);
 
+
         m_decimator2.myDecimateInf(
-                buf[pos+152] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+153] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+154] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+155] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+156] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+157] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+158] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+159] << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+152] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+153] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+154] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+155] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+156] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+157] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+158] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+159] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
                 &buf2[76]);
 
+
         m_decimator2.myDecimateInf(
-                buf[pos+160] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+161] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+162] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+163] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+164] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+165] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+166] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+167] << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+160] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+161] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+162] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+163] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+164] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+165] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+166] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+167] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
                 &buf2[80]);
 
+
         m_decimator2.myDecimateInf(
-                buf[pos+168] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+169] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+170] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+171] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+172] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+173] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+174] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+175] << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+168] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+169] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+170] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+171] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+172] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+173] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+174] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+175] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
                 &buf2[84]);
 
+
         m_decimator2.myDecimateInf(
-                buf[pos+176] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+177] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+178] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+179] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+180] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+181] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+182] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+183] << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+176] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+177] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+178] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+179] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+180] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+181] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+182] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+183] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
                 &buf2[88]);
 
+
         m_decimator2.myDecimateInf(
-                buf[pos+184] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+185] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+186] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+187] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+188] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+189] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+190] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+191] << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+184] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+185] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+186] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+187] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+188] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+189] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+190] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+191] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
                 &buf2[92]);
 
+
         m_decimator2.myDecimateInf(
-                buf[pos+192] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+193] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+194] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+195] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+196] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+197] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+198] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+199] << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+192] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+193] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+194] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+195] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+196] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+197] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+198] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+199] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
                 &buf2[96]);
 
+
         m_decimator2.myDecimateInf(
-                buf[pos+200] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+201] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+202] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+203] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+204] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+205] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+206] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+207] << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+200] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+201] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+202] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+203] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+204] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+205] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+206] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+207] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
                 &buf2[100]);
 
+
         m_decimator2.myDecimateInf(
-                buf[pos+208] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+209] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+210] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+211] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+212] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+213] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+214] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+215] << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+208] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+209] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+210] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+211] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+212] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+213] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+214] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+215] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
                 &buf2[104]);
 
+
         m_decimator2.myDecimateInf(
-                buf[pos+216] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+217] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+218] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+219] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+220] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+221] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+222] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+223] << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+216] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+217] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+218] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+219] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+220] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+221] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+222] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+223] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
                 &buf2[108]);
 
+
         m_decimator2.myDecimateInf(
-                buf[pos+224] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+225] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+226] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+227] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+228] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+229] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+230] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+231] << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+224] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+225] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+226] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+227] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+228] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+229] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+230] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+231] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
                 &buf2[112]);
 
+
         m_decimator2.myDecimateInf(
-                buf[pos+232] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+233] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+234] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+235] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+236] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+237] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+238] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+239] << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+232] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+233] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+234] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+235] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+236] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+237] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+238] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+239] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
                 &buf2[116]);
 
-        m_decimator2.myDecimateInf(
-                buf[pos+240] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+241] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+242] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+243] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+244] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+245] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+246] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+247] << decimation_shifts<SdrBits, InputBits>::pre64,
-                &buf2[120]);
 
         m_decimator2.myDecimateInf(
-                buf[pos+248] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+249] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+250] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+251] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+252] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+253] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+254] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+255] << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+240] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+241] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+242] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+243] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+244] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+245] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+246] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+247] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                &buf2[120]);
+
+
+        m_decimator2.myDecimateInf(
+                (buf[pos+248] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+249] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+250] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+251] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+252] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+253] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+254] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+255] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
                 &buf2[124]);
 
         m_decimator4.myDecimateSup(
@@ -1683,355 +1886,386 @@ void DecimatorsU<StorageType, T, SdrBits, InputBits, Shift>::decimate64_sup(Samp
     for (int pos = 0; pos < len - 255; pos += 256)
     {
         m_decimator2.myDecimateSup(
-                buf[pos+0] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+1] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+2] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+3] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+4] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+5] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+6] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+7] << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+0] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+1] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+2] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+3] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+4] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+5] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+6] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+7] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
                 &buf2[0]);
 
+
         m_decimator2.myDecimateSup(
-                buf[pos+8] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+9] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+10] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+11] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+12] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+13] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+14] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+15] << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+8] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+9] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+10] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+11] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+12] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+13] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+14] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+15] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
                 &buf2[4]);
 
+
         m_decimator2.myDecimateSup(
-                buf[pos+16] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+17] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+18] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+19] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+20] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+21] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+22] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+23] << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+16] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+17] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+18] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+19] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+20] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+21] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+22] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+23] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
                 &buf2[8]);
 
+
         m_decimator2.myDecimateSup(
-                buf[pos+24] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+25] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+26] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+27] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+28] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+29] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+30] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+31] << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+24] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+25] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+26] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+27] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+28] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+29] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+30] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+31] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
                 &buf2[12]);
 
+
         m_decimator2.myDecimateSup(
-                buf[pos+32] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+33] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+34] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+35] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+36] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+37] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+38] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+39] << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+32] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+33] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+34] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+35] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+36] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+37] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+38] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+39] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
                 &buf2[16]);
 
+
         m_decimator2.myDecimateSup(
-                buf[pos+40] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+41] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+42] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+43] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+44] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+45] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+46] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+47] << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+40] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+41] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+42] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+43] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+44] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+45] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+46] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+47] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
                 &buf2[20]);
 
+
         m_decimator2.myDecimateSup(
-                buf[pos+48] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+49] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+50] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+51] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+52] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+53] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+54] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+55] << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+48] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+49] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+50] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+51] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+52] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+53] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+54] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+55] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
                 &buf2[24]);
 
+
         m_decimator2.myDecimateSup(
-                buf[pos+56] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+57] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+58] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+59] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+60] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+61] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+62] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+63] << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+56] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+57] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+58] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+59] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+60] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+61] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+62] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+63] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
                 &buf2[28]);
 
+
         m_decimator2.myDecimateSup(
-                buf[pos+64] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+65] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+66] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+67] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+68] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+69] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+70] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+71] << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+64] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+65] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+66] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+67] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+68] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+69] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+70] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+71] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
                 &buf2[32]);
 
+
         m_decimator2.myDecimateSup(
-                buf[pos+72] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+73] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+74] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+75] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+76] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+77] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+78] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+79] << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+72] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+73] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+74] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+75] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+76] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+77] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+78] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+79] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
                 &buf2[36]);
 
+
         m_decimator2.myDecimateSup(
-                buf[pos+80] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+81] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+82] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+83] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+84] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+85] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+86] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+87] << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+80] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+81] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+82] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+83] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+84] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+85] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+86] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+87] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
                 &buf2[40]);
 
+
         m_decimator2.myDecimateSup(
-                buf[pos+88] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+89] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+90] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+91] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+92] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+93] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+94] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+95] << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+88] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+89] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+90] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+91] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+92] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+93] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+94] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+95] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
                 &buf2[44]);
 
+
         m_decimator2.myDecimateSup(
-                buf[pos+96] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+97] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+98] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+99] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+100] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+101] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+102] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+103] << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+96] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+97] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+98] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+99] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+100] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+101] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+102] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+103] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
                 &buf2[48]);
 
+
         m_decimator2.myDecimateSup(
-                buf[pos+104] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+105] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+106] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+107] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+108] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+109] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+110] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+111] << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+104] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+105] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+106] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+107] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+108] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+109] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+110] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+111] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
                 &buf2[52]);
 
+
         m_decimator2.myDecimateSup(
-                buf[pos+112] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+113] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+114] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+115] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+116] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+117] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+118] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+119] << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+112] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+113] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+114] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+115] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+116] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+117] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+118] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+119] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
                 &buf2[56]);
 
+
         m_decimator2.myDecimateSup(
-                buf[pos+120] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+121] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+122] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+123] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+124] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+125] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+126] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+127] << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+120] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+121] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+122] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+123] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+124] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+125] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+126] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+127] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
                 &buf2[60]);
 
+
         m_decimator2.myDecimateSup(
-                buf[pos+128] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+129] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+130] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+131] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+132] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+133] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+134] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+135] << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+128] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+129] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+130] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+131] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+132] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+133] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+134] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+135] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
                 &buf2[64]);
 
+
         m_decimator2.myDecimateSup(
-                buf[pos+136] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+137] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+138] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+139] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+140] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+141] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+142] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+143] << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+136] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+137] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+138] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+139] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+140] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+141] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+142] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+143] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
                 &buf2[68]);
 
+
         m_decimator2.myDecimateSup(
-                buf[pos+144] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+145] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+146] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+147] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+148] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+149] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+150] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+151] << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+144] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+145] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+146] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+147] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+148] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+149] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+150] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+151] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
                 &buf2[72]);
 
+
         m_decimator2.myDecimateSup(
-                buf[pos+152] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+153] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+154] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+155] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+156] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+157] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+158] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+159] << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+152] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+153] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+154] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+155] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+156] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+157] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+158] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+159] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
                 &buf2[76]);
 
+
         m_decimator2.myDecimateSup(
-                buf[pos+160] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+161] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+162] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+163] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+164] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+165] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+166] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+167] << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+160] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+161] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+162] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+163] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+164] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+165] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+166] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+167] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
                 &buf2[80]);
 
+
         m_decimator2.myDecimateSup(
-                buf[pos+168] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+169] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+170] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+171] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+172] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+173] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+174] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+175] << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+168] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+169] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+170] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+171] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+172] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+173] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+174] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+175] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
                 &buf2[84]);
 
+
         m_decimator2.myDecimateSup(
-                buf[pos+176] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+177] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+178] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+179] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+180] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+181] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+182] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+183] << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+176] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+177] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+178] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+179] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+180] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+181] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+182] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+183] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
                 &buf2[88]);
 
+
         m_decimator2.myDecimateSup(
-                buf[pos+184] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+185] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+186] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+187] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+188] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+189] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+190] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+191] << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+184] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+185] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+186] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+187] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+188] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+189] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+190] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+191] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
                 &buf2[92]);
 
+
         m_decimator2.myDecimateSup(
-                buf[pos+192] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+193] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+194] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+195] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+196] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+197] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+198] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+199] << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+192] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+193] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+194] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+195] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+196] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+197] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+198] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+199] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
                 &buf2[96]);
 
+
         m_decimator2.myDecimateSup(
-                buf[pos+200] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+201] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+202] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+203] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+204] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+205] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+206] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+207] << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+200] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+201] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+202] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+203] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+204] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+205] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+206] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+207] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
                 &buf2[100]);
 
+
         m_decimator2.myDecimateSup(
-                buf[pos+208] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+209] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+210] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+211] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+212] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+213] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+214] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+215] << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+208] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+209] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+210] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+211] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+212] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+213] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+214] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+215] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
                 &buf2[104]);
 
+
         m_decimator2.myDecimateSup(
-                buf[pos+216] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+217] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+218] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+219] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+220] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+221] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+222] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+223] << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+216] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+217] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+218] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+219] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+220] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+221] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+222] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+223] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
                 &buf2[108]);
 
+
         m_decimator2.myDecimateSup(
-                buf[pos+224] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+225] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+226] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+227] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+228] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+229] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+230] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+231] << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+224] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+225] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+226] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+227] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+228] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+229] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+230] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+231] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
                 &buf2[112]);
 
+
         m_decimator2.myDecimateSup(
-                buf[pos+232] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+233] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+234] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+235] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+236] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+237] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+238] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+239] << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+232] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+233] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+234] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+235] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+236] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+237] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+238] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+239] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
                 &buf2[116]);
 
-        m_decimator2.myDecimateSup(
-                buf[pos+240] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+241] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+242] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+243] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+244] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+245] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+246] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+247] << decimation_shifts<SdrBits, InputBits>::pre64,
-                &buf2[120]);
 
         m_decimator2.myDecimateSup(
-                buf[pos+248] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+249] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+250] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+251] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+252] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+253] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+254] << decimation_shifts<SdrBits, InputBits>::pre64,
-                buf[pos+255] << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+240] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+241] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+242] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+243] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+244] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+245] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+246] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+247] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                &buf2[120]);
+
+
+        m_decimator2.myDecimateSup(
+                (buf[pos+248] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+249] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+250] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+251] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+252] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+253] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+254] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
+                (buf[pos+255] - Shift) << decimation_shifts<SdrBits, InputBits>::pre64,
                 &buf2[124]);
 
         m_decimator4.myDecimateInf(
@@ -2176,14 +2410,14 @@ void DecimatorsU<StorageType, T, SdrBits, InputBits, Shift>::decimate2_cen(Sampl
     for (int pos = 0; pos < len - 7; pos += 8)
     {
         m_decimator2.myDecimateCen(
-                buf[pos+0] << decimation_shifts<SdrBits, InputBits>::pre2,
-                buf[pos+1] << decimation_shifts<SdrBits, InputBits>::pre2,
-                buf[pos+2] << decimation_shifts<SdrBits, InputBits>::pre2,
-                buf[pos+3] << decimation_shifts<SdrBits, InputBits>::pre2,
-                buf[pos+4] << decimation_shifts<SdrBits, InputBits>::pre2,
-                buf[pos+5] << decimation_shifts<SdrBits, InputBits>::pre2,
-                buf[pos+6] << decimation_shifts<SdrBits, InputBits>::pre2,
-                buf[pos+7] << decimation_shifts<SdrBits, InputBits>::pre2,
+                (buf[pos+0] - Shift) << decimation_shifts<SdrBits, InputBits>::pre2,
+                (buf[pos+1] - Shift) << decimation_shifts<SdrBits, InputBits>::pre2,
+                (buf[pos+2] - Shift) << decimation_shifts<SdrBits, InputBits>::pre2,
+                (buf[pos+3] - Shift) << decimation_shifts<SdrBits, InputBits>::pre2,
+                (buf[pos+4] - Shift) << decimation_shifts<SdrBits, InputBits>::pre2,
+                (buf[pos+5] - Shift) << decimation_shifts<SdrBits, InputBits>::pre2,
+                (buf[pos+6] - Shift) << decimation_shifts<SdrBits, InputBits>::pre2,
+                (buf[pos+7] - Shift) << decimation_shifts<SdrBits, InputBits>::pre2,
                 &buf2[0]);
 
         (**it).setReal(buf2[0] >> decimation_shifts<SdrBits, InputBits>::post2);
@@ -2204,25 +2438,25 @@ void DecimatorsU<StorageType, T, SdrBits, InputBits, Shift>::decimate4_cen(Sampl
     for (int pos = 0; pos < len - 15; pos += 16)
     {
         m_decimator2.myDecimateCen(
-                buf[pos+0] << decimation_shifts<SdrBits, InputBits>::pre4,
-                buf[pos+1] << decimation_shifts<SdrBits, InputBits>::pre4,
-                buf[pos+2] << decimation_shifts<SdrBits, InputBits>::pre4,
-                buf[pos+3] << decimation_shifts<SdrBits, InputBits>::pre4,
-                buf[pos+4] << decimation_shifts<SdrBits, InputBits>::pre4,
-                buf[pos+5] << decimation_shifts<SdrBits, InputBits>::pre4,
-                buf[pos+6] << decimation_shifts<SdrBits, InputBits>::pre4,
-                buf[pos+7] << decimation_shifts<SdrBits, InputBits>::pre4,
+                (buf[pos+0] - Shift) << decimation_shifts<SdrBits, InputBits>::pre4,
+                (buf[pos+1] - Shift) << decimation_shifts<SdrBits, InputBits>::pre4,
+                (buf[pos+2] - Shift) << decimation_shifts<SdrBits, InputBits>::pre4,
+                (buf[pos+3] - Shift) << decimation_shifts<SdrBits, InputBits>::pre4,
+                (buf[pos+4] - Shift) << decimation_shifts<SdrBits, InputBits>::pre4,
+                (buf[pos+5] - Shift) << decimation_shifts<SdrBits, InputBits>::pre4,
+                (buf[pos+6] - Shift) << decimation_shifts<SdrBits, InputBits>::pre4,
+                (buf[pos+7] - Shift) << decimation_shifts<SdrBits, InputBits>::pre4,
                 &buf2[0]);
 
         m_decimator2.myDecimateCen(
-                buf[pos+8] << decimation_shifts<SdrBits, InputBits>::pre4,
-                buf[pos+9] << decimation_shifts<SdrBits, InputBits>::pre4,
-                buf[pos+10] << decimation_shifts<SdrBits, InputBits>::pre4,
-                buf[pos+11] << decimation_shifts<SdrBits, InputBits>::pre4,
-                buf[pos+12] << decimation_shifts<SdrBits, InputBits>::pre4,
-                buf[pos+13] << decimation_shifts<SdrBits, InputBits>::pre4,
-                buf[pos+14] << decimation_shifts<SdrBits, InputBits>::pre4,
-                buf[pos+15] << decimation_shifts<SdrBits, InputBits>::pre4,
+                (buf[pos+8] - Shift) << decimation_shifts<SdrBits, InputBits>::pre4,
+                (buf[pos+9] - Shift) << decimation_shifts<SdrBits, InputBits>::pre4,
+                (buf[pos+10] - Shift) << decimation_shifts<SdrBits, InputBits>::pre4,
+                (buf[pos+11] - Shift) << decimation_shifts<SdrBits, InputBits>::pre4,
+                (buf[pos+12] - Shift) << decimation_shifts<SdrBits, InputBits>::pre4,
+                (buf[pos+13] - Shift) << decimation_shifts<SdrBits, InputBits>::pre4,
+                (buf[pos+14] - Shift) << decimation_shifts<SdrBits, InputBits>::pre4,
+                (buf[pos+15] - Shift) << decimation_shifts<SdrBits, InputBits>::pre4,
                 &buf2[4]);
 
         m_decimator4.myDecimateCen(