Changeset 3967 in Sophya for trunk/AddOn

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

Location:

trunk/AddOn/TAcq

Files:

• branap.cc (modified) (6 diffs)
• branap.h (modified) (1 diff)
• brviscalc.cc (modified) (5 diffs)
• brviscalc.h (modified) (2 diffs)
• vismfib.cc (modified) (1 diff)

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;

trunk/AddOn/TAcq/branap.h

@@ -43 +43 @@
   bool fgforceraworfft_; // true force par la ligne de commande fgdatafft_ true or false 
   bool fgsinglechannel_; // true -> un seul canal par fibre (par defaut=2 canaux/fibres)
-  bool fgforcesinglechan_; // true force par la ligne de commande
+  bool fgforcesingleortwochan_; // true force par la ligne de commande
   int prtlevel_;
   long int prtmodulo_; 

trunk/AddOn/TAcq/brviscalc.cc

@@ -362 +362 @@
           vfgok_[fib] = vpchk_[fib].Check(vpaq_[fib],curfc_[fib]);
           if (!vfgok_[fib])  fgallfibok[jp]=fgokallfibers_=false;
-          if (procpaqsz>0)    vprocpaq_[fib] = fprocbuff_[fib]+jp*procpaqsz;
+          //Pas utile     if (procpaqsz>0)    vprocpaq_[fib] = fprocbuff_[fib]+jp*procpaqsz;
         }
         if (fgokallfibers_)  {
@@ -409 +409 @@
   
 }
+
 
 /* --Methode-- */
@@ -533 +534 @@
   vector< complex<r_4>* >  pvpdatar(2*memgr_.NbFibres());
   size_t paqsz=memgr_.PaqSize();
+  size_t procpaqsz=memgr_.ProcPaqSize();
   BRPaquet ppaq(paqsz);
 
@@ -546 +548 @@
     if (!fgallfibok[jp])  continue;
     if (fgdataraw_) {  // Donnees firmware RAW apres TF soft 
-      size_t procpaqsz=memgr_.ProcPaqSize();
       for(size_t fib=0; fib<(size_t)memgr_.NbFibres(); fib++) { 
-        pvpdatar[2*fib] = reinterpret_cast< complex<r_4>* > (fprocbuff_[fib]+jp*procpaqsz); 
-        pvpdatar[2*fib+1] = reinterpret_cast< complex<r_4>* >(vprocpaq_[fib]+jp*procpaqsz+procpaqsz/2) ;
+        Byte* procdatap=fprocbuff_[fib]+jp*procpaqsz;
+        pvpdatar[2*fib] = reinterpret_cast< complex<r_4>* > (procdatap); 
+        pvpdatar[2*fib+1] = reinterpret_cast< complex<r_4>* >(procdatap+procpaqsz/2) ;
       }
     } 
@@ -733 +735 @@
   for(size_t i=0; i<viscalcp_.size(); i++)
     viscalcp_[i]->SetPPFOutput();
-} 
+}
+/* --Methode-- */
+void BRVisCalcGroup::SetFFTData()
+{
+  for(size_t i=0; i<viscalcp_.size(); i++)
+    viscalcp_[i]->SetFFTData();
+}
+/* --Methode-- */
+void BRVisCalcGroup::SetRawData()
+{
+  for(size_t i=0; i<viscalcp_.size(); i++)
+    viscalcp_[i]->SetRawData();
+}  
 /* --Methode-- */
 void BRVisCalcGroup::SetPrintLevel(int lev, uint_8 prtmodulo)

trunk/AddOn/TAcq/brviscalc.h

@@ -41 +41 @@
 
   // configuration avec donnees firmware FFT (defaut) 
+  inline void SetFFTData()  { fgdataraw_=false; } 
+  // configuration avec donnees firmware RAW  
   inline void SetRawData()  { fgdataraw_=true; } 
-  // configuration avec donnees firmware RAW (defaut) 
-  inline void SetFFTData()  { fgdataraw_=false; } 
 
   // Pour definir le rang de l'objet lors d'un traitement avec plusieurs BRVisibilityCalculator en //
@@ -163 +163 @@
   // Pour ecrire les fichiers de sortie au format PPF (defaut) 
   void SetPPFOutput();
+  // configuration avec donnees firmware FFT (defaut) 
+  void SetFFTData();  
+  // configuration avec donnees firmware RAW  
+  void SetRawData();  
+
   void SetPrintLevel(int lev=0, uint_8 prtmodulo=10);
 

trunk/AddOn/TAcq/vismfib.cc

@@ -84 +84 @@
       MemZStatus mfmask=MemZS_ProcA;
       if (par.fgdatafft_) mfmask=procg.SetMemZAction(MemZA_ProcA);
-      else mfmask=procg.SetMemZAction(MemZA_ProcB);
+      else { 
+        mfmask=procg.SetMemZAction(MemZA_ProcB);
+        procg.SetRawData();
+      }
       mmgr.SetFinalizedMask((uint_4)mfmask);
     }