Changeset 3686 in Sophya for trunk/AddOn

Timestamp:

Nov 27, 2009, 9:44:58 PM (16 years ago)

Author:

ansari

Message:

Corrections diverses ds lecteur fits et processeur multi-fibres, Reza 27/11/2009

Location:

trunk/AddOn/TAcq

Files:

• brbaseproc.cc (modified) (4 diffs)
• brfitsrd.cc (modified) (1 diff)
• brproc.cc (modified) (2 diffs)
• brproc.h (modified) (1 diff)

trunk/AddOn/TAcq/brbaseproc.cc

@@ -20 +20 @@
   : memgr_(memgr) 
 {
+  stop_ = false;
   for(size_t fib=0; fib<(size_t)memgr_.NbFibres(); fib++)  {
     vpaq_.push_back(BRPaquet(NULL,memgr_.PaqSize()));
     vpchk_.push_back(BRPaqChecker(true,0)); 
+    vfgok_.push_back(true);
     curfc_.push_back(0);
   }
@@ -67 +69 @@
         int rcp = Process();
         totprocnpaq_++;
-        if (rcp != 0)   { fgrun=false; break; }
+        //      if (rcp != 0)   { fgrun=false; break; }
       }  // Fin de boucle sur les paquets 
       memgr_.FreeMemZone(mid, MemZS_ProcA);
@@ -73 +75 @@
     //------------------------------------
     cout << " --------- END BRBaseProcessor::run() , TotNbProcPaq=" << totprocnpaq_ << endl;
+    /*
+    for(size_t fib=0; fib<(size_t)memgr_.NbFibres(); fib++)  vpchk_[fib].Print();
+    cout << " ------------------------------------ " << endl;
+    */
   }
   catch (std::exception& exc) {
@@ -94 +100 @@
   // if (fgokallfibers_) { faire le traitement }
   return 0;
+  /*    Exemple de code test 
+  if ( totprocnpaq_ % 1000 == 0 ) {
+    cout << " BRVisibilityCalculator::Process() " << totprocnpaq_ << " FrameCnt=" ;
+    for(size_t fib=0; fib<(size_t)memgr_.NbFibres(); fib++)   
+      cout << curfc_[fib] << "," ;
+    cout << endl;
+    cout << " TimeTag : " ;
+    for(size_t fib=0; fib<(size_t)memgr_.NbFibres(); fib++)   
+      cout << vpaq_[fib].TimeTag()/125000000 << "," ;
+      cout << "   seconds" << endl;
+  }
+
+   */
 }
 

trunk/AddOn/TAcq/brfitsrd.cc

@@ -207 +207 @@
   if (mid_ >= 0)  { 
     if (fgclean) memgr_.FreeMemZone(mid_, MemZS_Free);    
-    memgr_.FreeMemZone(mid_, MemZS_Filled);
+    else memgr_.FreeMemZone(mid_, MemZS_Filled);
   }
   mmbuf_ = NULL;  targ_npaq_ = 0;  mid_ = -2;

trunk/AddOn/TAcq/brproc.cc

@@ -40 +40 @@
     vnpaqm_.push_back(0);
   }
+  cout << " BRVisibilityCalculator/Info NMean= " << nmean_ << endl;
+  totnbpaq_ = 0;
 }
 
@@ -50 +52 @@
 int BRVisibilityCalculator::Process()
 {
+  if (totnbpaq_%nmean_ == 0) {
+    cout << " BRVisibilityCalculator::Process() " << totnbpaq_ << " FrameCnt=" ;
+    for(size_t fib=0; fib<(size_t)memgr_.NbFibres(); fib++)   
+      cout << curfc_[fib] << "," ;
+    cout << endl;
+    cout << " TimeTag (sec) : " ;
+    for(size_t fib=0; fib<(size_t)memgr_.NbFibres(); fib++)   
+      cout << vpaq_[fib].TimeTag()/125000000 << "," ;
+    cout << endl;
+  }
+  totnbpaq_++;
+  return 0;
 }
 

trunk/AddOn/TAcq/brproc.h

@@ -39 +39 @@
   vector<uint_8> vtimetag_;
   vector<uint_8> vnpaqm_;
-
+  uint_4 totnbpaq_;
 };