Changeset 3696 in Sophya for trunk/AddOn/TAcq/brproc.cc

Timestamp:

Dec 3, 2009, 12:17:04 AM (16 years ago)

Author:

ansari

Message:

correction et petites amelioration - Reza 03/12/2009

File:

• trunk/AddOn/TAcq/brproc.cc (modified) (4 diffs)

trunk/AddOn/TAcq/brproc.cc

@@ -50 +50 @@
   }
   //  visdt_.AddFloatColumn("mfc");
-  visdt_.AddFloatColumn("mfc");
-  visdt_.AddFloatColumn("mtt");
+  visdt_.AddDoubleColumn("mfc");
+  visdt_.AddDoubleColumn("mtt");
   visdt_.AddIntegerColumn("jfreq");
   visdt_.AddIntegerColumn("numch");
@@ -101 +101 @@
 int BRVisibilityCalculator::Process()
 {
-  vector<TwoByteComplex*> vpdata;
-  /*
-  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_[2*fib] = vpaq_[fib].Data1C();
     vpdata_[2*fib+1] = vpaq_[fib].Data2C();
   }
-
+  
   if (totnbpaq_%nmean_ == 0) {
     if (totnbpaq_ > 0) {
@@ -143 +136 @@
     }
   }
-
+  
   moyfc_ += curfc_[0];
   moytt_ += vpaq_[0].TimeTag();
@@ -172 +165 @@
         r_4 moyimag=0.;
         for(sa_size_t jjf=jf; jjf<jf+djf_; jjf++) {
-          moyreal+=vismtx_(rv,jf).real();
-          moyimag+=vismtx_(rv,jf).imag();
+          moyreal+=vismtx_(rv,jjf).real();
+          moyimag+=vismtx_(rv,jjf).imag();
         }
         xnt_[2]=jf+djf_/2;