Changeset 3640 in Sophya for trunk/AddOn/TAcq/mcrd.cc

Timestamp:

May 27, 2009, 5:15:45 PM (16 years ago)

Author:

ansari

Message:

Correction et ameliorations multiples - en particulier mcrd.cc, brproc.cc et brfitsrd.cc, Reza 27/05/2009

File:

• trunk/AddOn/TAcq/mcrd.cc (modified) (3 diffs)

trunk/AddOn/TAcq/mcrd.cc

@@ -59 +59 @@
   if (narg < 4) {
     cout << " --- Reading/Processing BAORadio FITS files" << endl;
-    cout << " Usage:  mcrd ACT OutPPF -infits DirName Imin Imax " << endl;
+    cout << " Usage:  mcrd ACT OutPPF -infits DirName Imin Imax [NZones,NbPaqinZone] " << endl;
     cout << " ACT= notrl FITS files without frame trailer \n" 
          << " OutPPF : Output PPF file name (without .ppf)" << endl;
     cout << " -infiles DirName Imin Imax : Input fits directory and sequence numbers \n" 
-         << "    FileNames=DirName/signalII.fits Imin<=II<=Imax " << endl;  
+         << "    FileNames=DirName/signalII.fits Imin<=II<=Imax \n"
+         << " - NZones,NbPaqinZone : Number of Zones and number of paquets in one zone\n" 
+         << "     of the RAcqMemZoneMgr memory manager (default = 4,128) " << endl;
     return 1;
   }
@@ -86 +88 @@
       infiles.push_back(nbuff);
     }
+    int nzones = 4;
+    int npaqz = 128;
+    if (narg>7) sscanf(arg[7],"%d,%d",&nzones,&npaqz);  
 
     cout << " ---------- mcrd.cc Start - ACT= " << act << " ------------- " << endl;
@@ -92 +97 @@
     if (act=="notrl") fgnotrl=true;  // fichier fits SANS trailer 
 
-    uint_4 paqsz, npaq;
-    DecodeMiniFitsHeader(infiles[0],paqsz, npaq, fgnotrl); 
+    uint_4 paqsz, npaqf;
+    DecodeMiniFitsHeader(infiles[0],paqsz, npaqf, fgnotrl); 
 
-    int nzones = 3;
-    RAcqMemZoneMgr mmgr(nzones, npaq, paqsz, sizeof(complex<r_4>)*paqsz);
+    cout << " mcrd: NZones=" << nzones << " NbPaq=" << npaqz << "(in file=" << npaqf
+         << " ) PaqSz=" << paqsz << endl;
+         
+    RAcqMemZoneMgr mmgr(nzones, npaqz, paqsz, sizeof(complex<r_4>)*paqsz);
     mmgr.SetFinalizedMask((uint_4)MemZS_ProcA);
 
     BRFitsReader reader(mmgr, infiles, fgnotrl);
-    BRProcARaw2C proc(mmgr, outname, npaq, 1, npaq*infiles.size());
+    BRProcARaw2C proc(mmgr, outname, npaqf, 1, npaqf*infiles.size()/npaqz);
 
     cout << " mcrd.cc : Starting threads (reader, proc) ... " << endl;