Changeset 1483 in Sophya for trunk/ArchTOIPipe/ProcWSophya

Timestamp:

Apr 30, 2001, 10:52:01 AM (24 years ago)

Author:

ansari

Message:

Petites amelioration SimpleFourierFilter - Reza 30/4/2001

Location:

trunk/ArchTOIPipe/ProcWSophya

Files:

• simtoipr.cc (modified) (5 diffs)
• simtoipr.h (modified) (2 diffs)

trunk/ArchTOIPipe/ProcWSophya/simtoipr.cc

@@ -615 +615 @@
   if (wsize < 16) 
     throw ParmError("SimpleFourierFilter::SimpleFourierFilter() WSize<16 !");
-  KeepSpectra(0);
+  KeepSpectra("spectra.ppf", 0);
 }
 
@@ -672 +672 @@
     Vector vout(wsize);
     TVector<int_8> vfg(wsize);
-    TVector< complex<r_8> > vfft;
+    TVector< complex<r_8> > vfft, vfftmean;
     TVector< complex<r_8> > zcoef(ffcoef.Size());
     zcoef = ffcoef;
@@ -679 +679 @@
     FFTPackServer ffts;
     ffts.setNormalize(true);
-    // Boucle sur les sampleNum
+
+    POutPersist pout(outppfname);
 
     int k,i,klast;
     int nks = 0;
-
+    int nblk = 0;
     klast = snb-1;
+    // Boucle sur les sampleNum
     // 1er partie, on traite par paquets de wsize
     for(k=snb;k<=sne-wsize+1;k+=wsize) {
@@ -690 +692 @@
         getData(0, k+i, vin(i), vfg(i));
       ffts.FFTForward(vin, vfft);
+      if (nblk == 0)  vfftmean = vfft;
+      else vfftmean += vfft;
+      nblk++;
       if (nks < nb_keep) {
-        string dbgfile = "ffiltdbg" + (string)MuTyV(nks) + ".ppf";
-        POutPersist po(dbgfile);
-        po << vfft; 
+        TVector< complex<r_8> > vfftcopie;
+        vfftcopie = vfft;
+        string nomvfft = "spectra" + MuTyV(nks);
+        pout.PutObject(vfftcopie, nomvfft); 
         nks++;
       }
@@ -719 +725 @@
         totnscount++;
       }
+
+    
+    vfftmean /= complex<r_8>((r_8)nblk, 0.);    
+    pout.PutObject(vfftmean, "meanspectra");
+
     cout << " SimpleFourierFilter::run() - End of processing " << endl;
   }  // Bloc try 

trunk/ArchTOIPipe/ProcWSophya/simtoipr.h

@@ -158 +158 @@
   virtual void  run();
 
-  inline  void  KeepSpectra(int nb=0) 
-                { nb_keep = nb; }
+  inline  void  KeepSpectra(string outname, int nb) 
+                { outppfname = outname; nb_keep = nb; }
 protected:
   int_8 totnscount;   // Nombre total d'echantillon processe
@@ -165 +165 @@
   Vector ffcoef;     // Coefficients du filtre
   int nb_keep;
+  string outppfname;
 };