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

Timestamp:

Dec 29, 2009, 12:34:19 AM (16 years ago)

Author:

ansari

Message:

Implementation possibilite calcul visibilites avec des threads en parallele, Reza 29/12/2009

File:

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

trunk/AddOn/TAcq/brproc.cc

@@ -32 +32 @@
 /* --Methode-- */
 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),
-    vpdata_(2*memgr.NbFibres())
+                                               uint_4 freq1, uint_4 freq2, uint_4 nbfreq, size_t nthr)
+  : BRBaseProcessor(memgr), paralex_(*this, nthr), nparthr_(nthr), outpath_(outpath), nmean_(nmean), 
+    numfreq1_(freq1), numfreq2_(freq2), nbinfreq_(nbfreq), vpdata_(2*memgr.NbFibres())
     // , dtfos_(outpath+"visdt.fits", Fits_Create), visdt_(dtfos_, 1024, true);
 
@@ -100 +100 @@
   }
   delete[] xnt_;
+}
+
+/* --Methode-- */
+void BRVisibilityCalculator::run()
+{
+  if (nparthr_ > 1) {
+    paralex_.SetParallelTask(*this);
+    cout << " BRVisibilityCalculator::run()/Info : starting ParallelExecutor with nThreads=" 
+         << paralex_.nThreads() << " ... " << endl;
+    paralex_.start();
+  }
+  return BRBaseProcessor::run();
 }
 
@@ -152 +164 @@
     moyfc_=moytt_=0.;
   }
+
+  if (nparthr_ > 1)  {  // Execution parallele 
+    int rcpex=paralex_.execute();
+    if (rcpex!=0)  cout << " BRVisibilityCalculator::Process() / Error Rc[paralex_.execute()]=" << rcpex << endl;
+  }
+  else {
+    sa_size_t k=0;
+    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());
+        }
+      }
+    }
+  }
+  moyfc_ += curfc_[0];
+  moytt_ += (vpaq_[0].TimeTag()-ttfirst_[0]);
+  if (fgcktt_)  CheckTimeTag();
+  totnbpaq_++;
+  return 0;
+}
+
+/* --Methode-- */
+int BRVisibilityCalculator::execute(int tid)
+{
+  sa_size_t fdelt = vismtx_.NCols()/nparthr_;
+  sa_size_t fdeb = tid*fdelt;
+  sa_size_t ffin = (tid+1)*fdelt;
+  if (fdeb<1) fdeb=1;
+  if ((ffin>vismtx_.NCols())||(tid==(nparthr_-1))) ffin=vismtx_.NCols();
   
   sa_size_t k=0;
@@ -157 +201 @@
     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++) {
+      for(sa_size_t f=fdeb; f<ffin; 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());
@@ -163 +207 @@
     }
   }
-  
-  moyfc_ += curfc_[0];
-  moytt_ += (vpaq_[0].TimeTag()-ttfirst_[0]);
-  if (fgcktt_)  CheckTimeTag();
-  totnbpaq_++;
   return 0;
 }