Changeset 3683 in Sophya for trunk/AddOn/TAcq/racquproc.cc

Timestamp:

Nov 27, 2009, 11:32:46 AM (16 years ago)

Author:

ansari

Message:

Mise a jour et ajout de fichier pour taritement multifibres apres

prise de donnees de Nov2009 a Pittsburgh

• Introduction des classes BRMultiFitsReader et BRBaseProcessor Reza, 27/11/2009

File:

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

trunk/AddOn/TAcq/racquproc.cc

@@ -17 +17 @@
 #include "fftpserver.h"
 #include "fftwserver.h"
+#include "histos.h"
 
 #include "FFTW/fftw3.h"
@@ -140 +141 @@
   fftwf_plan plan = fftwf_plan_dft_r2c_1d(vx.Size(), vx.Data(), 
                                           (fftwf_complex *)cfour.Data(), FFTW_ESTIMATE); 
+
+  // Histo pour valeurs des bytes dans les paquets 
+  Histo* phist[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++)  
+      phist[lc] = new Histo(-128.5,+128.5,257);
+  }
+  else {
+    for(sa_size_t lc=0; lc<2*memgr.NbFibres(); lc++)  
+      phist[lc] = new Histo(-0.5,256.5,257);    
+  }
+
   TimeStamp ts;   
   char fname[512];
@@ -178 +191 @@
         if (par_.fgdatafft) {    // Traitement data de type FFT 
           TwoByteComplex* tbcp=paq.Data1C();
-          for(sa_size_t j=1; j<spectre_.NCols(); j++) 
+          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());
             spectre_(lc,j) += Zmod2(tbcp[j]);
+          }
           nzm_[lc]++;   
           tbcp=paq.Data2C();   lc++;
-          for(sa_size_t j=1; j<spectre_.NCols(); j++) 
+          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());
             spectre_(lc,j) += Zmod2(tbcp[j]);
+          }
           nzm_[lc]++;
         }
         else {   // Traitement RawData 
-          for(sa_size_t j=0; j<vx.Size(); j++) 
+          for(sa_size_t j=0; j<vx.Size(); j++) {
+            phist[lc]->Add((r_8)(*(paq.Data1()+j)));
             vx(j) = (r_4)(*(paq.Data1()+j))-127.5;
+          }
           fftwf_execute(plan); 
           //   ffts_.FFTForward(vx, cfour_);
@@ -194 +215 @@
             spectre_(lc,j) += Zmod2(cfour(j+1));
           nzm_[lc]++;      lc++;
-          for(sa_size_t j=0; j<vx.Size(); j++) 
+          for(sa_size_t j=0; j<vx.Size(); j++) {
+            phist[lc]->Add((r_8)(*(paq.Data2()+j)));
             vx(j) = (r_4)(*(paq.Data2()+j))-127.5;
+          }
           fftwf_execute(plan); 
           //    ffts_.FFTForward(vx, cfour_);
@@ -223 +246 @@
       nfiles_++;
       POutPersist po(fname);
-      //      po << PPFNameTag("spectre") << spectre_; 
-      po << spectre_;       
+      po << PPFNameTag("spectre") << spectre_; 
       spectre_ = (r_4)(0.);
-      for(int lc=0; lc<2*memgr.NbFibres(); lc++)  nzm_[lc]=0;
+      char buftag[32];
+      for(int lc=0; lc<2*memgr.NbFibres(); lc++)  { 
+        sprintf(buftag,"hvalV%d",(int)lc);
+        po << PPFNameTag(buftag) << (*phist[lc]);
+        phist[lc]->Zero();
+        nzm_[lc]=0;
+      }
       ts.SetNow();
       // Calcul / impression fraction des paquets avec same-framecounter
@@ -258 +286 @@
     sprintf(fname,"%s/meanspec%d.ppf",path_.c_str(),(int)nfiles_);
     POutPersist po(fname);
-    po << spectre_;       
+    po << PPFNameTag("spectre") << spectre_; 
     spectre_ = (r_4)(0.);
-    for(int lc=0; lc<2*memgr.NbFibres(); lc++)  nzm_[lc]=0;
+    char buftag[32];
+    for(int lc=0; lc<2*memgr.NbFibres(); lc++)  { 
+      sprintf(buftag,"hvalV%d",(int)lc);
+      po << PPFNameTag(buftag) << (*phist[lc]);
+      delete phist[lc];
+      nzm_[lc]=0;
+    }
     ts.SetNow();
     // Calcul / impression fraction des paquets avec same-framecounter