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

Timestamp:

May 13, 2011, 12:37:14 AM (14 years ago)

Author:

ansari

Message:

Ajout possibilite de faire un DataTable (NTuple) avec la puissance spectrale dans plusieurs bandes en fonction du temps, Reza 13/05/2011

File:

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

trunk/AddOn/TAcq/brproc.cc

@@ -73 +73 @@
   numfile_=0;
   totnbpaq_=0;
+  moyfc_=moytt_=0.;
+  nbpmoyttfc_=0;
 
   size_t nchan=(fgsinglechannel_?memgr_.NbFibres():2*memgr_.NbFibres());
@@ -79 +81 @@
     nbpaq4mean_[i]=nbadpaq_[i]=0;
   }
-
-  //
   
 
@@ -92 +92 @@
   ofsdtp_=NULL;
   dtp_=NULL;
-  
-  //  cout << "(JEC) creation tuple de " << nchan*(1+numberOfBands_) << " doubles " << endl;
-  //  xnt_=new double[nchan*(1+numberOfBands_)];  // CHECK : ATTENTION la taille depend de nombre de colonne du NTuple !
   xnt_=NULL;
+  ofsdtpms_=NULL;
+  dtpms_=NULL;
+  xntms_=NULL;
+  firstfreqms_=0; 
+  lastfreqms_=-1;
+  nbandms_=-1;
 }
 
@@ -113 +116 @@
     delete ofsdtp_;
   }
+  if (dtpms_) {
+    cout << *dtpms_; 
+    delete dtpms_;
+    delete ofsdtpms_;
+  }
   if (xnt_)   delete xnt_;
+  if (xntms_)   delete xntms_;
   cout << " ------------------------------------------------------------------------ " << endl;
 }
@@ -142 +151 @@
 
 /* --Methode-- */
-void BRMeanSpecCalculator::DefineDataTable()
-{
-  cout << "(JEC) BRMeanSpecCalculator::DefineDataTable START" << endl;
-  string dtfile="!"+outpath_+"/dtspec.fits";
+void BRMeanSpecCalculator::DefinePerPaquetDataTable()
+{
+  cout << "BRMeanSpecCalculator::DefinePerPaquetDataTable: Creating DataTable" << endl;
+  string dtfile="!"+outpath_+"/dtspecpaq.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());
+  size_t nchan=mspecmtx_.NRows();
   for(int i=0; i<nchan; i++) {
     sprintf(cnom,"variance%d",i);
@@ -161 +170 @@
   }
   /*
-  for(int i=0; i<nchan; i++) {
+    for(int i=0; i<nchan; i++) {
     sprintf(cnom,"sigma%d",i);
     dtp_->AddFloatColumn(cnom);    
-  }
+    }
   */
   //  xnt_=new double[nchan*2];  CHECK : faut-il reallouer ?
-  cout << "(JEC) creation tuple de " << nchan*(1+numberOfBands_) << " doubles " << endl;
+  cout << " ...Number of columns " << nchan*(1+numberOfBands_) << " doubles -> to FITS file" << dtfile << endl;
   xnt_=new double[nchan*(1+numberOfBands_)];
-  cout << "(JEC) BRMeanSpecCalculator::DefineDataTable END" << endl;
+
+}
+
+/* --Methode-- */
+void BRMeanSpecCalculator::DefineTimeAvgPowerDataTable(int first, int last, int nband)
+{
+  cout << "BRMeanSpecCalculator::DefineTimeAvgPowerDataTable: Creating time averged power spectrum" << endl;
+  string dtfile="!"+outpath_+"/avgspec.fits";
+  ofsdtpms_ = new FitsInOutFile(dtfile,FitsInOutFile::Fits_Create);
+  dtpms_ = new SwFitsDataTable(*ofsdtpms_,1024,true);
+  dtpms_->AddDoubleColumn("mtimetag");
+  dtpms_->AddDoubleColumn("time");
+  
+  if (last>first) {
+    if ((first<0)||(first>=mspecmtx_.NCols()))  first=0;
+    if ((last<0)||(last>mspecmtx_.NCols()))  last=mspecmtx_.NCols();
+    if (nband<1)  nband=1;
+  }
+  else {
+    first=1;  last=mspecmtx_.NCols();  nband=1;
+  }
+  firstfreqms_=first;   lastfreqms_=last;  nbandms_=nband;
+  char cnom[32];
+  size_t nchan=mspecmtx_.NRows();
+  for(int i=0; i<nchan; i++) {
+    for(int j=0; j<nband; j++) {
+      sprintf(cnom,"pow%dc%d",j,i);
+      dtpms_->AddFloatColumn(cnom); 
+    }   
+  }
+  cout << " ...Number of columns " << (2+nchan*nband) << " doubles -> to FITS file" << dtfile << endl;
+  xntms_=new double[nchan*nband+2];
 }
   
@@ -181 +221 @@
   ibandfirst_=ibandfirst; ibandlast_=ibandlast;
 
-  cout << "(JEC): SetNumberOfBands (END) : "
+  cout << "BRMeanSpecCalculator::SetNumberOfBands (END) : "
        << numberOfBands_ << " "
        << ibandfirst_ << " "
@@ -264 +304 @@
   }
 
+  // Pour calcul MeanTimeTag , MeanFrameCounter 
+  moyfc_+=curfc_[0];
+  moytt_+=((double)vpaq_[0].TimeTag()/1.25e8);
+  nbpmoyttfc_++;
   totnbpaq_++;
   return 0;
@@ -371 +415 @@
     }
   }
+  mspecmtx_.Info()["ENDTIME"]=getObsTime();
+  sigspecmtx_.Info()["ENDTIME"]=getObsTime();
+  if (nbpmoyttfc_>1)  {
+    moyfc_/=(double)nbpmoyttfc_;
+    moytt_/=(double)nbpmoyttfc_;
+  }
+  string ikey,ikdesc;    
+  ikey="MeanFC";  ikdesc="Mean FrameCounter";
+  mspecmtx_.Info().SetI(ikey,moyfc_); 
+  mspecmtx_.Info().SetComment(ikey,ikdesc);
+  sigspecmtx_.Info().SetI(ikey,moyfc_); 
+  sigspecmtx_.Info().SetComment(ikey,ikdesc);
+  
+  ikey="MeanTT";  ikdesc="Mean TimeTag";
+  mspecmtx_.Info().SetD(ikey,moytt_);
+  mspecmtx_.Info().SetComment(ikey,ikdesc);
+  sigspecmtx_.Info().SetD(ikey,moytt_);
+  sigspecmtx_.Info().SetComment(ikey,ikdesc);
+  
   char nfile[64];
   string flnm;
@@ -390 +453 @@
   numfile_++;  
 
+  if (dtpms_!=NULL)  FillPwrTmDTable(mspecmtx_);
+
   for(size_t i=0; i<nbpaq4mean_.size(); i++) nbpaq4mean_[i]=0;
   mspecmtx_ = (r_4)(0.);
   sigspecmtx_ = (r_4)(0.);
+  moyfc_=moytt_=0.;  
+  nbpmoyttfc_=0;
   return;
 }
@@ -406 +473 @@
   fos << spec_window_;
   cout << " SaveSpectraWindow() " << nbtot_specwin_ << "- file " << nfile << " created " << endl;
+}
+
+/* --Methode-- */
+void BRMeanSpecCalculator::FillPwrTmDTable(TMatrix< r_4 >& specmtx)
+{
+  if (dtpms_==NULL) return;
+  xntms_[0]=moytt_;  
+  xntms_[1]=getObsTimeSeconds();
+  size_t knt=2;  
+  sa_size_t wband=(lastfreqms_-firstfreqms_)/nbandms_;
+  for(sa_size_t ir=0; ir<specmtx.NRows(); ir++) {
+    for(sa_size_t jf=0; jf<specmtx.NCols()-wband; jf+=wband) {
+      TVector<r_4> srow=specmtx.Row(ir);
+      xntms_[knt]=srow.SubVector(Range(jf,jf+wband-1)).Sum();
+      knt++;
+    }
+  }
+  dtpms_->AddRow(xntms_);
 }