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

Timestamp:

Dec 1, 2009, 7:01:36 PM (16 years ago)

Author:

ansari

Message:

petites optimisations et corrections, Reza 01/12/2009

File:

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

trunk/AddOn/TAcq/brproc.cc

@@ -33 +33 @@
 BRVisibilityCalculator::BRVisibilityCalculator(RAcqMemZoneMgr& memgr, string outpath, uint_4 nmean, 
                                                uint_4 freq1, uint_4 freq2, uint_4 nbfreq)
-  : BRBaseProcessor(memgr), outpath_(outpath), nmean_(nmean), numfreq1_(freq1), numfreq2_(freq2), nbinfreq_(nbfreq)
+  : BRBaseProcessor(memgr), outpath_(outpath), nmean_(nmean), numfreq1_(freq1), numfreq2_(freq2), nbinfreq_(nbfreq),
+    vpdata_(2*memgr.NbFibres())
     // , dtfos_(outpath+"visdt.fits", Fits_Create), visdt_(dtfos_, 1024, true);
 
@@ -42 +43 @@
   chanum_.SetSize(vismtx_.NRows());
   sa_size_t k=0;
+  for(size_t i=0; i<2*memgr_.NbFibres(); i++)  vpdata_[i]=NULL;
   for(size_t i=0; i<2*memgr_.NbFibres(); i++) {
     for(size_t j=i; j<2*memgr_.NbFibres(); j++) {
@@ -107 +109 @@
   */
   // 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());
+  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) {
@@ -132 +134 @@
   
   sa_size_t k=0;
-  for(size_t i=0; i<vpdata.size(); i++) {
-    for(size_t j=i; j<vpdata.size(); j++) {
+  for(size_t i=0; i<vpdata_.size(); i++) {
+    for(size_t j=i; j<vpdata_.size(); j++) {
       TVector< complex<r_4> > vis = vismtx_.Row(k);   k++;
       for(sa_size_t f=1; f<vis.Size(); f++) {
-        vis(f) += complex<r_4>((r_4)vpdata[i][f].realB(), (r_4)vpdata[i][f].imagB()) * 
-          complex<r_4>((r_4)vpdata[j][f].realB(), -(r_4)vpdata[j][f].imagB());
+        vis(f) += complex<r_4>((r_4)vpdata_[i][f].realB(), (r_4)vpdata_[i][f].imagB()) * 
+          complex<r_4>((r_4)vpdata_[j][f].realB(), -(r_4)vpdata_[j][f].imagB());
       }
     }