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

Timestamp:

Mar 9, 2011, 3:19:23 PM (15 years ago)

Author:

ansari

Message:

Correction bug ds vismfib.cc (mauvais parametrage du thread de calculateur de visibilites avec RawData mode + corrections/ameliorations diverses, Reza 09/03/2011

File:

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

trunk/AddOn/TAcq/branap.cc

@@ -28 +28 @@
   npaqinzone_=npaqz;
   fgdatafft_=false;   fgforceraworfft_=false; 
-  fgsinglechannel_=false; fgforcesinglechan_=false;
+  fgsinglechannel_=false; fgforcesingleortwochan_=false;
   prtlevel_=0;
   prtmodulo_=50000;
@@ -106 +106 @@
     }
     else if (strcmp(arg[ka],"-singlechan")==0) {
-      fgsinglechannel_=true; fgforcesinglechan_ = true; 
+      fgsinglechannel_=true; fgforcesingleortwochan_ = true; 
+      ka++;
+    }
+    else if (strcmp(arg[ka],"-twochan")==0) {
+      fgsinglechannel_=false; fgforcesingleortwochan_ = true; 
       ka++;
     }
@@ -184 +188 @@
        << "                 [-nbloc NBloc] [-freq NumFreqMin,NumFreqMax,NBinFreq] \n" 
        << "                 [-prt lev,modulo] [-nvcal n] [-nthr n] [-nosfc]\n"
-       << "                 [-singlechan] [-fftdata] [-rawdata] \n"
+       << "                 [-singlechan] [-twochan] [-fftdata] [-rawdata] \n"
        << "                 [-freqfilter] [-gain filename] [-varcut min,max] [-nband nband,first,last] \n"
        << "                 [-filldt] [-tspwin wsz,extsz,nfiles] \n" 
@@ -193 +197 @@
   }
   cout << " -act Action: cube3d or vis or viscktt or mspec \n"
-       << "    cube3d: create 3D fits cubes \n " 
+       << "    cube3d: create 3D fits cubes \n" 
        << "    vis: compute visibilites (vismfib program) \n" 
-       << "    viscktt: compute visibilities and check TimeTag/FrameCounter (vismfib program)\n "
-       << "    mspec: compute and save mean spectra for each channel \n "
-       << "    bproc: run BRBaseProcessor for debug/printing (use -prt)  \n "
+       << "    viscktt: compute visibilities and check TimeTag/FrameCounter (vismfib program)\n"
+       << "    mspec: compute and save mean spectra for each channel \n"
+       << "    bproc: run BRBaseProcessor for debug/printing (use -prt)  \n"
        << " -out OutPath: Output directory name \n"
        << " -fitsout : Force FITS format for output files  \n"
@@ -209 +213 @@
        << " -nosfc : Don't force reading with SAME FrameCounter \n" 
        << " -singlechan : Force one channel per fiber \n"
+       << " -twochan : Force two channels per fiber \n"
        << " -rawdata : Force raw data mode (firmware raw) \n"
        << " -fftdata : Force FFT data mode (firmware fft) \n"
@@ -232 +237 @@
   sprintf(flnm,"%s/signal%d.fits",dirlist_[0].c_str(),imin_);
   bool fgdatafft_in_fits=false;
-  int rc = DecodeMiniFitsHeader(flnm,paqsize_, npaqinfile_,fgdatafft_in_fits, fgsinglechannel_); 
-  if(fgforcesinglechan_) fgsinglechannel_= true;
+  bool fgsinglechan_in_fits=false;
+  int rc = DecodeMiniFitsHeader(flnm,paqsize_, npaqinfile_,fgdatafft_in_fits, fgsinglechan_in_fits); 
+  if (!fgforcesingleortwochan_) fgsinglechannel_=fgsinglechan_in_fits;
   if (!fgforceraworfft_) fgdatafft_=fgdatafft_in_fits;
   return rc;