Changeset 1963 in Sophya

Timestamp:

Apr 11, 2002, 6:12:17 PM (23 years ago)

Author:

aubourg

Message:

new output for wiener, unconnected outs ok in processor

Location:

trunk/ArchTOIPipe

Files:

• Kernel/toiprocessor.cc (modified) (4 diffs)
• Processors/wienerdecor.cc (modified) (5 diffs)

trunk/ArchTOIPipe/Kernel/toiprocessor.cc

@@ -3 +3 @@
 //                               Christophe Magneville
 //                               Reza Ansari
-// $Id: toiprocessor.cc,v 1.21 2001-11-26 15:13:48 aubourg Exp $
+// $Id: toiprocessor.cc,v 1.22 2002-04-11 16:12:17 aubourg Exp $
 
 #include "toiprocessor.h"
@@ -167 +167 @@
     throw RangeCheckError("TOIProcessor::getOutputTOI() out of bound toiIndex");
   TOI* toi = outTOIs[toiIndex];
-  if (toi == NULL) 
-    throw NullPtrError("TOIProcessor::getOutputTOI() - Not assigned TOI !");
+  //  if (toi == NULL) 
+  //    throw NullPtrError("TOIProcessor::getOutputTOI() - Not assigned TOI !");
   return(toi);
 }
@@ -392 +392 @@
 void TOIProcessor::putData(int toiIndex, int i, double value, uint_8 flg) {
   TOI* toi = getOutputTOI(toiIndex);
+  if (toi == NULL) return;
   toi->putData(i, value, flg);
   // autoWontNeed(i);  // now done on getData
@@ -400 +401 @@
                            uint_8 const* flg) {
   TOI* toi = getOutputTOI(toiIndex);
+  if (toi == NULL) return;
   toi->putData(i, n, val, flg);
   if (toi->needSyncOldWay())  notify(); // seulement pour non segmented

trunk/ArchTOIPipe/Processors/wienerdecor.cc

@@ -16 +16 @@
   declareInput("probe");
   declareOutput("signal");
+  declareOutput("noiseestim");
   name="WienerDecorrelator";
   setNeededHistory(nsamples+lcorr+1);
@@ -33 +34 @@
   double* y = new double[lcorr+1];  // corr vector
   double* window = new double[lcorr];
-  double* filter = w+1;
+  double* filter = new double[lcorr];
+  for (int i=0; i<lcorr; i++) filter[i]=0;
   
   int sn = snb;
@@ -57 +59 @@
       }
       dtoeplz(r,w,y,lcorr);
-      cout << "Wiener filter : \n ";
+      if (!isnan(w[1])) {
+        for (int i=0; i<lcorr; i++) {
+          filter[i] = w[i+1];
+        }
+      } else {
+        cout << "Bad inversion, keeping previous filter\n";
+      }
+      cout << "Wiener filter : " << sn << "\n ";
       for (int i=0; i<lcorr; i++) {
         cout << filter[i] << " ";
@@ -71 +80 @@
       }
       putData(0, sn, getData(0, sn) - outSig);
+      putData(1, sn, outSig);
     }
     sn++;
@@ -78 +88 @@
   delete[] w;
   delete[] r;
+  delete[] filter;
 }