Changeset 1488 in Sophya

Timestamp:

May 6, 2001, 5:52:35 PM (24 years ago)

Author:

ansari

Message:

transformation de NoOpProcessor en double entree - Reza 6/5/2001

Location:

trunk/ArchTOIPipe

Files:

• Processors/nooppr.cc (modified) (7 diffs)
• Processors/nooppr.h (modified) (1 diff)
• TestPipes/mesovh.cc (modified) (7 diffs)

trunk/ArchTOIPipe/Processors/nooppr.cc

@@ -18 +18 @@
      << " NoOpProcessor::PrintStatus() - WindowSize=" 
      << WSize() << endl; 
+  os << " Total number of processed samples= " << ProcessedSampleCount()
+     << endl;
   TOIProcessor::PrintStatus(os);
   os << " ------------------------------------------------------ " << endl;
@@ -25 +27 @@
   cout << "NoOpProcessor::init" << endl;
   declareInput("in");
+  declareInput("in2");
   declareOutput("out");
-  declareOutput("incopie");
+  declareOutput("out2");
   name = "NoOpProcessor";
   //  upExtra = 1;
@@ -37 +40 @@
   int sne = getMaxIn();
 
-  bool fgout = checkOutputTOIIndex(0);
-  bool fgincopie = checkOutputTOIIndex(1);
 
   if (!checkInputTOIIndex(0)) {
@@ -45 +46 @@
     throw ParmError("NoOpProcessor::run() Input TOI (in) not connected!");
   }
+  bool fgin2 = checkInputTOIIndex(1);
 
+  bool fgout = checkOutputTOIIndex(0);
+  bool fgout2 = checkOutputTOIIndex(1);
 
+  if (fgout2 && !fgin2) {
+    cerr << " NoOpProcessor::run() - out2 connected without in2!"
+         << endl;
+    throw ParmError("NoOpProcessor::run() out2 connected without in2!");
+  }
   cout << " NoOpProcessor::run() SNRange=" << snb << " - " << sne << endl; 
   
   double * vin = NULL;
-  double * vout = NULL;
+  double * vin2 = NULL;
   int_8 * vfg = NULL;
+  int_8 * vfg2 = NULL;
   try {
     // Le debut
     int k,i,klast;
-    int nks = 0;
     klast = snb-1;
     int totnbblock = 0;
@@ -61 +70 @@
     if (wsize > 1) {
       vin = new double[wsize];
-      vout = new double[wsize];
       vfg = new int_8[wsize];
+      if (fgin2) {
+        vin2 = new double[wsize];
+        vfg2 = new int_8[wsize];
+      }
     
       // Boucle sur les sampleNum
       // 1er partie, on traite par paquets de wsize
       for(k=snb;k<=sne-wsize+1;k+=wsize) {
-        for(i=0; i<wsize; i++) 
+        for(i=0; i<wsize; i++) { 
           getData(0, k+i, vin[i], vfg[i]);
+          if (fgin2)
+            getData(1, k+i, vin2[i], vfg2[i]);
+        }
         totnbblock++;
         for(i=0; i<wsize; i++) {
           if (fgout) 
-            putData(0,k+i,vout[i],vfg[i]);
-          if (fgincopie)  
-            putData(1, k+i, vin[i], vfg[i]);
+            putData(0,k+i,vin[i],vfg[i]);
+          if (fgout2)  
+            putData(1, k+i, vin2[i], vfg2[i]);
         }
+        klast+=wsize;
       }
-      klast+=wsize;
       totnscount+=wsize;
     }
@@ -88 +103 @@
         getData(0, k, inval, inflg);
         if (fgout) putData(0, k, inval, inflg);
-        if (fgincopie) 
-          putData(1, k, inval, inflg);
+        if (fgin2) { 
+          getData(1, k, inval, inflg);
+          if (fgout2) 
+            putData(1, k, inval, inflg);
+        }
         totnscount++;
       }
@@ -105 +123 @@
 
   if (vin) delete[] vin; 
-  if (vout) delete[] vout;
   if (vfg) delete[] vfg;  
+  if (vin2) delete[] vin2; 
+  if (vfg2) delete[] vfg2;  
 
 }

trunk/ArchTOIPipe/Processors/nooppr.h

@@ -7 +7 @@
 
 //  Un processeur qui ne fait rien !
+//   Au mieux, copie son entree sur la sortie - peut avoir 2 entrees
 //  Peut introduire un delai de wsize
 

trunk/ArchTOIPipe/TestPipes/mesovh.cc

@@ -32 +32 @@
   else {
     cout << "\n Usage : mesovh [-dbg] [-start snb] [-end sne] \n" 
-         << "         [-wtoi sz] [-wnoop sz] [-bipro] inFitsName \n"
+         << "         [-intoi name] [-wtoi sz] [-wnoop sz] [-bipro] \n"
+         << "         [-intoi2 name] inFitsName \n"
          << "   -dbg : sets TOISeqBuffered debug level to 1 \n"
          << "   -start snb : sets the start sample num \n"
@@ -40 +41 @@
          << "   -wnoop sz : sets NoOpProcessor window size \n"
          << "   -bipro : chain 2 processors \n"
+         << "   -intoi2 toiName : chaine 2 procs with toi2->in2\n"
          << endl;
     exit(0);
@@ -64 +66 @@
   string outppfname;
   string intoi = "boloMuV_27";
+  bool fgtoi2 = false;
+  string intoi2;
 
   if (narg < 4) Usage(true);
@@ -86 +90 @@
       wnoop = atoi(arg[ia+1]); ia++;
     }    
-    else if (strcmp(arg[ia],"-keepfft") == 0) {
-      if (ia == narg-1) Usage(true);  
-      keepfft = atoi(arg[ia+1]); ia++;
-    }    
     else if (strcmp(arg[ia],"-intoi") == 0) {
       if (ia == narg-1) Usage(true);  
       intoi = arg[ia+1]; ia++;
+    }    
+    else if (strcmp(arg[ia],"-intoi2") == 0) {
+      if (ia == narg-1) Usage(true);
+      fgbipro = fgtoi2 = true;
+      intoi2 = arg[ia+1]; ia++;
     }    
     else if (strcmp(arg[ia],"-bipro") == 0)  fgbipro = true;
@@ -144 +149 @@
     r.addOutput(intoi, toiin);
 
+    TOISeqBuffered * toi2 = NULL;    
+    if (fgtoi2) {
+      int w2 = (wnoop > 0) ? w1+wnoop : w1;
+      toi2 = new TOISeqBuffered("toi2", w2);
+      r.addOutput(intoi2, toi2);
+    }
+
     NoOpProcessor noop(wnoop);
     NoOpProcessor noop2(wnoop);
@@ -149 +161 @@
     noop.addInput("in",toiin);
     
-    TOISeqBuffered * toi2 = NULL;
+    TOISeqBuffered * toi3 = NULL;
     if (fgbipro) {
-      toi2 = new TOISeqBuffered("toi2", w1);
-      noop.addOutput("out", toi2);
-      noop2.addInput("in",toi2);
+      toi3 = new TOISeqBuffered("toi3", w1);
+      noop.addOutput("out", toi3);
+      noop2.addInput("in",toi3);
+      if (fgtoi2) {
+        noop2.addInput("in2",toi2);
+      }
     }
 
+    cout << noop;
+    if (fgbipro) cout << noop2;
     PrtTim("starting threads");
     r.start();
@@ -179 +196 @@
     //    w.PrintStatus(cout);  
 
-    cout << " ------ toiin, toiout and toiincopie Status information ------- " << endl;
+    cout << " ------ toiin, toi2 and toi3 Status information ------- " << endl;
     cout << *toiin; 
-    if (fgbipro) cout << *toi2; 
+    if (toi2) cout << *toi2; 
+    if (toi3) cout << *toi3; 
     cout << noop ; 
     if (fgbipro) cout << noop2 ;