Changeset 2187 in Sophya for trunk/ArchTOIPipe/Processors

Timestamp:

Sep 9, 2002, 5:33:16 PM (23 years ago)

Author:

aubourg

Message:

Vivien, limites processors et connect

Location:

trunk/ArchTOIPipe/Processors

Files:

• Makefile.in (modified) (1 diff)
• toidelay.cc (added)
• toidelay.h (added)
• wienerdecor.cc (modified) (5 diffs)
• wienerdecor.h (modified) (2 diffs)

trunk/ArchTOIPipe/Processors/Makefile.in

@@ -48 +48 @@
 
 SRCFILES=toisqfilter.cc nooppr.cc correl.cc nrutil.c dlubksb.c dludcmp.c dtoeplz.c \
-         wienerdecor.cc
+         wienerdecor.cc toidelay.cc toimedfilter.cc
 FILES=$(patsubst %.c,%.o,$(SRCFILES:.cc=.o))
 

trunk/ArchTOIPipe/Processors/wienerdecor.cc

@@ -11 +11 @@
   nsamples = n;
   lcorr = l;
+  doNotLookAt();
 }
 
@@ -35 +36 @@
   double* y = new double[lcorr+1];  // corr vector
   double* window = new double[lcorr];
+  uint_8* fwind  = new uint_8[lcorr];
   double* filter = new double[lcorr];
   for (int i=0; i<lcorr; i++) filter[i]=0;
@@ -41 +43 @@
   int snstartcorr = -1;
   
-  while (sn < sne) {
+  while (sn <= sne) {
     if (snstartcorr < 0 || 
         (snstartcorr + nsamples < sn && sn+nsamples < sne)) {
@@ -48 +50 @@
       corr.reset();
       autocorr.reset();
-      int i;
-      for (i=sn; i<sn+nsamples; i++) {
-        double sig = getData(0, i);
-        double prb = getData(1, i);
+      cout << "computing correl " << sn << " -> " << sn+nsamples << endl;
+      for (int i=sn; i<sn+nsamples; i++) {
+        uint_8 flag1, flag2;
+        double sig, prb;
+        getData(0, i, sig, flag1);
+        if (flag1 & flgNotLookAt) continue;
+        getData(1, i, prb, flag2);
+        if (flag2 & flgNotLookAt) continue;
+        if ((i-sn)%100 == 0) {
+          //cout << " sig/prb : " << i << " : " << sig << " / " << prb 
+          //     << hex << " " << flag1 << " " << flag2 << dec << endl;
+        }
         corr.push(i, sig, prb);
         autocorr.push(i, prb);
       }
       // correlation is recomputed, let's recompute the wiener filter from wiener equations
-      for (i=0; i<lcorr; i++) {
+      {for (int i=0; i<lcorr; i++) {
         r[lcorr+i] = r[lcorr-i] = autocorr.correl(i);
         y[i+1] = corr.correl(i);
-      }
+        //cout << "r " << lcorr+i << " " << lcorr -i << " = " << r[lcorr+i] 
+        //    << "\n"
+        //    << "y " << i+1 << " = " << y[i+1] << endl;
+      }}
       dtoeplz(r,w,y,lcorr);
       if (!isnan(w[1])) {
@@ -69 +82 @@
       }
       cout << "Wiener filter : " << sn << "\n ";
-      for (i=0; i<lcorr; i++) {
+      {for (int i=0; i<lcorr; i++) {
         cout << filter[i] << " ";
-      }
+      }}
      cout << endl;
     }
 
     if (sn >= snb+lcorr-1) {
-      getData(1, sn-lcorr+1, lcorr, window);
+      getData(1, sn-lcorr+1, lcorr, window, fwind);
+      uint_8 flag = 0;
       double outSig = 0;
       for (int i=0; i<lcorr; i++) {
         outSig += filter[i] * window[lcorr-1 - i];
+        flag |= fwind[lcorr-1 -i];
       }
-      putData(0, sn, getData(0, sn) - outSig);
-      putData(1, sn, outSig);
+      putData(0, sn, getData(0, sn) - outSig, flag);
+      putData(1, sn, outSig, flag);
     }
     sn++;

trunk/ArchTOIPipe/Processors/wienerdecor.h

@@ -5 +5 @@
 //                               Christophe Magneville
 //                               Reza Ansari
-// $Id: wienerdecor.h,v 1.1 2002-03-23 23:05:22 aubourg Exp $
+// $Id: wienerdecor.h,v 1.2 2002-09-09 15:33:15 aubourg Exp $
 
 #ifndef WIENERDECOR_H
@@ -20 +20 @@
   virtual void run();
 
-  //  inline void doNotLookAt(uint_8 flag=FlgToiAll) {flgNotLookAt = flag;}
+  inline void doNotLookAt(uint_8 flag=FlgToiAll) {flgNotLookAt = flag;}
 
 protected:  
   int nsamples;
   int lcorr;
-  // uint_8 flgNotLookAt;
+  uint_8 flgNotLookAt;
 };