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

Timestamp:

Sep 9, 2009, 1:56:34 PM (16 years ago)

Author:

ansari

Message:

Ajout possibilite sauvegarde des cartes 2D temps frequence ds BRProcARaw2C , mcrd.cc - Reza 9/9/2009

File:

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

trunk/AddOn/TAcq/brproc.cc

@@ -36 +36 @@
 /* --Methode-- */
 BRProcARaw2C::BRProcARaw2C(RAcqMemZoneMgr& mem, string& path, uint_4 nmean, 
-                           uint_4 nmax, bool fghist, bool fgnotrl, int card)
+                           uint_4 nmax, bool fghist, uint_4 nfsmap, bool fgnotrl, int card)
   :  memgr(mem) 
 {
   nmax_ = nmax; 
   nmean_ = nmean;
+  nfsmap_ = nfsmap;
   stop_ = false;        
   path_ = path; 
@@ -113 +114 @@
 */
 
+    bool fgtimfreq = false;  // true->cartes temps<>frequences
+    if (nfsmap_>0) fgtimfreq=true;
+
     TVector< complex<r_4> > cfour2(cfour1.Size());
     
@@ -123 +127 @@
     TVector< complex<r_4> > visiV12( cfour1.Size() );
 
+    TMatrix<r_4> timfreqV1, timfreqV2;   // Cartes temps<>frequences
+    if (fgtimfreq) {
+      timfreqV1.SetSize(nmean_, spectreV1.Size()/nfsmap_);
+      timfreqV2.SetSize(nmean_, spectreV2.Size()/nfsmap_);
+    }
     cout << " *DBG*BRProcARaw2C PaqSz=" << paqsz << " ProcPaqSize=" << procpaqsz 
          << " procpaqsz/2=" << procpaqsz/2 << " cfour1.Size()=" << cfour1.Size()
@@ -181 +190 @@
           spectreV1(j) += Zmod2(cfour1(j));
         memcpy(procbuff+i*procpaqsz, cfour1.Data(), sizeof(complex<r_4>)*cfour1.Size());
+        if (fgtimfreq) {   // Remplissage tableau temps-frequence
+          for(sa_size_t c=1; c<timfreqV1.NCols(); c++) {
+            for(sa_size_t j=c*nfsmap_; j<(c+1)*nfsmap_; j++) 
+              timfreqV1(nzm, c) += Zmod2(cfour1(j));
+          }
+        }
 // Traitement voie 2        
         if (fghist_) {
@@ -197 +212 @@
           spectreV2(j) += Zmod2(cfour2(j));  // Zmod2(zp2[j]); 
         memcpy(procbuff+i*procpaqsz+procpaqsz/2, cfour2.Data(), sizeof(complex<r_4>)*cfour2.Size());
+        if (fgtimfreq) {   // Remplissage tableau temps-frequence
+          for(sa_size_t c=1; c<timfreqV2.NCols(); c++) {
+            for(sa_size_t j=c*nfsmap_; j<(c+1)*nfsmap_; j++) 
+              timfreqV2(nzm,c) += Zmod2(cfour2(j));
+          }
+        }
 
 // Calcul correlation (visibilite V1 * V2)
@@ -268 +289 @@
         string tagh1="tshV1";
         string tagh2="tshV2";
+        string tagtf1="timfreqV1";
+        string tagtf2="timfreqV2";
         if (card_==2) {
           tag1 = "specV3";
@@ -274 +297 @@
           tagh2 = "tshV2";
           tag12="visiV34";
+          tagtf1="timfreqV3";
+          tagtf2="timfreqV4";
         }
         po << PPFNameTag(tag1) << spectreV1; 
@@ -281 +306 @@
           po << PPFNameTag(tagh1) << h1; 
           po << PPFNameTag(tagh2) << h2; 
+        }
+        if (fgtimfreq) {
+          timfreqV1 /= (r_4)nzm;
+          timfreqV2 /= (r_4)nzm;
+          po << PPFNameTag(tagtf1) << timfreqV1; 
+          po << PPFNameTag(tagtf2) << timfreqV2; 
         }
         }
@@ -290 +321 @@
           h2.Zero();
         }
+        if (fgtimfreq) {
+          timfreqV1 = (r_4)(0.);
+          timfreqV2 = (r_4)(0.);
+        }
         nzm = 0;  ifile++; 
 //        ts.SetNow();