Changeset 3656 in Sophya for trunk/AddOn

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

Location:

trunk/AddOn/TAcq

Files:

• brproc.cc (modified) (9 diffs)
• brproc.h (modified) (3 diffs)
• mcrd.cc (modified) (6 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();

trunk/AddOn/TAcq/brproc.h

@@ -30 +30 @@
   o nmax : Nombre maxi de frames traites 
   o fghist = true -> fait aussi l'histo des valeurs des echantillons temps
+  o nfsmap>0 : fabrication de cartes (image 2D) des spectres, 
+     avec nfsmap=nombre de frequences sommes  
   o fgnotrl = true -> fichiers fits / paquets sans trailer 
   o card : numero de carte , juste pour les impressions 
@@ -36 +38 @@
 public: 
   BRProcARaw2C(RAcqMemZoneMgr& mem, string& path, uint_4 nmean=10, 
-               uint_4 nmax=100, bool fgtshist=false, bool fgnotrl=false, int card=1);
+               uint_4 nmax=100, bool fgtshist=false, uint_4 nfsmap=0, 
+               bool fgnotrl=false, int card=1);
   virtual void run(); 
   void Stop();
@@ -44 +47 @@
   bool stop_;  
   uint_4 nmax_;  // Nombre maxi de blocs MemZone traites
-  uint_4 nmean_;  // Nombre de blocs pour le calcul des moyennes 
+  uint_4 nmean_;  // Nombre de spectres pour le calcul des moyennes 
+  uint_4 nfsmap_;  // Binning en frequence pour les cartes 2D temps-freq
   string path_;  
   bool fghist_;   // if true, fill and save histogram with time sample values

trunk/AddOn/TAcq/mcrd.cc

@@ -58 +58 @@
 static int NPaqinZone=128;
 static int NMean=1024;
+static int NFreqSMap=0;  // binning en frequences cartes 2D temps-freq, 0-> NoMap 2D spectres   
 static int NGenZ=100;
 static int GPaqSz=16424;
@@ -112 +113 @@
     if (narg>offa+1) sscanf(arg[offa+1],"%d,%d",&NZones,&NPaqinZone);   
     if (narg>offa+2) NMean=atoi(arg[offa+2]);
-    if (narg>offa+3) sscanf(arg[offa+3],"%d,%d,%lg",&GPaqSz,&NGenZ,&LossRate);  
+    if (narg>offa+3) NFreqSMap=atoi(arg[offa+3]);
+    if (narg>offa+4) sscanf(arg[offa+4],"%d,%d,%lg",&GPaqSz,&NGenZ,&LossRate);  
 
     cout << " ---------- mcrd.cc Start - ACT= " << act << " ------------- " << endl;
@@ -176 +178 @@
 
   outname += "/Ch12";
-  BRProcARaw2C proc(mmgr, outname, NMean, nmaxz, fghist, fgnotrl);
+  BRProcARaw2C proc(mmgr, outname, NMean, nmaxz, fghist, NFreqSMap, fgnotrl);
 
   cout << " mcrd/Proc1FRawA: Starting threads (reader, proc) ... " << endl;
@@ -243 +245 @@
   string outname1 = outname;
   outname1 += "/Ch12";
-  BRProcARaw2C proc1(mmgr1, outname1, NMean, nmaxz, fghist, fgnotrl);
+  BRProcARaw2C proc1(mmgr1, outname1, NMean, nmaxz, fghist, NFreqSMap, fgnotrl);
   string outname2 = outname;
   outname2 += "/Ch34";
-  BRProcARaw2C proc2(mmgr2, outname2, NMean, nmaxz, fghist, fgnotrl,2);
+  BRProcARaw2C proc2(mmgr2, outname2, NMean, nmaxz, fghist, NFreqSMap, fgnotrl,2);
   string outname12 = outname;
   outname12 += "/Ch1234";
@@ -294 +296 @@
   cout << " --- mcrd.cc : Reading/Processing BAORadio FITS files" << endl;
   cout << " Usage:  mcrd ACT OutPath InPath [InPath2] Imin,Imax\n" 
-       << "              [NZones,NPaqinZone] [NMean] [GPaqSz,NGenZones,LossRate]" << endl;
+       << "              [NZones,NPaqinZone] [NMean] [NFreqSMap]\n"
+       << "              [GPaqSz,NGenZones,LossRate]" << endl;
   if (fgshort) {
     cout << " mcrd -h for detailed instructions" << endl;
@@ -312 +315 @@
        << "     of the RAcqMemZoneMgr memory manager (default = 4,128)\n"
        << " NMean: Number of packet used for spectra/visibility computation (def=1024)\n"
+       << " NFreqSMap: Frequency binning for 2D (time-freq) spectra maps (def=0->No maps)\n"
        << " GPaqSz,NGenZones,LossRate: Paquet Size, Number of memory zones filled and\n"
        << "      loss rate (-2g,-4g) , default=16424,100,0.1" << endl;