Changeset 3646 in Sophya for trunk/AddOn/TAcq/brproc.cc

Timestamp:

Jun 9, 2009, 11:50:46 PM (16 years ago)

Author:

ansari

Message:

Ajout du programme svv2mtx.cc de lecture des fichiers de mcrd.cc pour faire des tableaux 2D (matrices) temps-frequence + corrections mineures, Reza 09/06/2009

File:

• trunk/AddOn/TAcq/brproc.cc (modified) (18 diffs)

trunk/AddOn/TAcq/brproc.cc

@@ -9 +9 @@
 #include "pexceptions.h"
 #include "tvector.h"
+#include "ntuple.h"
 #include "fioarr.h"
 #include "timestamp.h"
@@ -63 +64 @@
     Timer tm("BRProcARaw2C", false);
     TimeStamp ts; 
-    BRPaqChecker pcheck(~fgnotrl_);  // Verification/comptage des paquets 
+    BRPaqChecker pcheck(!fgnotrl_);  // Verification/comptage des paquets 
     
     size_t totnbytesout = 0;
@@ -77 +78 @@
 //    filog << " ... NMaxMemZones=" << nmax_ << " NMean=" << nmean_ << " Step=" << step_ << endl;       
 
+// NTuple 
+    const char* nnames[8] = {"fcs","tts","s1","s2","s12","s12re","s12im","s12phi"};
+    NTuple nt(8, nnames);
+    double xnt[10];
+    uint_4 nmnt = 0;
+    double ms1,ms2,ms12,ms12re,ms12im,ms12phi;
 // Initialisation pour calcul FFT 
     TVector< complex<r_4> > cfour1;  // composant TF
     uint_4 paqsz = memgr.PaqSize();
     uint_4 procpaqsz = memgr.ProcPaqSize();
+    
+   
     BRPaquet pq(NULL, NULL, paqsz); 
     TVector<r_4> vx(pq.DataSize()/2);
@@ -86 +95 @@
     FFTPackServer ffts;
     ffts.FFTForward(vx, cfour1);
+//    cfour1.SetSize((paqsz-40)/2+1);
     TVector< complex<r_4> > cfour2(cfour1.Size());
     
@@ -92 +102 @@
     TVector< complex<r_4> > visiV12( cfour1.Size() );
 
+    cout << " *DBG*BRProcARaw2C PaqSz=" << paqsz << " ProcPaqSize=" << procpaqsz 
+         << " procpaqsz/2=" << procpaqsz/2 << " cfour1.Size()=" << cfour1.Size()
+         << " *8="  << cfour1.Size()*8 << endl;
 
     fftwf_plan plan1 = fftwf_plan_dft_r2c_1d(vx.Size(), vx.Data(), 
@@ -99 +112 @@
 
     uint_4 ifile = 0;                           
-    uint_4 nzm = 0;
+    uint_4 nzm = 0;  
     for (uint_4 kmz=0; kmz<nmax_; kmz++) {
       if (stop_) break;
@@ -113 +126 @@
         break;  
       }
-
+      nmnt=0;  ms1=ms2=ms12=ms12re=ms12im=ms12phi=0.;
       for(uint_4 i=0; i<memgr.NbPaquets(); i++) {
             BRPaquet paq(NULL, buff+i*paqsz, paqsz); 
         if (!pcheck.Check(paq)) continue;   // on ne traite que les paquets OK
-
+        
 // Traitement voie 1        
-          for(sa_size_t j=0; j<vx.Size(); j++) 
-            vx(j) = (r_4)(*(paq.Data1()+j))-127.5;
+            for(sa_size_t j=0; j<vx.Size(); j++) 
+              vx(j) = (r_4)(*(paq.Data1()+j))-127.5;
 //        fftwf_complex* coeff1 = (fftwf_complex*)(procbuff+i*procpaqsz);
-          fftwf_execute(plan1); 
-//        complex<r_4>* zp1 = (complex<r_4>*)(coeff1);
+            fftwf_execute(plan1); 
+//        complex<r_4>* zp1 = (complex<r_4>*)(vx.Data());
 //        ffts.FFTForward(vx, cfour1);
         for(sa_size_t j=0; j<spectreV1.Size(); j++) 
@@ -129 +142 @@
         memcpy(procbuff+i*procpaqsz, cfour1.Data(), sizeof(complex<r_4>)*cfour1.Size());
 // Traitement voie 2        
-        for(sa_size_t j=0; j<vx.Size(); j++) 
-          vx(j) = (r_4)(*(paq.Data2()+j))-127.5;
-
-        fftwf_execute(plan2); 
-
+            for(sa_size_t j=0; j<vx.Size(); j++) 
+              vx(j) = (r_4)(*(paq.Data2()+j))-127.5;
+
+        fftwf_execute(plan2); 
         for(sa_size_t j=0; j<spectreV2.Size(); j++) 
           spectreV2(j) += Zmod2(cfour2(j));  // Zmod2(zp2[j]); 
@@ -143 +155 @@
 //        for(sa_size_t j=0; j<visiV12.Size(); j++) visiV12(j)+=zp1[j]*zp2[j];
         nzm++;   
+        if (nmnt==0)  { xnt[0]=paq.FrameCounter();  xnt[1]=paq.TimeTag(); }
+        for(sa_size_t j=2700; j<2800; j++) { 
+          ms1 += Zmod2(cfour1(j)); ms2 += Zmod2(cfour2(j)); 
+          complex<r_4> zvis =  cfour1(j)*conj(cfour2(j));
+          ms12 += Zmod2(zvis);   ms12re += zvis.real();  ms12im += zvis.imag();
+          ms12phi+= atan2(zvis.imag(),zvis.real());
+        } 
+        nmnt++;    
         totnbytesproc += paq.DataSize();
         totnbytesout += (2*sizeof(complex<r_4>)*cfour1.Size());
 
       } // Fin de boucle sur les paquets d'une zone
+      if (nmnt>0)  {
+        double fnorm = (double)nmnt*(2800-2700); 
+        xnt[2] = ms1 /= fnorm;
+        xnt[3] = ms2 /= fnorm;
+        xnt[4] = ms12 /= fnorm;
+        xnt[5] = ms12re /= fnorm;
+        xnt[6] = ms12im /= fnorm;
+        xnt[7] = ms12phi /= fnorm;
+        nt.Fill(xnt);
+      }
       if ((nzm >= nmean_) || ((kmz==(nmax_-1))&&(nzm>1))) {
         spectreV1 /= (r_4)(nzm);
@@ -184 +214 @@
   cout << " ------------  BRProcARaw2C::run() END " << card2name_(card_) 
        << " ------------ " << endl;
+  {     
+  cout << nt;
+  sprintf(fname,"%s_nt.ppf",path_.c_str());
+  POutPersist po(fname);
+  po << PPFNameTag("ntv12") << nt; 
+  cout << " BRProcARaw2C::run() created NTuple file " << fname << card2name_(card_) << endl;
+  }     
   ts.SetNow();
   tm.SplitQ();
@@ -240 +277 @@
     Timer tm("BRProcBRaw4C", false);
     TimeStamp ts; 
-    BRPaqChecker pcheck1(~fgnotrl_);  // Verification/comptage des paquets 
-    BRPaqChecker pcheck2(~fgnotrl_);  // Verification/comptage des paquets 
+    BRPaqChecker pcheck1(!fgnotrl_);  // Verification/comptage des paquets 
+    BRPaqChecker pcheck2(!fgnotrl_);  // Verification/comptage des paquets 
 
     size_t totnbytesout = 0;
@@ -261 +298 @@
 
     TVector< complex<r_4> > cfour;  // composant TF
-    BRPaquet pq(NULL, NULL, paqsz); 
+/*   
+    BRPaquet pq(NULL, NULL, paqsz);     
     TVector<r_4> vx(pq.DataSize()/2);
     vx = (r_4)(0.);
@@ -271 +309 @@
     TVector< complex<r_4> > visiV23( cfour.Size() );
     TVector< complex<r_4> > visiV24( cfour.Size() );
+*/
+    int szfour = (paqsz-40)/2+1;
+    TVector< complex<r_4> > visiV13( szfour  );
+    TVector< complex<r_4> > visiV14( szfour );
+    TVector< complex<r_4> > visiV23( szfour );
+    TVector< complex<r_4> > visiV24( szfour );
+    // cout << " *DBG*AAAAA ---- Vectors OK" << endl; 
+    cout << " *DBG*BRProcBRaw4C PaqSz=" << paqsz << " ProcPaqSize=" << procpaqsz 
+         << " procpaqsz/2=" << procpaqsz/2 << " cfour.Size()=" << szfour
+         << " *8="  << szfour*8 << endl;
 
     uint_4 nzm = 0;
@@ -281 +329 @@
       uint_4 nokpaq = 0;
       if (stop_) break;
+       // cout << " *DBG*BBBBB" << kmz << endl; 
+
       int mid1 = memgr1.FindMemZoneId(MemZA_ProcB);
       Byte* buff1 = memgr1.GetMemZone(mid1);
@@ -305 +355 @@
       uint_4 i1,i2;
       i1=i2=0;
+//      cout << " *DBG*CCCCCC " << kmz << " memgr1.NbPaquets() =" << memgr1.NbPaquets() << endl;
       while((i1<memgr1.NbPaquets())&&(i2<memgr2.NbPaquets())) {
         BRPaquet paq1(NULL, buff1+i1*paqsz, paqsz); 
@@ -320 +371 @@
 // <<","<<paq2.FrameCounter()<<endl;
 
+        if ((i1>=memgr1.NbPaquets())||(i2>=memgr1.NbPaquets())) {
+          cout << " *BUG*BUG i1=" << i1 << " i2=" << i2 << endl;
+          break;
+        }
         // Les deux framecounters sont identiques ...
         noksfc++;
@@ -335 +390 @@
         totnbytesproc += 2*paq1.DataSize();
       } // Fin de boucle sur les paquets d'une zone
+      memgr1.FreeMemZone(mid1, MemZS_ProcB);
+      memgr2.FreeMemZone(mid2, MemZS_ProcB);
+
       if ((nzm >= nmean_) || ((kmz==(nmax_-1))&&(nzm>1))) {
         visiV13 /= complex<r_4>((r_4)nzm, 0.);
@@ -357 +415 @@
         visiV23 = complex<r_4>(0., 0.);
         visiV24 = complex<r_4>(0., 0.);
-        nzm = 0;  
+        nzm = 0;  ifile++; 
 //        ts.SetNow();
 //        filog << ts << " :  proc file  " << fname << endl;                   
         cout << " BRProcBRaw4C::run() created file  " << fname << endl;
       }   
-      memgr1.FreeMemZone(mid1, MemZS_ProcB);
-      memgr2.FreeMemZone(mid2, MemZS_ProcB);
       double okfrac = (nokpaq>1)?((double)noksfc/(double)nokpaq*100.):0.;
-      cout << "BRProcBRaw2C ["<<kmz<<"] NOKPaq=" << nokpaq << " NSameFC=" << noksfc 
+      cout << "BRProcBRaw4C ["<<kmz<<"] NOKPaq=" << nokpaq << " NSameFC=" << noksfc 
            << " (" << okfrac << " %)" << endl;
       totnokpaq += nokpaq;