Changeset 1442 in Sophya for trunk/ArchTOIPipe/ProcWSophya/rztoi.cc

Timestamp:

Mar 15, 2001, 1:09:31 PM (25 years ago)

Author:

ansari

Message:

Ajout de processeurs simples - Deglitcher + Filtre, + programme test - Reza 15/3/2001

File:

• trunk/ArchTOIPipe/ProcWSophya/rztoi.cc (modified) (6 diffs)

trunk/ArchTOIPipe/ProcWSophya/rztoi.cc

@@ -3 +3 @@
 #include "pexceptions.h"
 #include "fftpserver.h"
-#include "timing.h"
+#include "ctimer.h"
 
 RzTOIProc::RzTOIProc(int w1, int w2, int nmax)
@@ -15 +15 @@
 void RzTOIProc::init() {
   cout << "RzTOIProc::init" << endl;
-  declareInput("signal");
-  declareOutput("sfout");
+  declareInput("in");
+  declareOutput("out");
   name = "rzproc";
   upExtra = 1;
@@ -33 +33 @@
 
   try {
+    Timer tm("RzTOIProc::run()");
 
     FFTPackServer ffts;
@@ -116 +117 @@
         nkv++;
       }
-      PrtTim("End of bloc");
+
+      tm.Split("End of bloc");
     }
 
@@ -150 +152 @@
   }
   catch (PException & e) {
-    cout << "RzTOIProc exception Msg= " << e.Msg() << endl;
-  }
-}
-
-
-
-RzSimpleTOIProc::RzSimpleTOIProc(double fact, int npr)
+    cout << "RzTOIProc: Catched exception " << (string)typeid(e).name()
+         << "\n Msg= " << e.Msg() << endl;
+  }
+}
+
+
+
+RzSimpleTOIProc::RzSimpleTOIProc(int wsz, double fact)
 {
+  if (wsz < 4) wsz = 4;
   cout << "RzSimpleTOIProc::RzSimpleTOIProc() factor= " << fact 
-       << " npr=" << npr << endl; 
+       << " WSize=" << wsz << endl; 
   _fact = fact;
-  _nprt = npr;
+  _wsz = wsz;
 }
 
 void RzSimpleTOIProc::init() {
   cout << "RzSimpleTOIProc::init" << endl;
-  declareInput("signal");
-  declareOutput("sfout");
+  declareInput("in");
+  declareOutput("out");
   name = "rzsimpleproc";
   upExtra = 1;
@@ -177 +181 @@
   int sne = getMaxIn();
 
-  cout << " RzSimpleTOIProc::run(): snb=" << snb << " sne=" << sne << endl;
+  int nstot = sne-snb;
+  int nbloc = nstot/_wsz;
+  cout << " RzSimpleTOIProc::run(): snb=" << snb << " sne=" 
+       << sne << " NBloc=" << nbloc << endl;
 
   double val;
+  int snlast = snb;
+  int istart,ii,kb;
   try {
-    for (int k=snb; k<sne; k++) {
-      if ((k-snb)%_nprt == 0) 
-        cout << " RzSimpleTOIProc::run() - Processing sample k= " << k
-             << endl;
-
-      val = getData(0, k);
-      putData(0, k, val*_fact);
-    }
+    Timer tm("RzSimpleTOIProc::run()");
+    Vector vin(_wsz);
+    for (kb=0; kb<nbloc; kb++) {
+      istart = kb*_wsz+snb;
+      if (kb%2 == 0) {  // On parcourt a l'envers
+        cout << " ... Processing bloc[" << kb << "] (Reverse) SampleNum=" 
+             << istart+_wsz << " ->" << istart << endl;
+        for(ii=_wsz-1; ii>=0; ii--)
+          vin(ii) = getData(0, ii+istart);
+      }
+      else {  // On parcourt vers l'avant 
+        cout << " ... Processing bloc[" << kb << "] SampleNum=" 
+             << istart << " ->" << istart+_wsz << endl;
+        for(ii=0; ii<_wsz; ii++)
+          vin(ii) = getData(0, ii+istart);      
+      }
+      for(ii=0; ii<_wsz; ii++)
+        putData(0, ii+istart, vin(ii)*_fact);
+      snlast = istart+_wsz;
+    }
+    cout << " ... Processing remaining Samples - SN=" 
+         << snlast << " ->" << sne << endl;
+    for(ii=snlast; ii<sne; ii++) {
+      val = getData(0, ii);
+      putData(0, ii, val*_fact);
+    }
+    
+    
   }
   catch (PException & e) {
-    cout << "RzSimpleTOIProc exception Msg= " << e.Msg() << endl;
-  }
-}
+    cout << "RzSimpleTOIProc exception " << (string)typeid(e).name()
+         << "\n  Msg= " << e.Msg() << endl;
+  }
+}