Changeset 3911 in Sophya

Timestamp:

Nov 21, 2010, 6:23:18 PM (15 years ago)

Author:

ansari

Message:

debug/amelioration print pour les modifs pour preparation Pittsburgh-Nov2010, Reza 21/11/2010

Location:

trunk/AddOn/TAcq

Files:

• brparam.cc (modified) (2 diffs)
• brviscalc.cc (modified) (1 diff)
• pciewrap.cc (modified) (1 diff)
• racqueth.cc (modified) (6 diffs)
• racqueth.h (modified) (1 diff)
• racqurw.cc (modified) (5 diffs)
• racqurw.h (modified) (1 diff)

trunk/AddOn/TAcq/brparam.cc

@@ -111 +111 @@
   FiberListS=fibres;
   FiberIdsS="1,2,3,4,5,6,7,8";
+  for (int ii=0; ii<PMAXNBFIBRES; ii++)  FiberIds.push_back(ii+1); 
 
   PaqSize=paqsz;
@@ -327 +328 @@
   vector<string> fiblist;
   FillVStringFrString(FiberListS, fiblist, ',');
+  FiberNum.resize(fiblist.size());
   for (int fib=0; fib<fiblist.size(); fib++) {
-    FiberNum.push_back(atoi(fiblist[fib].c_str())); 
+    FiberNum[fib]=atoi(fiblist[fib].c_str()); 
   }
   vector<string> fibids;
   FillVStringFrString(FiberIdsS, fibids, ',');
   for (int fib=0; fib<fibids.size(); fib++) {
-    FiberIds.push_back(atoi(fibids[fib].c_str())); 
+    FiberIds[fib]=atoi(fibids[fib].c_str()); 
   }
 

trunk/AddOn/TAcq/brviscalc.cc

@@ -179 +179 @@
     filename = outpath_+sbuff;
   }
-  POutPersist poc(outpath_+"chanum.ppf");
+  POutPersist poc(filename);
   poc << PPFNameTag("chanids") << chanids_; 
   poc << PPFNameTag("chanpairs") << chanpairs_; 
   poc << PPFNameTag("chanpairnum") << chanpairnum_; 
   poc << PPFNameTag("chanpairsall") << chanpairsall_; 
-  poc << PPFNameTag("chanpairnumal") << chanpairnumall_; 
+  poc << PPFNameTag("chanpairnumall") << chanpairnumall_; 
   cout << "BRVisibilityCalculator[" << calcid_ << "]::UpdateChanIds() Channel Ids/Pairs saved to PPF file " 
        << filename << endl; 
   cout << " ... ChannelPairs= " ;
   for(sa_size_t ir=0; ir<chanpairs_.NRows(); ir++) {
-    if (ir%10)  cout << endl;
+    if (ir%10==0)  cout << endl;
     cout << "(" << chanpairs_(ir,0) << "," << chanpairs_(ir,1) << ") ";
   }

trunk/AddOn/TAcq/pciewrap.cc

@@ -78 +78 @@
 Byte* TestPCIWrapperNODMA::GetData()
 {
-  if (frame_counter_>max_frcount_)  return NULL;
+  if ((max_frcount_>0)&&(frame_counter_>max_frcount_))  return NULL;
   if (lossrate_ > 1.e-9) {
     UInt32 dfc = 1; 

trunk/AddOn/TAcq/racqueth.cc

@@ -77 +77 @@
   }
   totrdsnd_ = 0;
+  stopreason_="??Unknown??";
   SetPrintLevel(par.prtlevel_,par.prtmodulo_);
 }
@@ -197 +198 @@
       if (Datas[dma] == NULL) { // No data Read in DMA 
         fgbaddma=true;
-        cout << "PCIEToEthernetChecker/Error Waiting for datas ..." << endl;
+        cout << "PCIEToEthernetChecker/ERROR - DMA failed !" << endl;
         vec_pciw_[dma]->PrintStatus(cout);
+        stopreason_="--Failed DMA--";
         fgarret = true;  break; 
       }
@@ -292 +294 @@
     } // FIN du if numero D 
   }  //   FIN  Boucle global G 
+
+  if (npaqfaitg >= nmaxpaq_)   stopreason_="--Max Nb paquets reached--";
  
   // ----- Nettoyage final et impression de resume -------
@@ -299 +303 @@
   double tmelaps2 = (tv2.tv_sec-tv1.tv_sec)*1000.+(tv2.tv_usec-tv1.tv_usec)/1000.;
   if (tmelaps2<0.1) tmelaps2=0.1; 
-  cout << " ---------- PCIEToEthernet::run()-End summary NPaqFait=" << npaqfaitg 
+  cout << " ---------- PCIEToEthernet::run()-End StopReason: " << stopreason_ << endl
+       << " Summary NPaqFait=" << npaqfaitg 
        << " TotSend (kb)=" << totrdsnd_/1024 << "------ " << endl;
   for (int dma=0; dma < (int)nbDma_ ;dma++)   {
@@ -468 +473 @@
       encore=false;
       for(size_t ii=0; ii<vsok_.size()-1; ii++) {
-        if (vfibid_[ii]<vfibid_[ii+1]) {
+        if (vfibid_[ii]>vfibid_[ii+1]) {
           tmpskt=vsok_[ii];  tmpid=vfibid_[ii];
           vsok_[ii]=vsok_[ii+1];  vfibid_[ii]=vfibid_[ii+1];
@@ -884 +889 @@
   */
   if (mid_ >= 0)  { 
+    memgr_.GetAuxData(mid_)->filltime_.SetNow(); 
     if (fgclean) memgr_.FreeMemZone(mid_, MemZS_Free);    
     else memgr_.FreeMemZone(mid_, MemZS_Filled);

trunk/AddOn/TAcq/racqueth.h

@@ -82 +82 @@
   uint_8 totrdsnd_;
   bool fgdirectsend_;  //  true -> direct transfer of DMA data to ethernet
+
+  string stopreason_;   // message descriptif de la raison d'arret 
 
   int prtlev_;    // print level 

trunk/AddOn/TAcq/racqurw.cc

@@ -491 +491 @@
     mmbufib_[fid]=NULL;
   }
+  stopreason_="??Unknown??";
 }
 
@@ -566 +567 @@
       if (Datas[dma] == NULL) { // No data Read in DMA 
         fgbaddma=true;
-        cout << "PCIEMultiReaderChecker/Error Waiting for datas ..." << endl;
+        cout << "PCIEMultiReaderChecker/ERROR - DMA failed !" << endl;
         vec_pciw_[dma]->PrintStatus(cout);
+        stopreason_="--Failed DMA--";
         fgarret = true;  break; 
       }
@@ -671 +673 @@
   }  //   FIN  Boucle global G 
 
+  if (npaqfaitg >= nmax_*memgr.NbPaquets())   stopreason_="--Max Nb paquets reached--";
     
   setRC(0);
@@ -676 +679 @@
   double tmelaps2 = (tv2.tv_sec-tv1.tv_sec)*1000.+(tv2.tv_usec-tv1.tv_usec)/1000.;
   if (tmelaps2<0.1) tmelaps2=0.1; 
-  cout << " ---------- PCIEMultiReader::run()-End summary NPaqFait=" << npaqfaitg << "------------- " << endl;
+  cout << " ---------- PCIEMultiReader::run()-End StopReason: " << stopreason_ << endl
+       << " Summary NPaqFait=" << npaqfaitg << "------------- " << endl;
   for (int dma=0; dma < (int)nbDma_ ;dma++)   {
     cout << " --Fib=" << dma << " NPaqFait=" << npaqfait[dma] <<  " TotTransfer=" 
@@ -709 +713 @@
   if (mid_ >= 0)  { 
     memgr.GetAuxData(mid_)->filltime_.SetNow(); 
-    memgr.FreeMemZone(mid_, MemZS_Filled);
+    if (fgclean) memgr.FreeMemZone(mid_, MemZS_Free);
+    else memgr.FreeMemZone(mid_, MemZS_Filled);
   }
   mmbuf_ = NULL;  targ_npaq_ = 0;  mid_ = -2;

trunk/AddOn/TAcq/racqurw.h

@@ -153 +153 @@
   Byte* mmbufib_[MAXNBFIB];  // Pointeurs zone memoire de chaque fibre rendu par RAcqMemZoneMgr 
 
+  string stopreason_;   // message descriptif de la raison d'arret 
 };