Changeset 1999 in Sophya for trunk

Timestamp:

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

Author:

ansari

Message:

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

Location:

trunk/ArchTOIPipe

Files:

• Kernel/flagtoidef.h (modified) (2 diffs)
• Kernel/toimanager.cc (modified) (2 diffs)
• Kernel/toimanager.h (modified) (3 diffs)
• ProcWSophya/simtoipr.cc (modified) (7 diffs)

trunk/ArchTOIPipe/Kernel/flagtoidef.h

@@ -4 +4 @@
 //                               Christophe Magneville
 //                               Reza Ansari
-// $Id: flagtoidef.h,v 1.6 2001-11-15 10:42:17 aubourg Exp $
+// $Id: flagtoidef.h,v 1.7 2002-05-13 15:50:49 ansari Exp $
 
 #ifndef FLAGTOIDEF_H
@@ -26 +26 @@
 // Sample killed because near a "flaggued" one ...
   FlgToiAround  =  (unsigned long long)1 << 6,
+// Sample belonging to a source or galaxy
+  FlgToiSource =  (unsigned long long)1 << 7,
 // All bit to one ...
 #ifdef IRIX64

trunk/ArchTOIPipe/Kernel/toimanager.cc

@@ -3 +3 @@
 //                               Christophe Magneville
 //                               Reza Ansari
-// $Id: toimanager.cc,v 1.12 2001-11-13 15:47:26 aubourg Exp $
+// $Id: toimanager.cc,v 1.13 2002-05-13 15:50:50 ansari Exp $
 
 #include "toimanager.h"
@@ -81 +81 @@
   TOIManager* mgr = TOIManager::getManager();
   
-  istart = mgr->getRequestedBegin();
-  iend = mgr->getRequestedEnd();
+  //  istart = mgr->getRequestedBegin();
+  //  iend = mgr->getRequestedEnd();
+  istart = SampleBegin();
+  iend = SampleEnd();
   
   dns_print = (iend-istart)/dns_print_fac;

trunk/ArchTOIPipe/Kernel/toimanager.h

@@ -5 +5 @@
 //                               Christophe Magneville
 //                               Reza Ansari
-// $Id: toimanager.h,v 1.11 2001-11-14 14:49:05 aubourg Exp $
+// $Id: toimanager.h,v 1.12 2002-05-13 15:50:50 ansari Exp $
 
 
@@ -45 +45 @@
   virtual       ~RzProcSampleCounter();
   virtual long  ProcessedSampleCount() = 0;
+  virtual long  SampleBegin() = 0;
+  virtual long  SampleEnd() = 0;
   virtual long  PrintStats();
   inline int &  PrintRate(int pr) { return _rate; } 
@@ -59 +61 @@
   virtual long  ProcessedSampleCount()
   { return _t->ProcessedSampleCount(); }
+  virtual long  SampleBegin() { return _t->getMinIn(); }
+  virtual long  SampleEnd() { return _t->getMaxIn(); }
 protected:
   const T * _t;

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;