Changeset 3643 in Sophya for trunk/AddOn/TAcq/tpciew.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/tpciew.cc (modified) (3 diffs)

trunk/AddOn/TAcq/tpciew.cc

@@ -19 +19 @@
 
 // #include "array.h"
-
+#ifndef NOPCIECARD
+#include <dmamgrv3.h>
+#endif
 #include "pciewrap.h"
 int main(int narg, char* arg[])
@@ -26 +28 @@
   if (narg < 2) {
     cout << "tpciew.cc/Usage: tpciew nread [prtlev=0] " << endl;
-    cout << "     nread<=0 --> PCIEWException " << endl;
     return 1;
   }
@@ -44 +45 @@
 #define SZ  4096  
     uint_1 data[SZ];
-    PCIEWrapper pciw;
-    if (NRead <= 0) {
-      uint_4 nbytes = 1;
-      while(nbytes > 0)  nbytes = pciw.NBytesToRead();
-      pciw.Read(data, SZ);
-    }
-    else {
-      for(int k=0; k<NRead; k++) {
-        uint_4 nbytes = 0;
-        while(nbytes <= 0) {
-          usleep(1000);
-          nbytes = pciw.NBytesToRead();
-        }
-        uint_4 nbok = pciw.Read(data, SZ);
-        cout << "---[" << k << "] pciw.Read(data, SZ=" << SZ << ") --> NBytesOk=" << nbok << endl;
-        if (PrtLev > 0) {
-          cout << "data[] : ";
-          for(int j=0; j<PrtLev*5; j++) cout << " , " << (uint_4)data[j];
-          cout << endl;
-        }
+    Byte* pdata;
+    int cardNum = 1;
+    uint_4 frameSize = 4096;
+    uint_4 paqSize = 4096; 
+    uint_4 patternSZ=0x400; 
+    uint_4 dmaSize  = 32*1024 ; 
+#ifndef NOPCIECARD
+    DMAMgr dmamgr(cardNum,patternSZ,dmaSize);
+    //RzDEL    PCIEWrapper pciw(dmamgr,frameSize,paqSize);
+    PCIEWrapper pciw(dmamgr);
+#else
+    TestPCIWrapperNODMA pciw(frameSize);
+#endif
+    for(int k=0; k<NRead; k++) {
+      pdata = pciw.GetData();
+      if (PrtLev > 0) {
+        cout << "data[] : ";
+        for(int j=0; j<PrtLev*5; j++) cout << " , " << (uint_4)pdata[j];
+        cout << endl;
       }
     }