Changeset 3943 in Sophya for trunk/AddOn/TAcq/branap.cc

Timestamp:

Feb 1, 2011, 9:30:20 AM (15 years ago)

Author:

campagne

Message:

release.txt

File:

• trunk/AddOn/TAcq/branap.cc (modified) (7 diffs)

trunk/AddOn/TAcq/branap.cc

@@ -26 +26 @@
   nzones_=nzon;
   npaqinzone_=npaqz;
-  fgdatafft_=false;  fgsinglechannel_=false;
+  fgdatafft_=false;  fgsinglechannel_=false; fgforcesinglechan_=false;
   prtlevel_=0;
   prtmodulo_=50000;
@@ -37 +37 @@
 
   vmin_=0.;  vmax_=9e99;
+  nbands_=0; bandfirst_ = bandlast_ = 0;
+  fgdt_ = false;
+
+  fgfreqfilter_=false; //JEC 1/2/11
+
   gainfile_="";
 }
@@ -94 +99 @@
       ka++;
     }
+    else if (strcmp(arg[ka],"-singlechan")==0) {
+      fgsinglechannel_=true; fgforcesinglechan_ = true; 
+      ka++;
+    }
     else if (strcmp(arg[ka],"-varcut")==0) {
       sscanf(arg[ka+1],"%lg,%lg",&vmin_,&vmax_);
       ka+=2;
     }
+    else if (strcmp(arg[ka],"-nband")==0) {
+      sscanf(arg[ka+1],"%d,%d,%d",&nbands_,&bandfirst_,&bandlast_);
+      ka+=2;
+    }
+    else if (strcmp(arg[ka],"-filldt")==0) {
+      fgdt_=true;
+      ka++;
+    }
+    else if (strcmp(arg[ka],"-freqfilter")==0) {
+      fgfreqfilter_=true;
+      ka++;
+    }    
     else if (strcmp(arg[ka],"-gain")==0) {
       gainfile_=arg[ka+1];
@@ -147 +168 @@
   cout << " Usage:  prgname [-act ACT] [-out OutPath] [-nmean NMean] [-zones NZones,nPaqinZone] \n" 
        << "                 [-nbloc NBloc] [-freq NumFreqMin,NumFreqMax,NBinFreq] \n" 
-       << "                 [-prt lev,modulo] [-nvcal n] [-nthr n] [-nosfc] \n" 
-       << "                 [-gain filename] [-varcut min,max] [-tspwin wsz,extsz,nfiles] \n" 
+       << "                 [-prt lev,modulo] [-nvcal n] [-nthr n] [-nosfc] [-singlechan]\n"
+       << "                 [-freqfilter]\n"
+       << "                 [-gain filename] [-varcut min,max] [-nband nband,first,last] \n"
+       << "                 [-filldt] [-tspwin wsz,extsz,nfiles] \n" 
        << "         -in Imin,Imax,Istep InPath FiberList [InPath2 FiberList2 InPath3 FiberList3 ...] \n" << endl; 
   if (fgshort) {
@@ -168 +191 @@
        << " -nthr n : number of threads for parallel execution in BRVisibilityCalculator (default=1) \n" 
        << " -nosfc : Don't force reading with SAME FrameCounter \n" 
+       << " -singlechan : Force one channel per fiber \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"
+       << " -filldt : force data table filling \n"
+       << " -freqfilter : force median filtering on the frequencies \n"
        << " -gain filename : spectral response fits file name \n" 
        << " -tspwin wsz,extsz,nfiles : spectra time (paquet no) window (ex: -tspwin 120,4,5) \n"
@@ -185 +212 @@
   char flnm[1024];
   sprintf(flnm,"%s/signal%d.fits",dirlist_[0].c_str(),imin_);
-  return DecodeMiniFitsHeader(flnm,paqsize_, npaqinfile_,fgdatafft_, fgsinglechannel_); 
+  int rc = DecodeMiniFitsHeader(flnm,paqsize_, npaqinfile_,fgdatafft_, fgsinglechannel_); 
+  if(fgforcesinglechan_) fgsinglechannel_= true;
+  return rc;
 }
 
@@ -199 +228 @@
   cout << " Action=" << action_ << "  NMean=" << nmean_ << " NBloc=" << nbloc_ << endl;
   cout << " FreqMin= " << freqmin_ << " FreqMax= " << freqmax_ << " NBinFreq= " << nbinfreq_ << endl;
-  cout << " GainFileName=" << gainfile_ << " VarianceMin= " << vmin_ << " VarianceMax= " << vmax_ << endl;
+  cout<<  ((fgdt_)?" Fill DadaTable ":" NO DataTable") << endl;
+  cout << " GainFileName=" << gainfile_ << " Variance: Min= " << vmin_ << " Max= " << vmax_ 
+       << " Bands: N=" <<  nbands_ << " First=" << bandfirst_ << " Last=" << bandlast_
+       << endl;
   cout << " Spectra TimeWindow (Nb.Paquets) Size=" << spec_win_sz_ << " ExtensionSize=" << spw_ext_sz_ 
        << " MaxNbFile=" << nbmax_specwfiles_ << endl;