Changeset 1483 in Sophya

Timestamp:

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

Author:

ansari

Message:

Petites amelioration SimpleFourierFilter - Reza 30/4/2001

Location:

trunk/ArchTOIPipe

Files:

• ProcWSophya/simtoipr.cc (modified) (5 diffs)
• ProcWSophya/simtoipr.h (modified) (2 diffs)
• TestPipes/simtst.cc (modified) (10 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;
 };
 

trunk/ArchTOIPipe/TestPipes/simtst.cc

@@ -34 +34 @@
     cout << "\n Usage : simtst [-dbg] [-start snb] [-end sne] \n" 
          << "         [-wtoi sz] [-wdegli sz] [-wfft sz] [-keepfft n] \n"
-         << "         inFitsName outFitsName  \n" 
+         << "         inFitsName outFitsName  outPPFName \n" 
          << "   -dbg : sets TOISeqBuffered debug level to 1 \n"
          << "   -start snb : sets the start sample num \n"
@@ -57 +57 @@
 
   bool fgdbg = false;
+  bool fgsetstart = false;
   int wtoi = 8192;
   int wdegli = 512;
@@ -62 +63 @@
   int keepfft = 0;
   int nmax = 10;
-  int istart = 104121000+wtoi*5;
+  int istart = 0;
   int iend = 0;
   double range_min = -16000;
@@ -68 +69 @@
   string infile;
   string outfile;
+  string outppfname;
   string intoi = "boloMuV_27";
   bool fg_f_filt = false;
@@ -78 +80 @@
       if (ia == narg-1) Usage(true);  // -start est suivi d'un argument 
       istart = atoi(arg[ia+1]); ia++;
+      fgsetstart = true;
     }    
     else if (strcmp(arg[ia],"-end") == 0) {
@@ -115 +118 @@
 
   if (iend < istart) iend = istart+wtoi*(nmax+5);
-  if ((narg-ko) < 2)  Usage(true); 
+  if ((narg-ko) < 3)  Usage(true); 
   infile = arg[ko];
   outfile = arg[ko+1];
+  outppfname = arg[ko+2];
 
   cout << " Initializing SOPHYA ... " << endl;
@@ -134 +138 @@
     //  mgr->setRequestedSample(11680920,11710584);
     //  mgr->setRequestedSample(104121000, 104946120);
-
-    mgr->setRequestedSample(istart, iend);
+    if (fgsetstart) 
+      mgr->setRequestedSample(istart, iend);
   
     //    FITSTOIReader r("/data/Archeops/bolo11.fits); 
@@ -146 +150 @@
 
     int w1 = wtoi;
-    int w2 = (fg_f_filt && (wfft > w1)) ? wfft : w1; 
+    int w2 = (fg_f_filt) ? 2*wfft+w1 : w1; 
 
     //    char * colname[5] = {"MJD", "UTC","boloMuV_11","magnFlux","pivot"};
@@ -158 +162 @@
     TOISeqBuffered * toisig = new TOISeqBuffered("sigma", w2);
     if (fgdbg) toisig->setDebugLevel(1);
-    TOISeqBuffered * toiincopie = new TOISeqBuffered("incopie", w1);
+    TOISeqBuffered * toiincopie = new TOISeqBuffered("incopie", w2);
     if (fgdbg) toiincopie->setDebugLevel(1);
     
@@ -234 +238 @@
     cout << " Creating Fourier Filter ... " << endl;
     SimpleFourierFilter sfft(fcoef);
-    sfft.KeepSpectra(keepfft);
+    sfft.KeepSpectra(outppfname, keepfft);
     TOISeqBuffered * toifft = NULL;
     TOISeqBuffered * toifiltcopie = NULL;