Changeset 2037 in Sophya for trunk/ArchTOIPipe/Processors

Timestamp:

May 31, 2002, 10:10:58 AM (23 years ago)

Author:

ansari

Message:

Amelioration NoOpProcessor et mesovh2.cc pour investigation pb kill sur magique - Reza 31/5/2002

Location:

trunk/ArchTOIPipe/Processors

Files:

• nooppr.cc (modified) (5 diffs)
• nooppr.h (modified) (3 diffs)

trunk/ArchTOIPipe/Processors/nooppr.cc

@@ -3 +3 @@
 //                               Christophe Magneville
 //                               Reza Ansari
-// $Id: nooppr.cc,v 1.10 2002-05-13 13:11:32 ansari Exp $
+// $Id: nooppr.cc,v 1.11 2002-05-31 08:10:58 ansari Exp $
 
 #include <typeinfo>
@@ -16 +16 @@
   if (wsz < 1) wsz = 1;
   wsize = wsz;
+  delay2 = false;
   totnscount = 0;
 }
@@ -25 +26 @@
   os << "\n ------------------------------------------------------ \n" 
      << " NoOpProcessor::PrintStatus() - WindowSize=" 
-     << WSize() << endl; 
+     << WSize();
+  if (delay2) os << " Delay in2 ---> out2 " << endl;
+  else os << endl;
   os << " Total number of processed samples= " << ProcessedSampleCount()
      << endl;
@@ -91 +94 @@
       }
       if (fgin2 || fgout2) {
-        vin2 = new double[wsize];
-        vfg2 = new uint_8[wsize];
-        for(i=0; i<wsize; i++) { 
+        int wsz2 = wsize;
+        if (delay2) wsz2 *= 2;
+        vin2 = new double[wsz2];
+        vfg2 = new uint_8[wsz2];
+        for(i=0; i<wsz2; i++) { 
           vin2[i] = defval; vfg2[i] = defflag;
         }       
@@ -100 +105 @@
       // Boucle sur les sampleNum
       // 1er partie, on traite par paquets de wsize
+      int kd2 = 0;
+      int lastk2in = 0;
       for(k=snb;k<=sne-wsize+1;k+=wsize) {
         if (fgin) 
           getData(0, k, wsize, vin, vfg);
-        if (fgin2)
-          getData(1, k, wsize, vin2, vfg2);
-        totnbblock++;
+        if (fgin2) {
+          kd2 = (delay2) ? (kd2+1)%2 : 0;
+          getData(1, k, wsize, vin2+kd2*wsize, vfg2+kd2*wsize);
+          lastk2in = k;
+        }
         if (fgout) 
           putData(0, k, wsize, vin, vfg);
-        if (fgout2)  
-          putData(1, k, wsize, vin2, vfg2);
+        if (fgout2 && (!delay2 || totnbblock > 1)) {  
+          int kd2o = (delay2) ? (kd2+1)%2 : 0;
+          int nextk2o = (delay2) ? lastk2in-wsize : lastk2in;
+          putData(1, nextk2o, wsize, vin2+kd2o*wsize, vfg2+kd2o*wsize);
+        }
         klast+=wsize;
         totnscount+=wsize;
         totnbblock++;
+      }
+      if (fgout2 && delay2) {
+        int kd2o = (kd2+1)%2;
+        putData(1, lastk2in, wsize, vin2+kd2o*wsize, vfg2+kd2o*wsize);
+        
       }
     }

trunk/ArchTOIPipe/Processors/nooppr.h

@@ -5 +5 @@
 //                               Christophe Magneville
 //                               Reza Ansari
-// $Id: nooppr.h,v 1.7 2002-05-30 20:44:31 ansari Exp $
+// $Id: nooppr.h,v 1.8 2002-05-31 08:10:58 ansari Exp $
 
 
@@ -24 +24 @@
   inline int    WSize() const { return wsize; }
   inline void   SetWSize(int wsz)  { if (wsz > 1)  wsize =  wsz; }
+  inline void   SetDelay2(bool fg) { delay2 = fg; }
   inline int_8  ProcessedSampleCount() const { return totnscount; }
 
@@ -39 +40 @@
 
   bool acceptnoinput;
+  bool delay2;
   double defval;
   long defflag;