Changeset 1994 in Sophya for trunk/ArchTOIPipe

Timestamp:

May 13, 2002, 3:11:32 PM (23 years ago)

Author:

ansari

Message:

1/ Ajout classe CGT (Compagnie Generale des Tuyaux) - Assistance a l'assemblage
des TOIProcessors .
2/ Corrections mineures ds FitsTOIReader, correction de smkmflib

Reza 13/5/2002

Location:

trunk/ArchTOIPipe

Files:

• Kernel/cgt.cc (added)
• Kernel/cgt.h (added)
• Kernel/fitstoirdr.cc (modified) (9 diffs)
• Kernel/fitstoirdr.h (modified) (3 diffs)
• Processors/nooppr.cc (modified) (6 diffs)
• Processors/nooppr.h (modified) (3 diffs)
• smkmflib (modified) (2 diffs)

trunk/ArchTOIPipe/Kernel/fitstoirdr.cc

@@ -3 +3 @@
 //                               Christophe Magneville
 //                               Reza Ansari
-// $Id: fitstoirdr.cc,v 1.26 2001-12-21 17:00:40 aubourg Exp $
+// $Id: fitstoirdr.cc,v 1.27 2002-05-13 13:11:32 ansari Exp $
 
 #include "fitstoirdr.h"
@@ -27 +27 @@
 }
 
-void FITSTOIReader::setImplicitSN(int snStart) {
+void FITSTOIReader::setImplicitSN(long snStart) {
   implicitSN = true;
   implicitSNStart = snStart;
+}
+
+void FITSTOIReader::setBufferSize(int buffsz)
+{
+  Buff_Sz = (buffsz>0) ? buffsz: 1024;
+  return;
 }
 
@@ -144 +150 @@
   for (vector<string>::iterator i=allfn.begin(); i!=allfn.end(); i++) {
     openFile(*i);
-    //run1();
-    run2();
+    if (Buff_Sz > 1) run2();  // Lecture bufferise
+    else run1();              // Lecture un echantillon a la fois
   }
 }
 
 // run 1 : deprecated. NON MAINTENU. Incompatible avec implicit SN.
+//                     ^^^^^^^^^^^^  Reza , 13/5/2002 , Je viens de rajouter 
+//                                   implicitSNStart et switvh run1/run2 
+//                                   suivant buffersize
+  
 void FITSTOIReader::run1() {
   // Il faudrait optimiser en fonction de ce qui a ete demande comme samplenum,
@@ -165 +175 @@
     double y;
     fits_lock();
-    fits_read_col_dbl(fptr,1,i+1,1,1,0,&y,&anyNul,&fstatus);
+    long sn;
+    if (implicitSN) {
+      fits_read_col_dbl(fptr,1,i+1,1,1,0,&y,&anyNul,&fstatus);
+      sn = (long) (y+.1); 
+    }
+    else sn = implicitSNStart+i;
     //fits_unlock();
-    long sn = (long) (y+.1); 
     TOIManager* mgr = TOIManager::getManager();
     if (sn > mgr->getRequestedEnd()) {fits_unlock(); break;}
@@ -228 +242 @@
  long ideb=-1,ifin=-1;
  for(long i=0; i<nrows; i+=Buff_Sz) {
-
+   fits_lock();   // lock en debut de boucle de lecture - Reza 13/05/2002
    // faut-il lire dans le fichier fits ?
    if(i<ideb || i>ifin) { // Toujours vrai avec le += Buff_Sz
@@ -244 +258 @@
          samplenum[j] = j+ideb+implicitSNStart;
        }
-       fits_lock();
+       //---- Pas la peine, fait en debut de boucle - Reza 13/05/2002  fits_lock();
      } else {
-       fits_lock();
+       //---- Pas la peine, fait en debut de boucle - Reza 13/05/2002 fits_lock();
        fits_read_col_dbl(fptr,1,ideb+1,1,n,0,samplenum,&anyNul,&fstatus);
        if (samplenum[0] > mgr->getRequestedEnd() 
            || (forcedMaxIn > 0 && samplenum[0] > forcedMaxIn)) {
-         fits_unlock();
+         fits_unlock();  // unlock avant de casser la boucle - Reza 13/05/2002
          break;
        }
        if (samplenum[n-1] < mgr->getRequestedBegin()
            || (forcedMinIn > 0 && samplenum[n-1] < forcedMinIn)) {
-         fits_unlock();
+         //---- Pas la peine, fait en fin de boucle - Reza 13/05/2002 fits_unlock();
          continue;
        }
@@ -268 +282 @@
      if(fstatus!=0) {
        fits_report_error(stderr,fstatus);
+       fits_unlock(); // On supprime le lock avant le throw - Reza 13/05/2002
        throw RangeCheckError("FITSTOIReader::run2: Error Reading Fits file\n");
      }
-     fits_unlock();
    }
+   fits_unlock();   // unlock en debut de boucle de lecture - Reza 13/05/2002
 
    long ip = i-ideb; // pointeurs dans les buffers
@@ -288 +303 @@
      }
    }
-   totnscount++;
+   totnscount += (ifin-ideb+1);
  }
 
@@ -300 +315 @@
  colval.resize(0); colflg.resize(0);
 
- cout << "reader done reading... " << pthread_self() << endl;
-}
+ cout << "reader (buffered) done reading... " << pthread_self() << endl;
+}

trunk/ArchTOIPipe/Kernel/fitstoirdr.h

@@ -5 +5 @@
 //                               Christophe Magneville
 //                               Reza Ansari
-// $Id: fitstoirdr.h,v 1.10 2001-11-27 12:13:41 aubourg Exp $
+// $Id: fitstoirdr.h,v 1.11 2002-05-13 13:11:32 ansari Exp $
 
 
@@ -21 +21 @@
 class FITSTOIReader : public TOIProcessor {
 public:
-  FITSTOIReader(string fn,int buff_sz=1000);
+  FITSTOIReader(string fn,int buff_sz=1024);
   ~FITSTOIReader();
 
-  void         setImplicitSN(int snStart=0);
+  void         setImplicitSN(long snStart=0);
+
+  void         setBufferSize(int buffsz=1024);
+  inline int   getBufferSize() { return Buff_Sz; }
 
   virtual void addFile(string fn);
@@ -54 +57 @@
 
   bool      implicitSN;
-  int       implicitSNStart;
+  long      implicitSNStart;
   
   vector<string> allfn;

trunk/ArchTOIPipe/Processors/nooppr.cc

@@ -3 +3 @@
 //                               Christophe Magneville
 //                               Reza Ansari
-// $Id: nooppr.cc,v 1.9 2001-11-13 16:22:47 aubourg Exp $
+// $Id: nooppr.cc,v 1.10 2002-05-13 13:11:32 ansari Exp $
 
 #include <typeinfo>
@@ -14 +14 @@
 NoOpProcessor::NoOpProcessor(int wsz)
 {
+  if (wsz < 1) wsz = 1;
   wsize = wsz;
   totnscount = 0;
@@ -48 +49 @@
 
 
-  if (!checkInputTOIIndex(0)) {
+  if (!checkInputTOIIndex(0) && !checkInputTOIIndex(1) && 
+      !checkOutputTOIIndex(0) && !checkOutputTOIIndex(1) ) {
+    cerr << " NoOpProcessor::run() - No TOI connected! "
+         << endl;
+    throw ParmError("NoOpProcessor::run() No TOI connected!");
+  }
+
+  if (!acceptnoinput && !checkInputTOIIndex(0)) {
     cerr << " NoOpProcessor::run() - Input TOI (in) not connected! "
          << endl;
     throw ParmError("NoOpProcessor::run() Input TOI (in) not connected!");
   }
+  bool fgin = checkInputTOIIndex(0);
   bool fgin2 = checkInputTOIIndex(1);
 
@@ -58 +67 @@
   bool fgout2 = checkOutputTOIIndex(1);
 
-  if (fgout2 && !fgin2) {
+  if (fgout2 && (!fgin2 && !acceptnoinput) ) {
     cerr << " NoOpProcessor::run() - out2 connected without in2!"
          << endl;
@@ -78 +87 @@
       vin = new double[wsize];
       vfg = new uint_8[wsize];
-      if (fgin2) {
+      for(i=0; i<wsize; i++) { 
+        vin[i] = defval; vfg[i] = defflag;
+      }
+      if (fgin2 || fgout2) {
         vin2 = new double[wsize];
         vfg2 = new uint_8[wsize];
+        for(i=0; i<wsize; i++) { 
+          vin2[i] = defval; vfg2[i] = defflag;
+        }       
       }
     
@@ -86 +101 @@
       // 1er partie, on traite par paquets de wsize
       for(k=snb;k<=sne-wsize+1;k+=wsize) {
-        for(i=0; i<wsize; i++) { 
-          getData(0, k+i, vin[i], vfg[i]);
-          if (fgin2)
-            getData(1, k+i, vin2[i], vfg2[i]);
-        }
+        if (fgin) 
+          getData(0, k, wsize, vin, vfg);
+        if (fgin2)
+          getData(1, k, wsize, vin2, vfg2);
         totnbblock++;
-        for(i=0; i<wsize; i++) {
-          if (fgout) 
-            putData(0,k+i,vin[i],vfg[i]);
-          if (fgout2)  
-            putData(1, k+i, vin2[i], vfg2[i]);
-        }
+        if (fgout) 
+          putData(0, k, wsize, vin, vfg);
+        if (fgout2)  
+          putData(1, k, wsize, vin2, vfg2);
         klast+=wsize;
         totnscount+=wsize;
+        totnbblock++;
       }
     }
 
     // 2eme partie, on traite la fin du bloc d'echantillons si necessaire
-    double inval;
-    uint_8 inflg;
+    double inval = defval;;
+    uint_8 inflg = defflag;
+    double inval2 = defval;;
+    uint_8 inflg2 = defflag;
     if (klast < sne) 
       for(k=klast+1; k<=sne; k++) {
-        getData(0, k, inval, inflg);
+        if (fgin) 
+          getData(0, k, inval, inflg);
         if (fgout) putData(0, k, inval, inflg);
-        if (fgin2) { 
-          getData(1, k, inval, inflg);
-          if (fgout2) 
-            putData(1, k, inval, inflg);
-        }
+        if (fgin2)  
+          getData(1, k, inval2, inflg2);
+        if (fgout2) 
+            putData(1, k, inval2, inflg2);
         totnscount++;
       }
-
-    totnbblock++;
+    totnbblock++; 
 
     cout << " NoOpProcessor::run() - End of processing " 
-         << " TotNbBlocks= " << totnbblock << endl;
+         << " TotNbBlocks= " << totnbblock << " ProcSamples=" << totnscount << endl;
   }  // Bloc try 
 

trunk/ArchTOIPipe/Processors/nooppr.h

@@ -5 +5 @@
 //                               Christophe Magneville
 //                               Reza Ansari
-// $Id: nooppr.h,v 1.5 2001-11-13 16:22:47 aubourg Exp $
+// $Id: nooppr.h,v 1.6 2002-05-13 13:11:32 ansari Exp $
 
 
@@ -25 +25 @@
   inline int_8  ProcessedSampleCount() const { return totnscount; }
 
+  inline void   AcceptNoInput(double val=0., long flg=0)
+         { acceptnoinput = true; defval = val; defflag = flg; }
+
   virtual void  PrintStatus(::ostream & os) ; // const plus tard
 
@@ -33 +36 @@
   int_8 totnscount;   // Nombre total d'echantillon processe
   int wsize;         // Taille de fenetre de travail
+
+  bool acceptnoinput;
+  double defval;
+  long defflag;
 };
 

trunk/ArchTOIPipe/smkmflib

@@ -24 +24 @@
 rm -f $liblist
 touch $liblist
-ls *.{c,cc} | comm -3 -1 $TMPDIR/exclude.sort - | sed -e 's/\.cc/.o/' | sed -e 's/\.c/.o/' >> $liblist
+ls -1 *.{c,cc} | comm -3 -1 $TMPDIR/exclude.sort - | sed -e 's/\.cc/.o/' | sed -e 's/\.c/.o/' >> $liblist
 unset liblist
 
@@ -61 +61 @@
 
 echo $libf ':' \
- `ls *.{c,cc} | comm -3 -1 $TMPDIR/exclude.sort - | sed -e 's/\.cc/.o/' | sed -e 's/\.c/.o/' | sed -e 's/^/$(OBJ)/'` >> GNUmakefile
+ `ls -1 *.{c,cc} | comm -3 -1 $TMPDIR/exclude.sort - | sed -e 's/\.cc/.o/' | sed -e 's/\.c/.o/' | sed -e 's/^/$(OBJ)/'` >> GNUmakefile
 echo '  $(ARCXX) $(ARCXXFLAGS) $@ $($(ARARGS))' >> GNUmakefile
 #  Pour faire compiler les instantiations automatique de cxx (DEC)