Changeset 2000 in Sophya for trunk/ArchTOIPipe/Kernel

Timestamp:

May 14, 2002, 3:06:58 PM (23 years ago)

Author:

ansari

Message:

Corrections diverses et introduction d'une classe de calcul de ligne de
base par ajustement glissant d'un polynome (SimpleOffsetEstimator)
avec son programme test - Reza 14/5/2002

Location:

trunk/ArchTOIPipe/Kernel

Files:

• cgt.cc (modified) (4 diffs)
• cgt.h (modified) (1 diff)
• toimanager.h (modified) (3 diffs)
• toiprocessor.h (modified) (2 diffs)

trunk/ArchTOIPipe/Kernel/cgt.cc

@@ -13 +13 @@
 #include "toiseqbuff.h"
 #include "toisegment.h"
+#include "fitstoiwtr.h"
 
 #ifdef WITH_SOPHYA
@@ -63 +64 @@
 
 TOI& CGT::Connect(TOIProcessor& prout, string& out, 
-                  TOIProcessor& prin, string& in, string nom, int wbsz)
+                  TOIProcessor& prin, string& in, string nom, int wbsz, bool withFlag)
 {
   int id1 = findProcId(&prout);
@@ -82 +83 @@
   lesTuyaux.push_back(tuy);
   prout.addOutput(out, toi);
-  prin.addInput(in, toi);
+  if (withFlag) { // Si c'est un FITSTOIWriter
+    FITSTOIWriter* ftw = dynamic_cast< FITSTOIWriter* >(&prin);
+    if (ftw) ftw->addInput(in, toi, withFlag);
+    else prin.addInput(in, toi);
+  }
+  else prin.addInput(in, toi);
   if (dbgLevel > 1)
     cout << " CGT::Connect() TOI " << toi->getName() << " created " << endl;
@@ -89 +95 @@
 
 TOI& CGT::Connect(TOIProcessor& prout, const char* out, 
-                  TOIProcessor& prin, const char* in, string nom, int wbsz)
+                  TOIProcessor& prin, const char* in, string nom, int wbsz, bool withFlag)
 {
   string outs = out;  
   string ins = in;
-  return Connect(prout, outs, prin, ins, nom, wbsz);
+  return Connect(prout, outs, prin, ins, nom, wbsz, withFlag);
 }
 

trunk/ArchTOIPipe/Kernel/cgt.h

@@ -30 +30 @@
   
   virtual TOI& Connect(TOIProcessor& prout, string& out, 
-                       TOIProcessor& prin, string& in, string nom="", int wbsz=0);
+                       TOIProcessor& prin, string& in, string nom="", 
+                       int wbsz=0, bool withFlag=false);
   virtual TOI& Connect(TOIProcessor& prout, const char* out, 
-                       TOIProcessor& prin, const char* in, string nom="", int wbsz=0);
+                       TOIProcessor& prin, const char* in, string nom="", 
+                       int wbsz=0, bool withFlag=false);
 
   virtual void ListProcs(::ostream& os, bool prstat=false); // const plus tard

trunk/ArchTOIPipe/Kernel/toimanager.h

@@ -5 +5 @@
 //                               Christophe Magneville
 //                               Reza Ansari
-// $Id: toimanager.h,v 1.12 2002-05-13 15:50:50 ansari Exp $
+// $Id: toimanager.h,v 1.13 2002-05-14 13:06:57 ansari Exp $
 
 
@@ -58 +58 @@
 class ProcSampleCounter : public RzProcSampleCounter {
 public:
-  ProcSampleCounter(const T & t) { _t = &t; } 
+  ProcSampleCounter(T & t) { _t = &t; } 
   virtual long  ProcessedSampleCount()
   { return _t->ProcessedSampleCount(); }
@@ -64 +64 @@
   virtual long  SampleEnd() { return _t->getMaxIn(); }
 protected:
-  const T * _t;
+  T * _t;
 };
 

trunk/ArchTOIPipe/Kernel/toiprocessor.h

@@ -5 +5 @@
 //                               Christophe Magneville
 //                               Reza Ansari
-// $Id: toiprocessor.h,v 1.18 2001-11-29 18:19:32 aubourg Exp $
+// $Id: toiprocessor.h,v 1.19 2002-05-14 13:06:57 ansari Exp $
 
 
@@ -84 +84 @@
 
   // Gestion des bornes pour les transformations de TOIs...
+public:  
+  // Methodes passees en public par Reza, 14/5/2002
   virtual int   calcMinOut(); // Protected ?
   virtual int   calcMaxOut(); // Protected ?
+
+  virtual int   getMinIn();
+  virtual int   getMaxIn();
+protected:
+  // Implementation par defaut
   int           minOut;    // Cache for calcMinOut() value. Protected ?
   int           maxOut;    // Cache for calcMaxOut() value. Protected ?
 
-  virtual int   getMinIn();
-  virtual int   getMaxIn();
-  // Implementation par defaut
   int           upExtra;  // MaxIn - MaxOut : extra samples for processing
   int           lowExtra; // MinOut - MinIn : extra samples for processing