Changeset 3689 in Sophya for trunk/AddOn

Timestamp:

Nov 29, 2009, 12:49:25 AM (16 years ago)

Author:

ansari

Message:

Suite devel. BRVisibilityCalculator::Process() - Reza 28/11/2009

Location:

trunk/AddOn/TAcq

Files:

• brproc.cc (modified) (3 diffs)
• brproc.h (modified) (1 diff)

trunk/AddOn/TAcq/brproc.cc

@@ -40 +40 @@
     vnpaqm_.push_back(0);
   }
+  
+  BRPaquet paq(memgr_.PaqSize());
+
+  for(size_t i=0; i<2*memgr_.NbFibres(); i++) 
+    for(size_t j=i; j<2*memgr_.NbFibres(); j++) 
+      vvis_.push_back( TVector< complex<r_4> >(paq.DataSize()/4) );
+
   cout << " BRVisibilityCalculator/Info NMean= " << nmean_ << endl;
   totnbpaq_ = 0;
@@ -52 +59 @@
 int BRVisibilityCalculator::Process()
 {
+  /*
   if (totnbpaq_%nmean_ == 0) {
     cout << " BRVisibilityCalculator::Process() " << totnbpaq_ << " FrameCnt=" ;
@@ -62 +70 @@
     cout << endl;
   }
+  */
+  vector<TwoByteComplex*> vpdata;
+  vector< TVector< complex<r_4> > > vvis;
+
+  /*
+  for(size_t fib=0; fib<(size_t)memgr_.NbFibres(); fib++) {
+    vpdata.push_back(vpaq_[fib].Data1C());
+    vpdata.push_back(vpaq_[fib].Data2C());
+  }
+  */
+  // On s'arrange pour mettre les canaux dans l'ordre pour les observations de Pittsburgh Nov 2009
+  for(size_t fib=0; fib<(size_t)memgr_.NbFibres(); fib++) 
+    vpdata.push_back(vpaq_[fib].Data1C());
+  for(size_t fib=0; fib<(size_t)memgr_.NbFibres(); fib++) 
+    vpdata.push_back(vpaq_[fib].Data2C());
+
+  if (totnbpaq_%nmean_ == 0) 
+    for(size_t k=0; k<vvis_.size(); k++)   vvis_[k] = complex<r_4>((r_4)0.,(r_4)0.);
+    
+  for(size_t i=0; i<vvis_.size(); i++) {
+    for(sa_size_t f=1; f<vvis_[i].Size(); f++) {
+      vvis_[i](f) += complex<r_4>((r_4)vpdata[0][f].realB(), (r_4)(r_4)vpdata[0][f].imagB());
+    }
+  }
+
   totnbpaq_++;
   return 0;

trunk/AddOn/TAcq/brproc.h

@@ -39 +39 @@
   vector<uint_8> vtimetag_;
   vector<uint_8> vnpaqm_;
+  
+  vector<TwoByteComplex*> vpdata_;
+  vector< TVector< complex<r_4> > > vvis_;
+
   uint_4 totnbpaq_;
 };