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

Timestamp:

Jan 13, 2011, 11:42:21 AM (15 years ago)

Author:

ansari

Message:

modification provisoire pour lecture fichiers visibilites 2010, Reza 13/01/2011

File:

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

trunk/AddOn/TAcq/brproc.cc

@@ -76 +76 @@
   ofsdtp_=NULL;
   dtp_=NULL;
-  string dtfile="!"+outpath_+"/dtspec.fits";
-  ofsdtp_ = new FitsInOutFile(dtfile,FitsInOutFile::Fits_Create);
-  dtp_ = new SwFitsDataTable(*ofsdtp_,1024,true);
-  char cnom[32];
-  for(int i=0; i<nchan; i++) {
-    sprintf(cnom,"variance%d",i);
-    dtp_->AddFloatColumn(cnom);    
-  }
-  /*
-  for(int i=0; i<nchan; i++) {
-    sprintf(cnom,"sigma%d",i);
-    dtp_->AddFloatColumn(cnom);    
-  }
-  */
-  xnt_=new double[nchan*2];
-
+  xnt_=new double[nchan*2];  // CHECK : ATTENTION la taille depend de nombre de colonne du NTuple !
 }
 
@@ -108 +93 @@
     delete dtp_;
     delete ofsdtp_;
-    delete xnt_;
-  }
+  }
+  if (xnt_)   delete xnt_;
   cout << " ------------------------------------------------------------------------ " << endl;
 }
@@ -138 +123 @@
 
 /* --Methode-- */
+void BRMeanSpecCalculator::DefineDataTable()
+{
+  string dtfile="!"+outpath_+"/dtspec.fits";
+  ofsdtp_ = new FitsInOutFile(dtfile,FitsInOutFile::Fits_Create);
+  dtp_ = new SwFitsDataTable(*ofsdtp_,1024,true);
+  char cnom[32];
+  size_t nchan=(fgsinglechannel_?memgr_.NbFibres():2*memgr_.NbFibres());
+  for(int i=0; i<nchan; i++) {
+    sprintf(cnom,"variance%d",i);
+    dtp_->AddFloatColumn(cnom);    
+  }
+  /*
+  for(int i=0; i<nchan; i++) {
+    sprintf(cnom,"sigma%d",i);
+    dtp_->AddFloatColumn(cnom);    
+  }
+  */
+  //  xnt_=new double[nchan*2];  CHECK : faut-il reallouer ?
+}
+
+/* --Methode-- */
 void BRMeanSpecCalculator::ReadGainFitsFile(string filename, bool fgapp)
 {
@@ -212 +218 @@
 void BRMeanSpecCalculator::ProcSpecWin(uint_8 numpaqstart, uint_8 numpaqend)
 {
-  //DBG  cout << "BRMeanSpecCalculator::ProcSpecWin()/Debug: numpaqstart=" << numpaqstart 
-  //DBG     << " numpaqend=" << numpaqend << endl;
-
+
+  if (prtlev_>0)  {
+    uint_8 modulo =  prtmodulo_/GetSpectraWindowSize();
+    if (modulo<1) modulo=1;
+    if (nbtot_specwin_%modulo==0) {
+      cout << " BRMeanSpecCalculator::ProcSpecWin() num_win=" << nbtot_specwin_ << " numpaqstart=" << numpaqstart 
+           << " numpaqend=" << numpaqend << endl;
+      cout << " ... ObsTime=" << getObsTime() << " TimeTag=" << getCurTimeTagSeconds() << " s. FrameCounter=" 
+           << getCurFrameCounter() << endl;
+    }
+  }
+  nbtot_specwin_++;
+  return;
   // On appelle la routine de nettoyage qui doit flagger les mauvais paquets 
   FlagBadPackets(numpaqstart, numpaqend);
@@ -255 +271 @@
       double variance=0.;
       variance=spec_window_(Range(1,Range::lastIndex()), Range(i), Range(kz)).Sum();
-      xnt_[i]=variance;
+      //      xnt_[i]=variance;
       clnflg_(i,kz)=0;
       if (variance<varmin_) { clnflg_(i,kz)=1;  nbadpaq_[i]++; }
       else if (variance>varmax_) { clnflg_(i,kz)=2;  nbadpaq_[i]++; }
     }
-  dtp_->AddRow(xnt_);
+    if (dtp_)  dtp_->AddRow(xnt_);
   }
   return;