Changeset 3993 in Sophya for trunk/AddOn/TAcq/branap.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/branap.cc (modified) (6 diffs)

trunk/AddOn/TAcq/branap.cc

@@ -22 +22 @@
   istep_=1;
   rdsamefc_=true;   // read paquets with same frame counter
-  freqmin_=freqmax_=0;
+  freqmin_=0; freqmax_=-1;
   nbinfreq_=1;  
   paqsize_=16424;
@@ -40 +40 @@
   vmin_=0.;  vmax_=9e99;
   nbands_=0; bandfirst_ = bandlast_ = 0;
-  fgdt_ = false;
+  fgdtpaq_ = fgdtms_ = false;
 
   fgfreqfilter_=false; //JEC 1/2/11
@@ -133 +133 @@
       ka+=2;
     }
-    else if (strcmp(arg[ka],"-filldt")==0) {
-      fgdt_=true;
+    else if (strcmp(arg[ka],"-fdtpaq")==0) {
+      fgdtpaq_=true;
+      ka++;
+    }
+    else if (strcmp(arg[ka],"-fdtms")==0) {
+      fgdtms_=true;
       ka++;
     }
@@ -205 +209 @@
        << "                 [-freqfilter medhw] [-gain filename] [-varcut min,max] [-nband nband,first,last] \n"
        << "                 [-freqfilter] [-gain filename] [-varcut min,max] [-nband nband,first,last] \n"
-       << "                 [-tmproc hh:mm:ss,nseconds] [-filldt] [-tspwin wsz,extsz,nfiles] \n" 
+       << "                 [-tmproc hh:mm:ss,nseconds] [-fdtpaq] [-fdtms] [-tspwin wsz,extsz,nfiles] \n" 
        << "         -in Imin,Imax,Istep InPath FiberList [InPath2 FiberList2 InPath3 FiberList3 ...] \n" << endl; 
   if (fgshort) {
@@ -232 +236 @@
        << " -fftdata : Force FFT data mode (firmware fft) \n"
        << " -varcut min,max : min-max cut on variance \n" 
-       << " -nband nband,first,last: numbers of freq. bands and first and last bands used for cuts \n"
+       << " -nband nband,first,last: numbers of freq. bands and first and last bands used for cuts\n"
        << " -tmproc hh:mm:ss,nseconds : processing time window definition \n"
-       << " -filldt : force data table filling \n"
+       << " -fdtpaq : force per paquet data table filling (specmfib) \n"
+       << " -fdtms : force time averaged/filtered data table filling; use -freq for defining bands (specmfib)\n"
        << " -freqfilter medhw: force median filtering on the frequencies \n"
        << "   with half window width medhw (use - for default=" << medhalfwidth_ << ") \n"
@@ -283 +288 @@
   cout << " Action=" << action_ << "  NMean=" << nmean_ << " NBloc=" << nbloc_ << endl;
   cout << " FreqMin= " << freqmin_ << " FreqMax= " << freqmax_ << " NBinFreq= " << nbinfreq_ << endl;
-  cout<<  ((fgdt_)?" Fill DadaTable ":" NO DataTable") << endl;
+  if (fgdtpaq_) cout<<  " Fill Per Paquet DadaTable "; 
+  if (fgdtms_) cout<<  " Fill Time Averaged/Filtered binned power DataTable "; 
+  if (!fgdtpaq_&&!fgdtms_)  cout << " NO DataTable " << endl;
+  else cout << endl;
   cout << " GainFileName=" << gainfile_ << " Variance: Min= " << vmin_ << " Max= " << vmax_ 
        << " Bands: N=" <<  nbands_ << " First=" << bandfirst_ << " Last=" << bandlast_