Changeset 3914 in Sophya for trunk/AddOn/TAcq

Timestamp:

Nov 26, 2010, 4:58:38 PM (15 years ago)

Author:

ansari

Message:

Corrections bug (FiberId[] -> () et aoff+=2) apres test version DMA, Reza 26/11/2010

File:

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

trunk/AddOn/TAcq/mfacq.cc

@@ -156 +156 @@
       if (strcmp(arg[aoff],"-dc") != 0) break;
       dcf << arg[aoff+1] << endl;
+      aoff+=2;
     }
     if ((act==0)&&(aoff<narg)) {  // default ethernet target destinations 
@@ -220 +221 @@
 #ifndef NOPCIECARD  
   for (size_t i=0 ;i <acpar.NFibers() ;i++) {
-    UINT32 card=(acpar.FiberNum[i]-1)/2+1;
-    UINT32 cardfiber=(acpar.FiberNum[i]-1)%2;
+    UINT32 card=(acpar.FiberNum(i)-1)/2+1;
+    UINT32 cardfiber=(acpar.FiberNum(i)-1)%2;
     cout <<"mfacq[2] CreatePCIEWrapperV6- indice " << i <<  "INIT card " << card 
          << " fibre " << cardfiber << endl;
@@ -288 +289 @@
 #ifndef NOPCIECARD
   for (size_t i=0; i<acpar.NbFibers(); i++) {
-    UINT32 card=(acpar.FiberNum[i]-1)/2+1;
-    UINT32 cardfiber=(acpar.FiberNum[i]-1)%2;
+    UINT32 card=(acpar.FiberNum(i)-1)/2+1;
+    UINT32 cardfiber=(acpar.FiberNum(i)-1)%2;
     DeletePCIEWrapperV6(card,cardfiber);
   }
@@ -314 +315 @@
 #ifndef NOPCIECARD  
   for (size_t i=0 ;i <acpar.NFibers() ;i++) {
-    UINT32 card=(acpar.FiberNum[i]-1)/2+1;
-    UINT32 cardfiber=(acpar.FiberNum[i]-1)%2;
+    UINT32 card=(acpar.FiberNum(i)-1)/2+1;
+    UINT32 cardfiber=(acpar.FiberNum(i)-1)%2;
     cout <<"mfacq[2] CreatePCIEWrapperV6- indice " << i <<  "INIT card " << card 
          << " fibre " << cardfiber << endl;
@@ -363 +364 @@
 #ifndef NOPCIECARD
   for (size_t i=0; i<acpar.NbFibers(); i++) {
-    UINT32 card=(acpar.FiberNum[i]-1)/2+1;
-    UINT32 cardfiber=(acpar.FiberNum[i]-1)%2;
+    UINT32 card=(acpar.FiberNum(i)-1)/2+1;
+    UINT32 cardfiber=(acpar.FiberNum(i)-1)%2;
     DeletePCIEWrapperV6(card,cardfiber);
   }