Changeset 3634 in Sophya

Timestamp:

May 26, 2009, 10:41:50 AM (16 years ago)

Author:

ansari

Message:

Modifs, correction bug divers - Reza 26/05/2009

Location:

trunk/AddOn/TAcq

Files:

• racquproc.cc (modified) (3 diffs)
• tmtacq.cc (modified) (5 diffs)

trunk/AddOn/TAcq/racquproc.cc

@@ -61 +61 @@
     cout << " DataProc::run() - Starting " << ts << " NMaxMemZones=" << nmax_ 
          << " NMean=" << nmean_ << " Step=" << step_ << endl;   
+    cout << " DataProc::run()... - Output Data Path: " << path_ << endl;
     char fname[512];
     sprintf(fname,"%s/proc.log",path_.c_str());
@@ -164 +165 @@
     cout << " DataProc2C::run() - Starting " << ts << " NMaxMemZones=" << nmax_ 
          << " NMean=" << nmean_ << " Step=" << step_ << endl;   
+    cout << " DataProc::run()... - Output Data Path: " << path_ << endl;
     char fname[512];
     sprintf(fname,"%s/proc.log",path_.c_str());
@@ -288 +290 @@
     cout << " DataProcFFT2C::run() - Starting " << ts << " NMaxMemZones=" << nmax_ 
          << " NMean=" << nmean_ << " Step=" << step_ << endl;   
+    cout << " DataProc::run()... - Output Data Path: " << path_ << endl;
     char fname[512];
     sprintf(fname,"%s/proc.log",path_.c_str());

trunk/AddOn/TAcq/tmtacq.cc

@@ -232 +232 @@
   NMaxProc = atoi(arg[6]);  // Nombre de blocs traites par le thread de calcul
 
+  OutPathName = "./";
 #ifdef NOPCIECARD
-  string OutPathName = string(arg[7])+"/";
+  OutPathName = string(arg[7])+"/";
 #else  
-  string OutPathName =string("/Raid/")+arg[7]+"/";
+  OutPathName =string("/Raid/")+arg[7]+"/";
 #endif 
   cout << "  DataDirpath=" << OutPathName << " SwapMode=" << BRPaquet::FmtConvToString(swapall) 
@@ -390 +391 @@
   sleep(1);
   mmgr.Stop();
-  if (NMaxProc>0) if ( pPr != NULL) pr.join();
-  if (NMaxProc>0) if ( pPrfft != NULL) prfft.join();
+  if (NMaxProc>0) { 
+    if ( pPr != NULL) pr.join();
+    if ( pPrfft != NULL) prfft.join();
+  }
   cout << "tmtacq[6] - threads finished " << endl;
   tm.Split("Threads Finished");  
@@ -424 +427 @@
   else cout << " tmtacq[3] - fibre accrochee OK Card " << cardlist[1] << endl;
 
+  cout << "  ---- S to stop , C continue ... " << endl;
+  char ans[64];
+  gets(ans);
+  if ((ans[0] == 'S') || (ans[0] == 's'))  return 5;
+
   PCIEWrapper pciw1(dma1); 
   PCIEWrapper pciw2(dma2); 
@@ -435 +443 @@
     cout << "tmtacq[4] single thread/Card PCIE test PCIEReaderChecker ... ";
     PCIEReaderChecker pcirc1(pciw1,dmaSize,PaqSZ ,mmgr1, NMaxBloc, swapall);
-    PCIEReaderChecker pcirc2(pciw1,dmaSize,PaqSZ ,mmgr1, NMaxBloc, swapall);
+    PCIEReaderChecker pcirc2(pciw2,dmaSize,PaqSZ ,mmgr2, NMaxBloc, swapall);
     pPcierc=&pcirc1;
     pPcierc2=&pcirc2;
     pcirc1.start();
+    pcirc2.start();
 
     sleep(1);
@@ -497 +506 @@
   pcir1.join();
   ds1.join();
+  pcir2.join();
+  ds2.join();
   sleep(1);
   mmgr1.Stop();