Changeset 3878 in Sophya for trunk/AddOn/TAcq

Timestamp:

Sep 9, 2010, 4:07:03 PM (15 years ago)

Author:

ansari

Message:

Ajout qques infos (TTFirst/Last/DATEOBS ...) à chaque matrice de visibilite - Reza 9/9/2010

Location:

trunk/AddOn/TAcq

Files:

• brviscalc.cc (modified) (5 diffs)
• brviscalc.h (modified) (3 diffs)

trunk/AddOn/TAcq/brviscalc.cc

@@ -220 +220 @@
           moyfc_/=nmean_;
           moytt_/=nmean_;
-          vismtx_.Info()["MeanFC"] = moyfc_;
-          vismtx_.Info()["MeanTT"] = moytt_;
-          vismtx_.Info()["NPAQSUM"] = nmean_;
-          
+          UpdateVisMtxInfo();    // add/update keywords in the Info DVList 
           // ATTENTION : Matrice visibilites non moyennee 
           char nfile[48];
@@ -240 +237 @@
         vismtx_ = complex<r_4>((r_4)0.,(r_4)0.);
         moyfc_=moytt_=0.;
+        first_fc_=curfc_[0];
+        first_tt_= (vpaq_[0].TimeTag()-ttfirst_[0]);
+        first_tmstamp_.SetNow();  // Current date and time 
       }
 
@@ -304 +304 @@
       moyfc_/=nmean_;
       moytt_/=nmean_;
-      vismtx_.Info()["MeanFC"] = moyfc_;
-      vismtx_.Info()["MeanTT"] = moytt_;
-      vismtx_.Info()["NPAQSUM"] = nmean_;
-
+      UpdateVisMtxInfo();    // add/update keywords in the Info DVList 
       // ATTENTION : Matrice visibilites non moyennee 
       char nfile[48];
@@ -324 +321 @@
     vismtx_ = complex<r_4>((r_4)0.,(r_4)0.);
     moyfc_=moytt_=0.;
+    first_fc_=curfc_[0];
+    first_tt_= (vpaq_[0].TimeTag()-ttfirst_[0]);
+    first_tmstamp_.SetNow();  // Current date and time 
   }
 
@@ -347 +347 @@
   return 0;
 }
+
+/* --Methode-- */
+void BRVisibilityCalculator::UpdateVisMtxInfo()
+{
+  string ikey,ikdesc;
+  ikey="DATEOBS";  ikdesc=" Date/Time corresponding to TimeTagFirst";
+  vismtx_.Info().SetS(ikey,first_tmstamp_.ToString());
+  vismtx_.Info().SetComment(ikey,ikdesc);
+  ikey="FirstFC";  ikdesc="First FrameCounter";
+  vismtx_.Info().SetI(ikey,first_fc_);
+  vismtx_.Info().SetComment(ikey,ikdesc);
+  ikey="FirstTT";  ikdesc="First TimeTag";
+  vismtx_.Info().SetI(ikey,first_tt_);
+  vismtx_.Info().SetComment(ikey,ikdesc);
+  ikey="LastFC";  ikdesc="Last FrameCounter";
+  vismtx_.Info().SetI(ikey,curfc_[0]);
+  vismtx_.Info().SetComment(ikey,ikdesc);
+  ikey="LastTT";  ikdesc="Last TimeTag";
+  vismtx_.Info().SetI(ikey,vpaq_[0].TimeTag()-ttfirst_[0]);
+  vismtx_.Info().SetComment(ikey,ikdesc);
+  ikey="MeanFC";  ikdesc="Mean FrameCounter";
+  vismtx_.Info().SetD(ikey,moyfc_); 
+  vismtx_.Info().SetComment(ikey,ikdesc);
+  ikey="MeanTT";  ikdesc="Mean TimeTag";
+  vismtx_.Info().SetD(ikey,moytt_);
+  vismtx_.Info().SetComment(ikey,ikdesc);
+  ikey="NPAQSUM";  ikdesc="Number of paquets summed";
+  vismtx_.Info().SetI(ikey,nmean_);
+}
+
 
 /* --Methode-- */

trunk/AddOn/TAcq/brviscalc.h

@@ -60 +60 @@
 protected:
   virtual int Process(); 
+  virtual void UpdateVisMtxInfo();
   virtual int FillVisibTable(double fcm, double ttm); 
   virtual int CheckTimeTag(); 
@@ -76 +77 @@
   bool* fgallfibok;  
 
-  double moyfc_, moytt_;
+  double moyfc_, moytt_;  // moyenne des FrameCounter / TimeTag pour chaque matrice de visibilite
+  uint_8 first_fc_,first_tt_;  // Valeurs premier FrameCounter / TimeTag pour chaque matrice de visibilite
+  TimeStamp first_tmstamp_;   // Date-Heure pour premier FrameCounter / TimeTag pour chaque matrice de visibilite
+  
   TMatrix< complex<r_4> > vismtx_; 
   TVector< uint_4 > chanum_;
   //  FitsInOutFile dtfos_;
   DataTable visdt_;
-
   uint_4 numfile_;
   uint_8 totnbpaq_;
@@ -101 +104 @@
 
 //-------------------------------------------------------------------------------
-// Classe Groupe (ensemble) de Calculateur de Visibilites, tourant en parallele
+// Classe Groupe (ensemble) de Calculateur de Visibilites, tournant en parallele
 //-------------------------------------------------------------------------------