Changeset 3640 in Sophya for trunk/AddOn/TAcq/brpaqu.cc

Timestamp:

May 27, 2009, 5:15:45 PM (16 years ago)

Author:

ansari

Message:

Correction et ameliorations multiples - en particulier mcrd.cc, brproc.cc et brfitsrd.cc, Reza 27/05/2009

File:

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

trunk/AddOn/TAcq/brpaqu.cc

@@ -1 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include "brpaqu.h"
 
@@ -439 +436 @@
 // --------------------------------------------------------------------------
 
-BRPaqChecker::BRPaqChecker()
-{
+BRPaqChecker::BRPaqChecker(bool cktrl, int maxprt)
+{
+  cktrl_ = cktrl;       
   totnframes = 0;
   nframeok = 0;
   lostframes = 0;
   frclst = 0;
+  cnt_saut = 0;
+  maxprt_ = maxprt;
   DefineHDRTag();
   DefineTRLTag();
@@ -466 +466 @@
 
 
-static int cnt_pb = 0;
 bool BRPaqChecker::Check(BRPaquet& paq)
 {
   totnframes++; 
   if (paq.HDRMarker64() != HDRTag()) return false;
-  if (paq.TRLMarker64() != TRLTag()) return false;
+  if (cktrl_&&(paq.TRLMarker64() != TRLTag())) return false;
   /*  DBG 
   if (paq.TRLMarker64() != TRLTag()) { 
@@ -486 +485 @@
     lostframes += (unsigned long long)delfc - 1;
     if (delfc != 1) { 
-      cnt_pb++; 
-      if (cnt_pb < 5) { 
+      cnt_saut++; 
+      if (cnt_saut < maxprt_) { 
         cout << "BRPaqChecker::Check([NumFrameOK=" << nframeok 
              << ")/Debug  FrameCounter Cur=" << curfc 
@@ -500 +499 @@
 }
 
-ostream& BRPaqChecker::Print(ostream& os)
+ostream& BRPaqChecker::Print(ostream& os) const
 {
   //  os << "BRPaqChecker:  HDRTag=" << hex << HDRTag() << " TRLTag=" << TRLTag() << dec << "\n"
   //     << " ... Tot.Nb.Frames.Proc=" << totnframes << " NbFrame HDR/TRL OK=" << nframeok 
-  os << "BRPaqChecker: Tot.Nb.Frames.Proc=" << totnframes << " NbFrame HDR/TRL OK=" << nframeok 
-     << " LostFrames=" << lostframes 
-     << " Loss=" << (double)lostframes*100./(double)totnframes << " %" << endl;
+  os << "BRPaqChecker: Tot.Nb.Frames.Proc=" << totnframes << " Nb.HDR/TRL OK=" << nframeok;
+  if (cktrl_) os << " (Check Header AND Trailer)" << endl;
+  else os << " (Header Check only)" << endl;
+  float meangap = (cnt_saut>0)?((float)lostframes/(float)cnt_saut):0.;
+  os   << " ... LostFrames=" << lostframes 
+       << " LossRate=" << (double)lostframes*100./(double)totnframes << " %" 
+       << " NbGaps=" << cnt_saut << " MeanGap=" << meangap << endl;
   return os;
 }