Changeset 3918 in Sophya for trunk

Timestamp:

Dec 2, 2010, 4:41:13 PM (15 years ago)

Author:

ansari

Message:

Amelioration code thread monitoring pour tenir compte du mode fftshrink + calcul matrice saturation, cmv+Reza

Location:

trunk/AddOn/TAcq

Files:

• acqparam_exemple.d (modified) (1 diff)
• brparam.cc (modified) (4 diffs)
• brparam.h (modified) (1 diff)
• racquproc.cc (modified) (7 diffs)

trunk/AddOn/TAcq/acqparam_exemple.d

@@ -45 +45 @@
 #  Par defaut  @acqmode std
 #   Modes standard:  [std=raw2c : 2 channels raw data] [fft2c: fft 2 canaux - NOT reordered] 
-#   Autres modes:  raw1c , fft1c , ordfft2c , ordfft1c  
+#                     fftshrink=fft2cshrink  
+#   Autres modes:  raw1c , fft1c , fft1cshrink , ordfft2c , ordfft1c  
 #                  [nof=std+NoFitsFile] pattern,patnof,fft2cnof ...
 @acqmode std

trunk/AddOn/TAcq/brparam.cc

@@ -154 +154 @@
   AcqMode=acqmod;
   fgdatafft=false;
+  fgfftshrink=false;
   fgsinglechannel=false;
 
@@ -233 +234 @@
   AcqMode=p.AcqMode;
   fgdatafft=p.fgdatafft;
+  fgfftshrink=p.fgfftshrink;
   fgsinglechannel=p.fgsinglechannel;
 
@@ -425 +427 @@
   }
   string acqmode = AcqMode;
-  fgdatafft=false;  fgsinglechannel=false;
+  fgdatafft=false;  fgfftshrink=false;  fgsinglechannel=false;
   reducneedcopy=false;  pqreducmode=BR_TwoChanReduc;
   if ((acqmode == "std")||(acqmode=="raw2c"))   swapall = BR_Copy ; 
   if (acqmode=="raw1c") { swapall = BR_Copy ;  fgsinglechannel=true;  pqreducmode=BR_OneChanReduc; }
 
-  if ((acqmode == "fft2c")||(acqmode == "fft1c"))   swapall = BR_Copy ;  
+  if (acqmode=="fft2c")  { swapall = BR_Copy;  fgdatafft=true; } 
+  if ((acqmode=="fft2cshrink")||(acqmode=="fftshrink"))  {  swapall = BR_Copy; fgdatafft=true; fgfftshrink=true; } 
+  if (acqmode=="fft1c")  { swapall = BR_Copy;  fgdatafft=true; fgsinglechannel=true; } 
+  if (acqmode=="fft1cshrink")  {  swapall = BR_Copy; fgdatafft=true; fgfftshrink=true; fgfftshrink=true; } 
+
   if (acqmode == "nosw")   swapall = BR_Copy ;
   if (acqmode == "nof")  { swapall = BR_Copy ; savesigfits = false; }
@@ -497 +503 @@
   os << " AcqMode="<<AcqMode;
   os << " Type of acquisition :" << BRPaquet::FmtConvToString( swapall) << endl;
+  os << " Firmware: " << ((fgdatafft)?" FFT_Data ":" RawData ");
+  os << ((fgfftshrink)?" ShrinkFFT ":" FULLFFT ");
+  os << ((fgsinglechannel)?" SingleChannel":" TwoChannels") << endl;
   os << " SkySource=" << skysource;
   os << " NbFiles="<<NbFiles;

trunk/AddOn/TAcq/brparam.h

@@ -143 +143 @@
   string AcqMode;  // Mode d'acquisition (conditionne la mise en ordre/conversion des donnees lues par DMA 
   bool fgdatafft;  // true -> donnee FFT (provenant du firmware FFT)
+  bool fgfftshrink;  // true -> donnee FFT tronquee [NumFreq=2048...3072] (provenant du firmware FFT)
   bool fgsinglechannel; // true -> un seul canal par fibre (par defaut=2 canaux/fibres)
 

trunk/AddOn/TAcq/racquproc.cc

@@ -177 +177 @@
 
   // 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};
+  Histo* phist[2*MAXNBFIB];
+  Histo2D* ph2[2*MAXNBFIB];
+  Histo* phexp[2*MAXNBFIB];
+  TMatrix<r_4>* psatur[2*MAXNBFIB];  
+  for(int ifib=0; ifib<2*MAXNBFIB; ifib++) {
+    phist[ifib]=NULL; ph2[ifib]=NULL; phexp[ifib]=NULL; psatur[ifib]=NULL;
+  }
   if (par_.fgdatafft) {    // data de type FFT   
     for(sa_size_t lc=0; lc<2*memgr.NbFibres(); lc++) {
@@ -185 +189 @@
       ph2[lc]   = new Histo2D(-128.5,+128.5,257, -128.5,+128.5,257);
       phexp[lc] = new Histo(-128.5,+128.5,257);
+      psatur[lc] = new TMatrix<r_4>(3,3);
+      *psatur[lc] = 0.;
     }
   }
@@ -218 +224 @@
       }
     }
+
+    // DBG-ATTENTION : freq 0 pour expo full FFT si reordonne 
+    int idxexpo=(par_.fgfftshrink)?1023:0; // exposant FFT shrink 1024 freq, ou freq 0 pour full-FFT
     
     cpaqok_ = (uint_1)0;
@@ -230 +239 @@
         if (par_.fgdatafft) {    // Traitement data de type FFT 
           TwoByteComplex* tbcp=paq.Data1C();
-          phexp[lc]->Add((r_4)tbcp[0].realD());
+
+          //  exposant FFT 
+          phexp[lc]->Add((r_4)tbcp[idxexpo].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());
+            // comptage saturation 
+            int sir=0, sii=0;  // saturation partie reelle, partie imaginaire
+            if (tbcp[j].realI()==-128) sir=-1;
+            else if (tbcp[j].realI()==127) sir=1;
+            if (tbcp[j].imagI()==-128) sii=-1;
+            else if (tbcp[j].imagI()==127) sii=1;
+            (*psatur[lc])(sir+1,sii+1)+=1.;
+
             spectre_(lc,j) += Zmod2(tbcp[j]);
           }
           nzm_[lc]++;   
           tbcp=paq.Data2C();   lc++;
-          phexp[lc]->Add((r_4)tbcp[0].realD());
+          phexp[lc]->Add((r_4)tbcp[idxexpo].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());
+            // comptage saturation 
+            int sir=0, sii=0;  // saturation partie reelle, partie imaginaire
+            if (tbcp[j].realI()==-128) sir=-1;
+            else if (tbcp[j].realI()==127) sir=1;
+            if (tbcp[j].imagI()==-128) sii=-1;
+            else if (tbcp[j].imagI()==127) sii=1;
+            (*psatur[lc])(sir+1,sii+1)+=1.;
+
             spectre_(lc,j) += Zmod2(tbcp[j]);
           }
@@ -303 +331 @@
           po << PPFNameTag(buftag) << (*phexp[lc]);
           phexp[lc]->Zero();
+          sprintf(buftag,"saturV%d",(int)lc);
+          po << PPFNameTag(buftag) << (*psatur[lc]);
+          cout << " Matrice Saturation Voie[" << lc << "] : " <<  (*psatur[lc]);
+          if (nzm_[lc]>0)  { 
+            (*psatur[lc]) /= ((r_4)nzm_[lc]*0.01);  
+            cout << " Matrice Saturation Pourcentage Voie[" << lc << "] : " <<  (*psatur[lc]);
+          }
+          (*psatur[lc])=0.;
         }
         nzm_[lc]=0;
@@ -351 +387 @@
         po << PPFNameTag(buftag) << (*phexp[lc]);
         delete phexp[lc];
+        sprintf(buftag,"saturV%d",(int)lc);
+        po << PPFNameTag(buftag) << (*psatur[lc]);
+        cout << " Matrice Saturation Voie[" << lc << "] : " <<  (*psatur[lc]);
+        if (nzm_[lc]>0)  { 
+          (*psatur[lc]) /= ((r_4)nzm_[lc]*0.01);  
+          cout << " Matrice Saturation Pourcentage Voie[" << lc << "] : " <<  (*psatur[lc]);
+        }
+        (*psatur[lc])=0.;
       }
       nzm_[lc]=0;
@@ -369 +413 @@
          << " -> " << fracsame << " % )" << endl;
   }
+
+  for(sa_size_t lc=0; lc<2*memgr.NbFibres(); lc++) {
+    if (phist[lc]) delete phist[lc];
+    if (ph2[lc]) delete ph2[lc]; 
+    if (phexp[lc]) delete phexp[lc]; 
+    if (psatur[lc]) delete psatur[lc]; 
+  }
+
   return 0;
 }