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

Timestamp:

May 27, 2009, 9:37:27 PM (16 years ago)

Author:

ansari

Message:

Importation des modifs effectuees sur pc-sitr2 pour l'acquisition - Reza 27/05/2009

File:

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

trunk/AddOn/TAcq/racqurw.cc

@@ -76 +76 @@
   uint_4 paqsz = memgr.PaqSize();
   uint_4 dmasz = pciw_.TransferSize();
+  pciw_.StartTransfers();
 
   Byte* Datas = NULL;
@@ -95 +96 @@
     if (fgarret) break;
     // On pointe vers le debut de la zone a remplir aver le prochain DMA
-      Datas=pciw_.DoTransferData();
+      Datas=pciw_.GetData();
       if (Datas == NULL) { // No data Read in DMA 
         nerrdma ++;
@@ -263 +264 @@
           BRPaquet paq(NULL, buff+i*paqsz, paqsz);
           pcheck.Check(paq);   // Verification du paquet / FrameCounter 
-
-          header << hex << paq.HDRMarker() << " " << paq.TRLMarker() << " " << paq.TimeTag2()<< " "<< paq.TimeTag1()<< " " << paq.FrameCounter() << " " << paq.PaqLen()  << endl;
+          if (savesig_)
+             header << hex << paq.HDRMarker() << " " << paq.TRLMarker() << " " 
+                    << paq.TimeTag2()<< " "<< paq.TimeTag1()<< " " 
+                    << paq.FrameCounter() << " " << paq.PaqLen()  << endl;
 
           if (dthead) {  // Remplissage DataTable entetes paquets 
@@ -348 +351 @@
   uint_4 paqsz = memgr.PaqSize();
   uint_4 dmasz = pciw_.TransferSize();
+  pciw_.StartTransfers();
 
   BRPaqChecker pcheck;  // Verification/comptage des paquets 
@@ -371 +375 @@
       // On pointe vers le debut de la zone a remplir aver le prochain DMA
       //-- Zone memoire locale Byte* nextdma = buff+i*paqsz;
-        Datas=pciw_.DoTransferData();
+        Datas=pciw_.GetData();
         
         if (Datas == NULL) { // No data Read in DMA