Changeset 3729 in Sophya for trunk

Timestamp:

Jan 6, 2010, 12:35:14 PM (16 years ago)

Author:

cmv

Message:

• ajout des Histo2D imag%real (from Pittsburgh Nov09) fait 11/09
• ajout des histos de l'exposant FFT (continu) fait 06/01/10

rz + cmv , 06/01/2010

File:

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

trunk/AddOn/TAcq/racquproc.cc

@@ -18 +18 @@
 #include "fftwserver.h"
 #include "histos.h"
+#include "histos2.h"
 
 #include "FFTW/fftw3.h"
@@ -144 +145 @@
   // Histo pour valeurs des bytes dans les paquets 
   Histo* phist[2*MAXNBFIB] = {NULL,NULL,NULL,NULL, NULL,NULL,NULL,NULL};
+  Histo2D* ph2[2*MAXNBFIB] = {NULL,NULL,NULL,NULL, NULL,NULL,NULL,NULL};
+  Histo* phexp[2*MAXNBFIB] = {NULL,NULL,NULL,NULL, NULL,NULL,NULL,NULL};
   if (par_.fgdatafft) {    // data de type FFT   
-    for(sa_size_t lc=0; lc<2*memgr.NbFibres(); lc++)  
+    for(sa_size_t lc=0; lc<2*memgr.NbFibres(); lc++) {
       phist[lc] = new Histo(-128.5,+128.5,257);
+      ph2[lc]   = new Histo2D(-128.5,+128.5,257, -128.5,+128.5,257);
+      phexp[lc] = new Histo(-128.5,+128.5,257);
+    }
   }
   else {
@@ -191 +197 @@
         if (par_.fgdatafft) {    // Traitement data de type FFT 
           TwoByteComplex* tbcp=paq.Data1C();
+          phexp[lc]->Add((r_4)tbcp[0].realD());
           for(sa_size_t j=1; j<spectre_.NCols(); j++) {
             phist[lc]->Add((r_4)tbcp[j].realD());
             phist[lc]->Add((r_4)tbcp[j].imagD());
+            ph2[lc]->Add((r_4)tbcp[j].realD(), (r_4)tbcp[j].imagD());
             spectre_(lc,j) += Zmod2(tbcp[j]);
           }
           nzm_[lc]++;   
           tbcp=paq.Data2C();   lc++;
+          phexp[lc]->Add((r_4)tbcp[0].realD());
           for(sa_size_t j=1; j<spectre_.NCols(); j++) {
             phist[lc]->Add((r_4)tbcp[j].realD());
             phist[lc]->Add((r_4)tbcp[j].imagD());
+            ph2[lc]->Add((r_4)tbcp[j].realD(), (r_4)tbcp[j].imagD());
             spectre_(lc,j) += Zmod2(tbcp[j]);
           }
@@ -253 +263 @@
         po << PPFNameTag(buftag) << (*phist[lc]);
         phist[lc]->Zero();
+        if (par_.fgdatafft) {    // data de type FFT   
+          sprintf(buftag,"h2dV%d",(int)lc);
+          po << PPFNameTag(buftag) << (*ph2[lc]);
+          ph2[lc]->Zero();
+          sprintf(buftag,"hexpV%d",(int)lc);
+          po << PPFNameTag(buftag) << (*phexp[lc]);
+          phexp[lc]->Zero();
+        }
         nzm_[lc]=0;
       }
@@ -293 +311 @@
       po << PPFNameTag(buftag) << (*phist[lc]);
       delete phist[lc];
+      if (par_.fgdatafft) {    // data de type FFT   
+        sprintf(buftag,"h2dV%d",(int)lc);
+        po << PPFNameTag(buftag) << (*ph2[lc]);
+        delete ph2[lc];
+        sprintf(buftag,"hexpV%d",(int)lc);
+        po << PPFNameTag(buftag) << (*phexp[lc]);
+        delete phexp[lc];
+      }
       nzm_[lc]=0;
     }