Changeset 1999 in Sophya for trunk/ArchTOIPipe/ProcWSophya/simtoipr.cc

Timestamp:

May 13, 2002, 5:50:50 PM (23 years ago)

Author:

ansari

Message:

Ajout flags, correction classe espion RzProcSampleCounter - Reza 13/5/2002

File:

• trunk/ArchTOIPipe/ProcWSophya/simtoipr.cc (modified) (7 diffs)

trunk/ArchTOIPipe/ProcWSophya/simtoipr.cc

@@ -3 +3 @@
 //                               Christophe Magneville
 //                               Reza Ansari
-// $Id: simtoipr.cc,v 1.17 2001-11-14 14:10:13 aubourg Exp $
+// $Id: simtoipr.cc,v 1.18 2002-05-13 15:50:50 ansari Exp $
 
 #include "config.h"
@@ -14 +14 @@
 #include "ctimer.h"
 #include "fftpserver.h"
+
+#include "flagtoidef.h"
 
 SimpleDeglitcher::SimpleDeglitcher(int wsz, double ns, int maxnpt, int minnpt)
@@ -84 +86 @@
 
 
-#define FG_OUTOFRANGE 1
-#define FG_GLITCH 2
 void SimpleDeglitcher::run() {
 
@@ -239 +239 @@
         valcur = (rec_use_wrec) ? vrec.Sum()/wrecsize : mean;
         if (rec_out_range_samples) vin(k%wsize) = valcur;
-        vfg(k%wsize) |= FG_OUTOFRANGE;
+        vfg(k%wsize) |= FlgToiOut;
         out_range_nscount++;
       }
@@ -266 +266 @@
               double recval = (rec_use_wrec) ? vrec.Sum()/wrecsize : mean;
               for(ii=kgl; ii<k; ii++) {
-                putData(0, ii+snb, recval, vfg(ii%wsize)|FG_GLITCH);
+                putData(0, ii+snb, recval, vfg(ii%wsize)|FlgToiSpike);
                 glnscount++; 
               }
@@ -272 +272 @@
             else {   // On ne fait que flagger les echantillons
               for(ii=kgl; ii<k; ii++) {
-                putData(0, ii+snb, vin(ii%wsize), vfg(ii%wsize)|FG_GLITCH);
+                putData(0, ii+snb, vin(ii%wsize), vfg(ii%wsize)|FlgToiSpike);
                 glnscount++; 
               }
@@ -280 +280 @@
           else {  // Trop long ou trop court - ce n'est pas un glitch ...
             for(ii=kgl; ii<k; ii++) {
-              putData(0, ii+snb, vin(ii%wsize), vfg(ii%wsize));
+              if (k-kgl > maxpoints)  // Si trop long
+                putData(0, ii+snb, vin(ii%wsize), vfg(ii%wsize)|FlgToiSource);
+              else  // Trop court 
+                putData(0, ii+snb, vin(ii%wsize), vfg(ii%wsize));
             }
             lastput = snb+k-1;