Changeset 3967 in Sophya for trunk/AddOn/TAcq/brviscalc.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/brviscalc.cc (modified) (5 diffs)

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)