Changeset 4015 in Sophya for trunk/AddOn/TAcq/brviscalc.cc

Timestamp:

Aug 8, 2011, 10:05:42 PM (14 years ago)

Author:

ansari

Message:

Validation/debug calcul de visibilites par tranches en temps, Reza, 08 Aout 2011

File:

• trunk/AddOn/TAcq/brviscalc.cc (modified) (8 diffs)

trunk/AddOn/TAcq/brviscalc.cc

@@ -38 +38 @@
 
   npaqcumul_=0;
+  threshold_tt_=0;
   moyfc_=moytt_=0.;
   first_fc_=first_tt_=0;
@@ -333 +334 @@
       if ( CheckInterval4VisMtxSave() ) {
         if ((prtlev_>0)&&(numfile_%prtmodulo_==0)) {
-          cout << numfile_ << "-BRVisCalc[" << calcid_ << "/" << nbcalc_ << "]::run() NPaqProc="
-               << totnbpaq_ << " TotMegaFLOP=" << (uint_8)TotNbMegaFLOP() << " -> VisibMtx FileNum=" << numfile_ << endl;
+          cout << numfile_ << "-BRVisCalc[" << calcid_ << "/" << nbcalc_ << "]::run() NPaqProc=" << totnbpaq_ 
+               << " TTSec=" << getCurTimeTagSeconds() << " TotMegaFLOP=" << (uint_8)TotNbMegaFLOP() 
+               << " VisibMtx_FileNum=" << numfile_ << endl;
         }
         SaveVisibilityMatrix();
@@ -353 +355 @@
               ttfirst_[fib]=vpaq_[fib].TimeTag();
             }
+            threshold_tt_=vpaq_[0].TimeTag();
+            first_fc_=curfc_[0];
+            first_tt_=vpaq_[0].TimeTag();
           }
           totprocnpaq_++;
@@ -398 +403 @@
 int BRVisibilityCalculator::Process()
 {
-  if (totnbpaq_==0) UpdateChanIds();  // Appele ici pour etre sur que le thread de remplissage a mis l'info a jour.
+  if (totnbpaq_==0) {    // qques initialisations a partir du premier paquet 
+    UpdateChanIds();  // Appele ici pour etre sur que le thread de remplissage a mis l'info a jour.
+    threshold_tt_=vpaq_[0].TimeTag();
+    first_fc_=curfc_[0];
+    first_tt_= vpaq_[0].TimeTag();
+  }
   if (fgdataraw_) {  // Donnees firmware RAW apres TF soft 
     for(size_t fib=0; fib<(size_t)memgr_.NbFibres(); fib++) {
@@ -414 +424 @@
   if ( CheckInterval4VisMtxSave() ) {
     if ((prtlev_>0)&&(numfile_%prtmodulo_==0)) {
-      cout << numfile_ << "-BRVisCalc[" << calcid_ << "/" << nbcalc_ << "]::Process() NPaqProc="
-           << totnbpaq_ << " TotMegaFLOP=" << (uint_8)TotNbMegaFLOP() << " -> VisibMtx FileNum= " << numfile_ << endl;
+      cout << numfile_ << "-BRVisCalc[" << calcid_ << "/" << nbcalc_ << "]::Process() NPaqProc="<< totnbpaq_ 
+           << " TTSec=" << getCurTimeTagSeconds() << " TotMegaFLOP=" << (uint_8)TotNbMegaFLOP() 
+           << " VisibMtx_FileNum=" << numfile_ << endl;
     }
     SaveVisibilityMatrix();
@@ -482 +493 @@
   vismtx_ = complex<r_4>((r_4)0.,(r_4)0.);
   npaqcumul_=0;
+  threshold_tt_=vpaq_[0].TimeTag();
   moyfc_=moytt_=0.;
   first_fc_=curfc_[0];
@@ -495 +507 @@
 {
   string ikey,ikdesc;
-  ikey="DATEOBS";  ikdesc=" Date/Time corresponding to TimeTagFirst";
+  ikey="DATEOBS";  ikdesc=" Date,Time corresponding to TimeTagFirst";
   vismtx_.Info().SetS(ikey,first_tmstamp_.ToString());
   vismtx_.Info().SetComment(ikey,ikdesc);
@@ -518 +530 @@
   ikey="NPAQSUM";  ikdesc="Number of paquets summed";
   vismtx_.Info().SetI(ikey,npaqcumul_);
+  vismtx_.Info().SetComment(ikey,ikdesc);
+  ikey="DELTIME";  ikdesc="visib cumul time (seconds)";
+  vismtx_.Info().SetD(ikey,(vpaq_[0].TimeTag()-first_tt_)/1.25e8);
+  vismtx_.Info().SetComment(ikey,ikdesc);
 }