Changeset 1944 in Sophya

Timestamp:

Mar 24, 2002, 12:05:22 AM (24 years ago)

Author:

aubourg

Message:

decorrelateur wiener

Location:

trunk/ArchTOIPipe

Files:

• Kernel/toisegment.cc (modified) (5 diffs)
• Kernel/toisegment.h (modified) (2 diffs)
• ProcWSophya/noisegen.cc (modified) (1 diff)
• Processors/Makefile.in (modified) (1 diff)
• Processors/correl.cc (added)
• Processors/correl.h (added)
• Processors/dlubksb.c (added)
• Processors/dludcmp.c (added)
• Processors/dtoeplz.c (added)
• Processors/nrutil.c (added)
• Processors/nrutil.h (added)
• Processors/wienerdecor.cc (added)
• Processors/wienerdecor.h (added)
• TestPipes/tstnoisecancel.cc (added)
• TestPipes/tstnoisecancel.h (added)
• configure.in (modified) (1 diff)
• files_pipes (modified) (1 diff)
• files_processors (modified) (1 diff)

trunk/ArchTOIPipe/Kernel/toisegment.cc

@@ -3 +3 @@
 //                               Christophe Magneville
 //                               Reza Ansari
-// $Id: toisegment.cc,v 1.25 2001-11-30 21:07:16 aubourg Exp $
+// $Id: toisegment.cc,v 1.26 2002-03-23 23:05:22 aubourg Exp $
 
 #include "toisegment.h"
@@ -158 +158 @@
 TOISegmented::BufferSegment::~BufferSegment() {
   if (refcount > 0) {
+    cerr << "TOISegment : delete Buffer with refcount>0" << endl;
     throw(ForbiddenError("TOISegment : delete Buffer with refcount>0"));
   }
@@ -183 +184 @@
   }
   if (status == COMMITTED) {
+    cerr << "TOISegment : putData in committed buffer" << endl;
     throw(ForbiddenError("TOISegment : putData in committed buffer"));
   }
@@ -196 +198 @@
   }
   if (status == COMMITTED) {
+    cerr << "TOISegment : putData in committed buffer" << endl;
     throw(ForbiddenError("TOISegment : putData in committed buffer"));
   }
@@ -218 +221 @@
   int nrc = --refcount;
   pthread_mutex_unlock(&refcount_mutex);
-  if (nrc<0)
+  if (nrc<0) {
+    cerr << "TOISegment : buffer refcount < 0" << endl;
     throw(ForbiddenError("TOISegment : buffer refcount < 0"));
+  }
 }
 

trunk/ArchTOIPipe/Kernel/toisegment.h

@@ -5 +5 @@
 //                               Christophe Magneville
 //                               Reza Ansari
-// $Id: toisegment.h,v 1.17 2001-11-26 15:13:48 aubourg Exp $
+// $Id: toisegment.h,v 1.18 2002-03-23 23:05:22 aubourg Exp $
 
 #ifndef TOISEGMENT_H
@@ -82 +82 @@
 
     bool isPastEnd(int sn) {
-      return sn >= sn+bufferSize;
+      return sn >= sn0+bufferSize;
     }
     
   private:
     void checkCommitted() {
-      if (status != COMMITTED) 
+      if (status != COMMITTED) { 
+        cerr << "TOISegment: Read on not committed buffer segment" << endl;
         throw(ForbiddenError("TOISegment: Read on not committed buffer segment"));
+      }
     }
 
     void checkInRange(int sn) {
-      if (sn < sn0 || sn >= sn+bufferSize)
+      if (sn < sn0 || sn >= sn0+bufferSize) {
+        cerr << "TOISegment: out of range access in buffer segment " << sn << " not in " 
+             << sn0 << " - " << sn0+bufferSize << endl;
         throw(RangeCheckError("TOISegment: out of range access in buffer segment"));
+      }
     }
 

trunk/ArchTOIPipe/ProcWSophya/noisegen.cc

@@ -38 +38 @@
   int sne = getMaxOut();
 
-  cout << " NoiseGen::run() SNRange=" << snb << " - " << sne << endl; 
-
   for (int i=snb; i<=sne; i++) {
     putData(0,i,gen->Noise(),0);

trunk/ArchTOIPipe/Processors/Makefile.in

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

trunk/ArchTOIPipe/configure.in

@@ -123 +123 @@
 AC_CHECK_HEADERS(values.h stdint.h)
 
-outfiles="Makefile kernel/Makefile processors/Makefile pipes/Makefile"
+outfiles="Makefile kernel/Makefile processors/Makefile pipes/Makefile Makefile.h"
 if [[ $use_sophya = 1 ]]; then
   outfiles="$outfiles sophya/Makefile"

trunk/ArchTOIPipe/files_pipes

@@ -17 +17 @@
 tsttoi2map.cc
 tstktoibad.cc
+tstnoisecancel.h
+tstnoisecancel.cc

trunk/ArchTOIPipe/files_processors

@@ -3 +3 @@
 nooppr.h
 nooppr.cc
+correl.cc
+correl.h
+nrutil.h
+nrutil.c
+dlubksb.c  
+dludcmp.c  
+dtoeplz.c
+wienerdecor.cc
+wienerdecor.h