Changeset 3699 in Sophya for trunk

Timestamp:

Dec 4, 2009, 10:54:15 PM (16 years ago)

Author:

ansari

Message:

recherche du probleme nb de paquets lus=50% nb de paquets, Reza 4/12/09

Location:

trunk/AddOn/TAcq

Files:

• brfitsrd.cc (modified) (2 diffs)
• svv2mtx.cc (modified) (7 diffs)

trunk/AddOn/TAcq/brfitsrd.cc

@@ -113 +113 @@
       cout << " Fiber" << fib << " TotNPaqRd=" << totnpqrd_[fib] << " TotNPaqOK=" << totnpqok_[fib] 
            << " FracSameFC=" << perc << " %" << endl;
+      if (prtlev_ > 0)  vpchk_[fib].Print(cout);
     }
     cout << "  TotalDiskRead= " << totnbytesrd_/(1024*1024) << " MBytes Disk-Read rate= " 
@@ -178 +179 @@
       char flnm[1024];
       sprintf(flnm,"%s/signal%d.fits",dirs_[fib].c_str(),vfilenum_[fib]++);
-      if (prtlev_ > 0)
+      if (prtlev_ > 1)
         cout << " BRMultiFitsReader::ReadNext() opening" << flnm << endl;
       mff_[fib].Open(flnm, MF_Read);

trunk/AddOn/TAcq/svv2mtx.cc

@@ -26 +26 @@
 #include "matharr.h" 
 #include "timestamp.h"
-/*
-#include "fftpserver.h"
-#include "fftwserver.h"
-
-#include "FFTW/fftw3.h"
-*/
+
 // include sophya mesure ressource CPU/memoire ...
 #include "resusage.h"
@@ -40 +35 @@
 int Usage(bool fgshort=true);
 // Pour traitement (calcul FFT et visibilites (ProcA) 1 fibre, 2 voies RAW)
-int ProcSVFiles(string& inoutpath, int imin, int imax, int istep, int jf1, int jf2, int nfreq, int card=1);
+int ProcSVFilesVJun09(string& inoutpath, int imin, int imax, int istep, int jf1, int jf2, int nfreq, int card=1);
+int ProcSVFiles(string& inoutpath, int imin, int imax, int istep, int jf1, int jf2, int nfreq);
 
 //----------------------------------------------------
@@ -69 +65 @@
     cout << "Frequency num range JF=" << jf1 << "," << jf2 << "," << nfreq << "  ------- " << endl;
     ResourceUsage resu;
-    rc=ProcSVFiles(inoutpath, imin, imax, istep, jf1, jf2, nfreq, card);
+    rc=ProcSVFilesVJun09(inoutpath, imin, imax, istep, jf1, jf2, nfreq, card);
     resu.Update();
     cout << resu;
@@ -96 +92 @@
 
 // Pour traitement (calcul FFT et visibilites (ProcA) 1 fibre, 2 voies RAW)
-int ProcSVFiles(string& inoutpath, int imin, int imax, int istep, int jf1, int jf2, int nfreq, int card)
+int ProcSVFilesVJun09(string& inoutpath, int imin, int imax, int istep, int jf1, int jf2, int nfreq, int card)
 {
   Timer tm("ProcSVFiles");
@@ -135 +131 @@
     if (ifile==imin) {
       nrows = sv1.Size();
-      cout << " ProcSVFiles/Info: Output s1,s2 matrix size NRows=NFreq=" 
+      cout << " ProcSVFilesVJun09/Info: Output s1,s2 matrix size NRows=NFreq=" 
            << nrows << " NCols=NFiles=" << ncols << endl;
       s1.SetSize(nrows, ncols);
       s2.SetSize(nrows, ncols);
       nrows = vv12.Size();
-      cout << " ProcSVFiles/Info: Output v12 matrix size NRows=NFreq=" 
+      cout << " ProcSVFilesVJun09/Info: Output v12 matrix size NRows=NFreq=" 
            << nrows << " NCols=NFiles=" << ncols << endl;
       v12re.SetSize(nrows, ncols);
@@ -195 +191 @@
 
   cout << nt;
-  cout << "ProcSVFiles: Opening file " << fname << " for writing" << endl;  
+  cout << "ProcSVFilesVJun09: Opening file " << fname << " for writing" << endl;  
   POutPersist po(fname);
   string tag1="s1";
@@ -217 +213 @@
   po <<  PPFNameTag(tag12p) << v12phi;
   po <<  PPFNameTag(tagnt) << nt;
-  cout << "ProcSVFiles: Matrices s1, s2, v12re, v12im, v12phi, NTuple nt written to file " << fname << endl;  
+  cout << "ProcSVFilesVJun09: Matrices s1, s2, v12re, v12im, v12phi, NTuple nt written to file " << fname << endl;  
   return 0;
 }