Changeset 3656 in Sophya for trunk/AddOn/TAcq/mcrd.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/mcrd.cc (modified) (6 diffs)

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;