Changeset 3905 in Sophya for trunk/AddOn

Timestamp:

Oct 15, 2010, 11:02:36 PM (15 years ago)

Author:

ansari

Message:

implementation de la fenetre en temps pour les spectres ds BRMeanSpecCalculator, Reza 15/10/2010

Location:

trunk/AddOn/TAcq

Files:

• branap.cc (modified) (5 diffs)
• branap.h (modified) (1 diff)
• brproc.cc (modified) (11 diffs)
• brproc.h (modified) (4 diffs)
• specmfib.cc (modified) (2 diffs)

trunk/AddOn/TAcq/branap.cc

@@ -32 +32 @@
   nthreads_=1;
 
+  spec_win_sz_=0;
+  spw_ext_sz_=0;
+  nbmax_specwfiles_=0;
+
   vmin_=0.;  vmax_=9e99;
   gainfile_="";
@@ -96 +100 @@
     else if (strcmp(arg[ka],"-gain")==0) {
       gainfile_=arg[ka+1];
+      ka+=2;
+    }
+    else if (strcmp(arg[ka],"-tspwin")==0) {
+      int ai1=0,ai2=0,ai3=0;
+      sscanf(arg[ka+1],"%d,%d,%d",&ai1,&ai2,&ai3);
+      spec_win_sz_=ai1;  spw_ext_sz_=ai2;   nbmax_specwfiles_=ai3; 
       ka+=2;
     }
@@ -138 +148 @@
        << "                 [-nbloc NBloc] [-freq NumFreqMin,NumFreqMax,NBinFreq] \n" 
        << "                 [-prt lev,modulo] [-nvcal n] [-nthr n] [-nosfc] \n" 
-       << "                 [-gain filename] [-varcut min,max] \n" 
+       << "                 [-gain filename] [-varcut min,max] [-tspwin wsz,extsz,nfiles] \n" 
        << "         -in Imin,Imax,Istep InPath FiberList [InPath2 FiberList2 InPath3 FiberList3 ...] \n" << endl; 
   if (fgshort) {
@@ -159 +169 @@
        << " -varcut min,max : min-max cut on variance \n" 
        << " -gain filename : spectral response fits file name \n" 
+       << " -tspwin wsz,extsz,nfiles : spectra time (paquet no) window (ex: -tspwin 120,4,5) \n"
+       << "    wsz,extsz= window,extension size;  nfiles= maximum number of windows saved \n"
        << " -in : input files/directory definition : \n"
        << "       Imin,Imax,Istep: fits files signalII.fits Imin<=II<=Imax Istep=increment \n" 
@@ -187 +199 @@
   cout << " FreqMin= " << freqmin_ << " FreqMax= " << freqmax_ << " NBinFreq= " << nbinfreq_ << endl;
   cout << " GainFileName=" << gainfile_ << " VarianceMin= " << vmin_ << " VarianceMax= " << vmax_ << endl;
+  cout << " Spectra TimeWindow (Nb.Paquets) Size=" << spec_win_sz_ << " ExtensionSize=" << spw_ext_sz_ 
+       << " MaxNbFile=" << nbmax_specwfiles_ << endl; 
   cout << " PaqSize=" << paqsize_ << "  -  NZones=" << nzones_ << " NPaqZone=" << npaqinzone_ 
        << " PrtLevel=" << prtlevel_ << " PrtCntModulo=" <<  prtmodulo_ << endl;

trunk/AddOn/TAcq/branap.h

@@ -46 +46 @@
   uint_4 nthreads_;  // Nb de threads pour l'execution parallele ds BRVisibilityCalculator
 
+  uint_4 spec_win_sz_;   // taille de fenetre (temps/no de paquet) pour les spectres
+  uint_4 spw_ext_sz_;     // zone de garde en temps / no de paquet pour la fenetre des spectres
+  uint_4 nbmax_specwfiles_;  // nb maxi de fichiers de fenetres de spectres sauvees 
+
   double vmin_,vmax_;   // coupure min-max sur la variance 
   string gainfile_;     // nom du fichier de gain (reponse spectrale)

trunk/AddOn/TAcq/brproc.cc

@@ -32 +32 @@
 
 //---------------------------------------------------------------------
-// Classe de traitement simple - calcul de spectres moyennes / voie
+// Classe de traitement de spectres - 
+// Calcul de spectres moyennes,variance / voie + nettoyage
 //---------------------------------------------------------------------
 /* --Methode-- */
@@ -39 +40 @@
   : BRBaseProcessor(memgr), outpath_(outpath), nmean_(nmean),
     fgdatafft_(fgdatafft), fgsinglechannel_(fgsinglechan), 
-    clnflg_(fgsinglechan?memgr_.NbFibres():2*memgr_.NbFibres()),
+    nbpaq4mean_(fgsinglechan?memgr_.NbFibres():2*memgr_.NbFibres()), 
     nbadpaq_(fgsinglechan?memgr_.NbFibres():2*memgr_.NbFibres()) 
 {
@@ -59 +60 @@
 
   numfile_=0;
-  nbpaq4mean_=0;
   totnbpaq_=0;
 
+  size_t nchan=(fgsinglechannel_?memgr_.NbFibres():2*memgr_.NbFibres());
+  
+  for(size_t i=0; i<nchan; i++) {
+    nbpaq4mean_[i]=nbadpaq_[i]=0;
+  }
+
+  // Definition des tailles de fenetres de spectres, etc ...
+  SetSpectraWindowSize();
+  SetMaxNbSepcWinFiles();
+  nbtot_specwin_=0;
   SetVarianceLimits();
 
@@ -69 +79 @@
   ofsdtp_ = new FitsInOutFile(dtfile,FitsInOutFile::Fits_Create);
   dtp_ = new SwFitsDataTable(*ofsdtp_,1024,true);
-  int nchan=(fgsinglechannel_?memgr_.NbFibres():2*memgr_.NbFibres());
   char cnom[32];
   for(int i=0; i<nchan; i++) {
-    sprintf(cnom,"var%d",i);
+    sprintf(cnom,"variance%d",i);
     dtp_->AddFloatColumn(cnom);    
   }
+  /*
   for(int i=0; i<nchan; i++) {
-    sprintf(cnom,"varnorm%d",i);
+    sprintf(cnom,"sigma%d",i);
     dtp_->AddFloatColumn(cnom);    
   }
+  */
   xnt_=new double[nchan*2];
+
 }
 
@@ -85 +97 @@
 BRMeanSpecCalculator::~BRMeanSpecCalculator()
 {
-  if (nbpaq4mean_>1)  SaveSpectra();
+  uint_8 npqm=0;
+  for(size_t i=0; i<nbpaq4mean_.size(); i++)  npqm+=nbpaq4mean_[i];
+  if (npqm>nmean_*nbpaq4mean_.size()/10)  SaveMeanSpectra();
   cout << " ---------------- BRMeanSpecCalculator()_Finalizing -------------------- " << endl;
   for(size_t i=0; i<nbadpaq_.size(); i++) {
@@ -100 +114 @@
 
 /* --Methode-- */
-void BRMeanSpecCalculator::ReadGainFitsFile(string filename)
+void BRMeanSpecCalculator::SetSpectraWindowSize(uint_4 winsz, uint_4 wszext)
+{
+  if (winsz < 3) {
+    winsz=1;  wszext=0;
+  }  
+  if (wszext>=winsz/2) wszext=winsz/2;
+  sa_size_t sz[5]={0,0,0,0,0};
+  sz[0]=mspecmtx_.NCols();
+  sz[1]=mspecmtx_.NRows();
+  sz[2]=winsz+2*wszext;
+  spec_window_.SetSize(3,sz);
+  spwin_ext_sz_=wszext;
+  sz[0]=mspecmtx_.NRows();
+  sz[1]=winsz+2*wszext;  
+  clnflg_.SetSize(2,sz);
+  cout << "BRMeanSpecCalculator::SetSpectraWindowSize()/Info: SpectraWindowSize()=" << GetSpectraWindowSize()
+       << " ExtensionSize=" << GetSpecWinExtensionSize() << " Overlap=" << GetSpecWinOverlapSize() 
+       << " ArraySize=" << spec_window_.SizeZ() << endl;
+
+  paqnum_w_start=spwin_ext_sz_;  // premiere initialisation du numero de paquet 
+  return;
+}
+
+/* --Methode-- */
+void BRMeanSpecCalculator::ReadGainFitsFile(string filename, bool fgapp)
 {
   cout << " BRMeanSpecCalculator::ReadGainFitsFile() - reading file " << filename;
   FitsInOutFile fis(filename, FitsInOutFile::Fits_RO);
   fis >> sgain_;
-  cout << " MeanGain=" << sgain_.Sum()/sgain_.Size() << endl;
+  fg_apply_gains_=fgapp;
+  cout << " MeanGain=" << sgain_.Sum()/sgain_.Size() << " ApplyGains=" 
+       << ((fg_apply_gains_)?"true":"false") << endl;
 }
 
@@ -111 +151 @@
 { return (z.real()*z.real()+z.imag()*z.imag()); }
 
+
+
+
 /* --Methode-- */
 int BRMeanSpecCalculator::Process()
 {
-  if (nbpaq4mean_==nmean_)  SaveSpectra();
-  FlagBadPackets();
-    
+  // Cette methode remplit le tableau spec_window_ avec les spectres (renormalise avec 
+  // les gains si demande) et appelle la methode du traitement de la fenetre temporelle 
+  // des spectres le cas echeant ProcSpecWin()
+
+  int_8 nbpaqdec = (int_8)totnbpaq_-(int_8)GetSpecWinOverlapSize();
+  if ((nbpaqdec>0)&&(nbpaqdec%GetSpectraWindowSize()==0)) {
+    paqnum_w_end=totnbpaq_-GetSpecWinExtensionSize();
+    ProcSpecWin(paqnum_w_start, paqnum_w_end);
+    paqnum_w_start=totnbpaq_-GetSpecWinExtensionSize();
+  }
+
   if (fgdatafft_) {  // Donnees firmware FFT 
-    for(sa_size_t i=0; i<(size_t)mspecmtx_.NRows(); i++) {
-      if (clnflg_[i])  { nbadpaq_[i]++;  continue; }   // si le paquet a ete flagge mauvais ( clnflg_[i] <> 0 ) 
+    for(sa_size_t i=0; i<spec_window_.SizeY(); i++) {
       TwoByteComplex* zp=NULL;
       if (fgsinglechannel_) {
@@ -128 +178 @@
         if (i%2==1)  zp=vpaq_[i/2].Data2C();
       }
-      TVector< r_4 > spec = mspecmtx_.Row(i); 
-      TVector< r_4 > sspec = sigspecmtx_.Row(i); 
-      for(sa_size_t f=1; f<spec.Size(); f++) {
-        r_4 m2zf=zp[f].module2F();;
-        spec(f) += m2zf;
-        sspec(f) += m2zf*m2zf;
-      }
+      sa_size_t kz=PaqNumToArrayIndex(totnbpaq_); 
+      for(sa_size_t f=0; f<spec_window_.SizeX(); f++) 
+        spec_window_(f,i,kz) = zp[f].module2F();
     }
   }
   else {  // Donnees RAW qui ont du etre processe par BRFFTCalculator
-    for(sa_size_t i=0; i<(size_t)mspecmtx_.NRows(); i++) {
-      if (clnflg_[i])  { nbadpaq_[i]++;  continue; }   // si le paquet a ete flagge mauvais ( clnflg_[i] <> 0 ) 
+    for(sa_size_t i=0; i<spec_window_.SizeY(); i++) {
       complex<ODT>* zp=NULL;
       if (fgsinglechannel_) {
@@ -148 +193 @@
         if (i%2==1)  zp= reinterpret_cast< complex<ODT>* >(vprocpaq_[i/2]+memgr_.ProcPaqSize()/2) ;
       }
+      sa_size_t kz=PaqNumToArrayIndex(totnbpaq_); 
+      for(sa_size_t f=0; f<spec_window_.SizeX(); f++) 
+        spec_window_(f,i,kz) = Zmod2(zp[f]); 
+    }
+  }
+  if (fg_apply_gains_) {   // Application des gains, si demande 
+    sa_size_t kz=PaqNumToArrayIndex(totnbpaq_);
+    for(sa_size_t i=0; i<spec_window_.SizeY(); i++) 
+      (spec_window_(Range::all(), Range(i), Range(kz))).Div(sgain_.Row(i));
+  }
+
+  totnbpaq_++;
+  return 0;
+}
+
+
+/* --Methode-- */
+void BRMeanSpecCalculator::ProcSpecWin(uint_8 numpaqstart, uint_8 numpaqend)
+{
+  //DBG  cout << "BRMeanSpecCalculator::ProcSpecWin()/Debug: numpaqstart=" << numpaqstart 
+  //DBG     << " numpaqend=" << numpaqend << endl;
+
+  // On appelle la routine de nettoyage qui doit flagger les mauvais paquets 
+  FlagBadPackets(numpaqstart, numpaqend);
+
+  // Boucle sur les numeros de paquets de la fenetre en temps
+  for (uint_8 jp=numpaqstart; jp<numpaqend; jp++) {
+    // On sauvegarde les spectres moyennes si necessaire 
+    if ((nbpaq4mean_[0]>0)&&(nbpaq4mean_[0]%nmean_ == 0))  SaveMeanSpectra();
+    //  On peut aussi acceder aux spectres et flags pour (jpmin -),(jpmax+) GetSpecWinExtensionSize()
+    sa_size_t kz=PaqNumToArrayIndex(jp); 
+    // Boucle sur les numeros de voie (canaux) 
+    for(sa_size_t i=0; i<spec_window_.SizeY(); i++)  {
+      if ( clnflg_(i,kz) != 0)  continue;
       TVector< r_4 > spec = mspecmtx_.Row(i); 
       TVector< r_4 > sspec = sigspecmtx_.Row(i); 
-      for(sa_size_t f=1; f<spec.Size(); f++)  {
-        r_4 m2zf=Zmod2(zp[f]);
-        spec(f) += m2zf;
-        sspec(f) += (m2zf*m2zf);        
-      }     
+      // Calcul de spectres moyennes et variance 
+      for(sa_size_t f=1; f<spec.Size(); f++)  {   // boucle sur les frequences 
+        spec(f) += spec_window_(f,i,kz);
+        sspec(f) += spec_window_(f,i,kz)*spec_window_(f,i,kz);  
+      }
+      nbpaq4mean_[i]++;  // compteur de paquets OK pour la moyenne 
     }
   }
-  nbpaq4mean_++;   totnbpaq_++;
-  return 0;
-}
-
-/* --Methode-- */
-void BRMeanSpecCalculator::FlagBadPackets()
-{
-  if (fgdatafft_) {  // Donnees firmware FFT 
-    for(sa_size_t i=0; i<(size_t)mspecmtx_.NRows(); i++) {
-      TwoByteComplex* zp=NULL;
-      if (fgsinglechannel_) {
-        zp=vpaq_[i].Data1C();
-      }
-      else {
-        zp=vpaq_[i/2].Data1C();
-        if (i%2==1)  zp=vpaq_[i/2].Data2C();
-      }
+  if (nbtot_specwin_<nmaxfiles_specw_)  SaveSpectraWindow();
+  nbtot_specwin_++;
+  return;
+}
+
+/* --Methode-- */
+void BRMeanSpecCalculator::FlagBadPackets(uint_8 numpaqstart, uint_8 numpaqend)
+{
+  // Boucle sur les numeros de paquets de la fenetre en temps
+  for (uint_8 jp=numpaqstart; jp<numpaqend; jp++) {
+    //  On peut aussi acceder aux spectres et flags pour (jpmin -),(jpmax+) GetSpecWinExtensionSize()
+    sa_size_t kz=PaqNumToArrayIndex(jp); 
+    // Boucle sur les numeros de voie (canaux) 
+    for(sa_size_t i=0; i<spec_window_.SizeY(); i++)  {
+      double mean, sigma;
+      sa_size_t kz=PaqNumToArrayIndex(totnbpaq_); 
       double variance=0.;
-      double varnorm=0.;
-      for(sa_size_t f=1; f<mspecmtx_.NCols(); f++) {
-        double modsq=(double)zp[f].module2F();
-        variance+=modsq;
-        varnorm+=modsq/sgain_(i,f);
-      }
+      variance=spec_window_(Range(1,Range::lastIndex()), Range(i), Range(kz)).Sum();
       xnt_[i]=variance;
-      xnt_[i+mspecmtx_.NRows()]=varnorm;
-      clnflg_[i]=0;
-      if (varnorm<varmin_) clnflg_[i]=1;
-      else if (varnorm>varmax_) clnflg_[i]=2;
+      clnflg_(i,kz)=0;
+      if (variance<varmin_) { clnflg_(i,kz)=1;  nbadpaq_[i]++; }
+      else if (variance>varmax_) { clnflg_(i,kz)=2;  nbadpaq_[i]++; }
     }
-  }
-  else {  // Donnees RAW qui ont du etre processe par BRFFTCalculator
-    for(sa_size_t i=0; i<(size_t)mspecmtx_.NRows(); i++) {
-      complex<ODT>* zp=NULL;
-      if (fgsinglechannel_) {
-        zp=reinterpret_cast< complex<ODT>* > (vprocpaq_[i]);
-      }
-      else {
-        zp=reinterpret_cast< complex<ODT>* > (vprocpaq_[i/2]);
-        if (i%2==1)  zp= reinterpret_cast< complex<ODT>* >(vprocpaq_[i/2]+memgr_.ProcPaqSize()/2) ;
-      }
-      double variance=0.;
-      double varnorm=0.;
-      for(sa_size_t f=1; f<mspecmtx_.NCols(); f++) {
-        double modsq=(double)Zmod2(zp[f]);
-        variance+=modsq;
-        varnorm+=modsq/sgain_(i,f);
-      }
-      xnt_[i]=variance;
-      xnt_[i+mspecmtx_.NRows()]=varnorm;
-      clnflg_[i]=0;
-      if (varnorm<varmin_) clnflg_[i]=1;
-      else if (varnorm>varmax_) clnflg_[i]=2;
+  dtp_->AddRow(xnt_);
+  }
+  return;
+}
+
+/* --Methode-- */
+void BRMeanSpecCalculator::SaveMeanSpectra()
+{
+  for(sa_size_t ir=0; ir<mspecmtx_.NRows(); ir++) {
+    char buff[32];
+    sprintf(buff,"NPAQSUM_%d",(int)ir);
+    mspecmtx_.Info()["NPAQSUM"] = nbpaq4mean_[0];
+    mspecmtx_.Info()[buff] = nbpaq4mean_[ir];
+    sigspecmtx_.Info()["NPAQSUM"] = nbpaq4mean_[0];
+    sigspecmtx_.Info()[buff] = nbpaq4mean_[ir];
+    if (nbpaq4mean_[ir] > 0) {
+      mspecmtx_.Row(ir)  /= (r_4)nbpaq4mean_[ir];
+      sigspecmtx_.Row(ir) /= (r_4)nbpaq4mean_[ir];
+      sigspecmtx_.Row(ir) -= (mspecmtx_.Row(ir) && mspecmtx_.Row(ir));  // Mean(X^2) - [ Mean(X) ]^2
     }
   }
-  dtp_->AddRow(xnt_);
-  return;
-}
-
-/* --Methode-- */
-void BRMeanSpecCalculator::SaveSpectra()
-{
-  mspecmtx_.Info()["NPAQSUM"] = nbpaq4mean_;
-  mspecmtx_ /= (double)nbpaq4mean_;
-  sigspecmtx_.Info()["NPAQSUM"] = nbpaq4mean_;
-  sigspecmtx_ /= (double)nbpaq4mean_;
-  sigspecmtx_ -= (mspecmtx_ && mspecmtx_);  // Mean(X^2) - [ Mean(X) ]^2
   char nfile[64];
   string flnm;
-  /*
-  {
-  sprintf(nfile,"mspecmtx%d.ppf",numfile_);
-  flnm=outpath_+nfile;
-  POutPersist po(flnm);
-  po << mspecmtx_;
-  }
-  {
-  sprintf(nfile,"sigspecmtx%d.ppf",numfile_);
-  flnm=outpath_+nfile;
-  POutPersist po(flnm);
-  po << sigspecmtx_;
-  }
-  */
   {
   sprintf(nfile,"mspecmtx%d.fits",numfile_);
@@ -253 +296 @@
   }
 
-  cout << numfile_ << "-BRMeanSpecCalculator::SaveSpectra() NPaqProc="
+  cout << numfile_ << "-BRMeanSpecCalculator::SaveMeanSpectra() NPaqProc="
        << totnbpaq_ << "  -> Mean/Sig spectra Matrix in " << flnm << " /sigspec...ppf" << endl;
-  numfile_++;  nbpaq4mean_=0;
+  numfile_++;  
+
+  for(size_t i=0; i<nbpaq4mean_.size(); i++) nbpaq4mean_[i]=0;
   mspecmtx_ = (r_4)(0.);
   sigspecmtx_ = (r_4)(0.);
   return;
+}
+
+/* --Methode-- */
+void BRMeanSpecCalculator::SaveSpectraWindow()
+{
+  char nfile[64];
+  string flnm;
+  sprintf(nfile,"specwin%d.fits",nbtot_specwin_);
+  flnm="!"+outpath_+nfile;
+  FitsInOutFile fos(flnm,FitsInOutFile::Fits_Create);
+  fos << spec_window_;
+  cout << " SaveSpectraWindow() " << nbtot_specwin_ << "- file " << nfile << " created " << endl;
 }
 
@@ -332 +389 @@
   for(uint_4 k=0; k<inp.Size(); k++)   inp(k)=(ODT)indata[k];
   fftwf_execute(myplan_); 
-  for(uint_4 k=0; k<outfc.Size(); k++)   ofc[k]=outfc(k);
+  for(uint_4 k=0; k<outfc.Size(); k++)   ofc[k]=outfc(k)/(ODT)sz_;   // on renormalise les coeff FFT ( / sz )
   return;
 }

trunk/AddOn/TAcq/brproc.h

@@ -6 +6 @@
 // Classes de threads de traitememt donnees BAORadio 
 //  Principales classes utilisables 
-//  - BRMeanSpecCalculator (donnees FFT)
+//  - BRMeanSpecCalculator (donnees FFT ou RAW apres BRFFTCalculator)
 //  - BRFFTCalculator (donnees RAW) 
 //----------------------------------------------------------------
@@ -27 +27 @@
 using namespace std;
 
-
  
 //---------------------------------------------------------------------
@@ -40 +39 @@
   virtual ~BRMeanSpecCalculator(); // Fait le nettoyage final , sauvegarde des objets ...
 
+// Definit la taille de la fenetre temporelle (winsz = nb de paquets) des spectres a traiter
+// Cette zone est etendu de wszext paquet en debut et en fin de paquet 
+  void SetSpectraWindowSize(uint_4 winsz=15, uint_4 wszext=3);
+// Taille de la fenetre en temps (nb de paquets a traiter en bloc
+  inline sa_size_t GetSpectraWindowSize() { return spec_window_.SizeZ()-2*spwin_ext_sz_; }
+// Taille de la zone d'extension de la fenetre de chaque cote 
+  inline sa_size_t GetSpecWinExtensionSize() { return spwin_ext_sz_; }
+// La taille de recouvrement est le double de la taille de la zone d'extension 
+  inline sa_size_t GetSpecWinOverlapSize() { return 2*spwin_ext_sz_; }
+// Retourne l'index (selon Z) dans le tableau des spectres en fonction du numero de paquet
+  inline sa_size_t PaqNumToArrayIndex(uint_8 numpaq)  { return numpaq%spec_window_.SizeZ() ; }
+
+// Pour definir le nombre maximum de fichiers de fenetres de spectres 
+  inline void SetMaxNbSepcWinFiles(uint_4 nmax=0)  {  nmaxfiles_specw_=nmax; }
+
   inline void SetVarianceLimits(double vmin=0., double vmax=9.e99)
-     { varmin_=vmin;  varmax_=vmax; }
-
-  void ReadGainFitsFile(string filename);
-
-protected:
-  virtual int Process(); 
-  virtual void FlagBadPackets();
-  virtual void SaveSpectra();
+    { varmin_=vmin;  varmax_=vmax; }
+
+// lecture des gains en fonction de la frequence depuis un fichier FITS
+// flag fgapp: Active ou desactive la renormalisation de coefficients de Fourier par les gains=f(frequence)  
+  void ReadGainFitsFile(string filename, bool fgapp=true);
+
+protected:
+  virtual int Process();   // appele paquet par paquet 
+// appele par Process() pour traiter un groupe de paquets correspondant a une fenetre en temps
+  virtual void ProcSpecWin(uint_8 numpaqstart, uint_8 numpaqend);  // appele fenetre par fenetre  
+  virtual void FlagBadPackets(uint_8 numpaqstart, uint_8 numpaqend);   
+  virtual void SaveMeanSpectra();  // Pour sauver les spectres moyennes ( + sigma ) dans un fichier 
+  virtual void SaveSpectraWindow();  // Pour sauver les spectres de la fenetre temporel ds un fichier 
 
 
@@ -56 +75 @@
   bool fgsinglechannel_;
   uint_4 numfile_;
-  uint_8 nbpaq4mean_;
-
+  vector<uint_8> nbpaq4mean_;
   uint_8 totnbpaq_;
+
   TMatrix< r_4 > mspecmtx_;    // Matrice des spectres moyennees 
   TMatrix< r_4 > sigspecmtx_;    // Matrice des sigmas des spectres  
 
+  TArray< r_4 > spec_window_;    // fenetre en temps sur les spectres  
+  uint_4 spwin_ext_sz_;          // Taille de la zone d'extension en debut et en fin 
+  TArray< uint_2 > clnflg_;      // flag de nettoyage resultant de la routine   FlagBadPackets() 
+  uint_8 paqnum_w_start;     // numero de paquet du debut de la fenetre en temps (inclusif) 
+  uint_8 paqnum_w_end;       // numero de paquet final de la fenetre en temps (non inclusif) 
+
+  uint_4 nbtot_specwin_;    // nombre total de fenetre de spectres traites 
+  uint_4 nmaxfiles_specw_;   // nombre maximum de fichier de fenetre_spectre 
+  
   TMatrix< r_4 > sgain_;   // gain en fonction de la frequence  
-
-  vector<int> clnflg_;      // resultat de la routine "cleaner" 
+  bool fg_apply_gains_; 
+
   double varmin_, varmax_;  // limites pour la coupure sur la variance
   vector<uint_8> nbadpaq_;

trunk/AddOn/TAcq/specmfib.cc

@@ -59 +59 @@
     BRPaquet paq(par.paqsize_);
     uint_4 procsz=sizeof(float)*(paq.DataSize()+4);
-    if ((par.fgdatafft_)||(par.action_=="cube3d")) procsz = 0;
+//    if ((par.fgdatafft_)||(par.action_=="cube3d")) procsz = 0;
     cout << " specmfib: Creating MemZoneMgr/threads - PaqSz= " << par.paqsize_ 
          << " ProcPaqSz=" << procsz << endl;
@@ -77 +77 @@
     BRFFTCalculator procfft(mmgr, par.fgsinglechannel_);
     if (!par.fgdatafft_) procms.SetMemZAction(MemZA_ProcB);
-
+    if (par.spec_win_sz_>0) { 
+      procms.SetSpectraWindowSize(par.spec_win_sz_, par.spw_ext_sz_);
+      procms.SetMaxNbSepcWinFiles(par.nbmax_specwfiles_);
+    }
     FitsCubeWriter wrt(mmgr, par.outpath_, par.nbloc_);