Changeset 3652 in Sophya for trunk/AddOn/TAcq/brproc.cc

Timestamp:

Jun 15, 2009, 10:57:12 AM (16 years ago)

Author:

ansari

Message:

Ajout calcul histogramme des valeurs echantillons en temps, Reza 15/06/2009

File:

• trunk/AddOn/TAcq/brproc.cc (modified) (9 diffs)

trunk/AddOn/TAcq/brproc.cc

@@ -11 +11 @@
 #include "ntuple.h"
 #include "datatable.h"
+#include "histos.h"
 #include "fioarr.h"
 #include "timestamp.h"
@@ -34 +35 @@
 /* --Methode-- */
 BRProcARaw2C::BRProcARaw2C(RAcqMemZoneMgr& mem, string& path, uint_4 nmean, 
-                           uint_4 nmax, bool fgnotrl, int card)
+                           uint_4 nmax, bool fghist, bool fgnotrl, int card)
   :  memgr(mem) 
 {
@@ -42 +43 @@
   path_ = path; 
   fgnotrl_ = fgnotrl;
+  fghist_ = fghist;
   card_ = card;
   if (pmutfftw==NULL) pmutfftw=new ZMutex;  
@@ -90 +92 @@
     double ms1,ms2,ms12,ms12re,ms12im,ms12phi;
 ----*/
+// Time sample histograms 
+   Histo h1(-0.5, 255.5, 256);
+   Histo h2(-0.5, 255.5, 256);
 // Initialisation pour calcul FFT 
     TVector< complex<r_4> > cfour1;  // composant TF
@@ -152 +157 @@
         curtt=paq.TimeTag()-firsttt;
 // Traitement voie 1        
-            for(sa_size_t j=0; j<vx.Size(); j++) 
-              vx(j) = (r_4)(*(paq.Data1()+j))-127.5;
+        if (fghist_) {
+          for(sa_size_t j=0; j<vx.Size(); j++) {
+            r_4 vts=(r_4)(*(paq.Data1()+j));
+            h1.Add((r_8)vts);
+            vx(j) = vts-127.5;
+          }
+        }
+        else {
+          for(sa_size_t j=0; j<vx.Size(); j++) 
+            vx(j) = (r_4)(*(paq.Data1()+j))-127.5;
+        }
 //        fftwf_complex* coeff1 = (fftwf_complex*)(procbuff+i*procpaqsz);
             fftwf_execute(plan1); 
@@ -162 +176 @@
         memcpy(procbuff+i*procpaqsz, cfour1.Data(), sizeof(complex<r_4>)*cfour1.Size());
 // Traitement voie 2        
-            for(sa_size_t j=0; j<vx.Size(); j++) 
-              vx(j) = (r_4)(*(paq.Data2()+j))-127.5;
-
+        if (fghist_) {
+          for(sa_size_t j=0; j<vx.Size(); j++) {
+            r_4 vts=(r_4)(*(paq.Data2()+j));
+            h2.Add((r_8)vts);
+            vx(j) = vts-127.5;
+          }
+        }
+        else {
+          for(sa_size_t j=0; j<vx.Size(); j++) 
+            vx(j) = (r_4)(*(paq.Data2()+j))-127.5;
+        }
         fftwf_execute(plan2); 
         for(sa_size_t j=0; j<spectreV2.Size(); j++) 
@@ -225 +247 @@
         spectreV2.Info()["EndTT"] = curtt;
         visiV12.Info()["EndTT"] = curtt;
-            {
+        {
         sprintf(fname,"%s_%d.ppf",path_.c_str(),(int)ifile);
         POutPersist po(fname);
@@ -231 +253 @@
         string tag2="specV2";
         string tag12="visiV12";
+        string tagh1="tshV1";
+        string tagh2="tshV2";
         if (card_==2) {
           tag1 = "specV3";
           tag2 = "specV4";
+          tagh1 = "tshV1";
+          tagh2 = "tshV2";
           tag12="visiV34";
         }
@@ -239 +265 @@
         po << PPFNameTag(tag2) << spectreV2; 
         po << PPFNameTag(tag12) << visiV12; 
-            }
+        if (fghist_) {
+          po << PPFNameTag(tagh1) << h1; 
+          po << PPFNameTag(tagh2) << h2; 
+        }
+        }
         spectreV1 = (r_4)(0.);
         spectreV2 = (r_4)(0.);
         visiV12 = complex<r_4>(0., 0.);
+        if (fghist_) {
+          h1.Zero();
+          h2.Zero();
+        }
         nzm = 0;  ifile++; 
 //        ts.SetNow();