Changeset 3675 in Sophya for trunk/AddOn/TAcq/racqurw.cc

Timestamp:

Nov 15, 2009, 12:06:04 PM (16 years ago)

Author:

ansari

Message:

Correction bug avec reduction taille de paquet - Reza 15/11/2009

File:

• trunk/AddOn/TAcq/racqurw.cc (modified) (4 diffs)

trunk/AddOn/TAcq/racqurw.cc

@@ -498 +498 @@
   
   cout << " PCIEMultiReader::run() - Starting , NMaxMemZones=" << nmax_ 
-       << " memgr.NbPaquets()=" << memgr.NbPaquets() << "Paqsize " << packSize_
-       << "  " << BRPaquet::FmtConvToString(swapall_) << endl;  
+       << " memgr.NbPaquets(),PaqSz=" << memgr.NbPaquets() << " ," << memgr.PaqSize() 
+       << " DMA-Paqsize " << packSize_ << "  " << BRPaquet::FmtConvToString(swapall_) << endl;  
   setRC(1);     
 
   // sigaddset(&act.sa_mask,SIGINT);  // pour proteger le transfert DMA
   //sigaction(SIGINT,&act,NULL);        
-  // uint_4 paqsz = memgr[0]->PaqSize();
+  uint_4 paqszmm = memgr.PaqSize();
   uint_4 paqsz =  packSize_;
   uint_4 dmasz = vec_pciw_[0]->TransferSize();
@@ -600 +600 @@
             BRPaquet paqc(tampon[fib], nextpaq, paqsz, swapall_);
           }
-          BRPaquet paq(nextpaq, paqsz);
+          BRPaquet paq(nextpaq, packSizeInMgr_);
           npaqfait[fib]++;
           if (fib==nbDma_-1) npaqfaitg++;  // Ne pas oublier le compteur de paquets faits 
@@ -647 +647 @@
           BRPaquet paqc(Datas[fib]+curoff, nextpaq, paqsz, swapall_);
         }
-        BRPaquet paq(nextpaq, paqsz);
+        BRPaquet paq(nextpaq, packSizeInMgr_);
         npaqfait[fib]++;
         if (fib==nbDma_-1) npaqfaitg++;  // Ne pas oublier le compteur de paquets faits 
@@ -918 +918 @@
     mff[fib].AddKeyD("ACQVER", acpar.AcqVersion(), " BAORadio Acq Software version ") ;
     mff[fib].AddKeyS("ACQCONF", acpar.GetParams().AcqMode, " BAORadio Acq run  mode" );
+    mff[fib].AddKeyI("FIBERNUM", acpar.GetParams().FiberNum[fib], " Fiber number/id") ;
     if (hassrc) 
       mff[fib].AddKeyS("SKYSOURC", skysrc, " Source identification" );