Changeset 3776 in Sophya for trunk/AddOn/TAcq/vismfib.cc

Timestamp:

May 18, 2010, 10:22:10 AM (15 years ago)

Author:

ansari

Message:

Ajout classes / modification pour permettre le calcul des visibilites ave plusieurs objets BRVisibilityCalculator s'executant en parallele, Reza 18/05/2010

File:

• trunk/AddOn/TAcq/vismfib.cc (modified) (2 diffs)

trunk/AddOn/TAcq/vismfib.cc

@@ -57 +57 @@
     RAcqMemZoneMgr mmgr(par.nzones_, par.dirlist_.size(), par.npaqinzone_, par.paqsize_);
     if (par.action_ == "cube3d")  mmgr.SetFinalizedMask((uint_4)MemZS_Saved);
-    else  mmgr.SetFinalizedMask((uint_4)MemZS_ProcA);
-
+    else  {
+      if (par.nbcalgrp_==2) 
+        mmgr.SetFinalizedMask((uint_4)MemZS_ProcA|(uint_4)MemZS_ProcB);
+      else if (par.nbcalgrp_==3) 
+        mmgr.SetFinalizedMask((uint_4)MemZS_ProcA|(uint_4)MemZS_ProcB|(uint_4)MemZS_ProcC);
+      else if (par.nbcalgrp_==4) 
+        mmgr.SetFinalizedMask((uint_4)MemZS_ProcA|(uint_4)MemZS_ProcB|(uint_4)MemZS_ProcC|(uint_4)MemZS_ProcD);
+      else mmgr.SetFinalizedMask((uint_4)MemZS_ProcA);  
+    }
     BRMultiFitsReader reader(mmgr, par.dirlist_, true, par.imin_, par.imax_, par.istep_);
     reader.SetPrintLevel(par.prtlevel_);
 
-    BRVisibilityCalculator proc(mmgr, par.outpath_, par.nmean_, par.freqmin_, par.freqmax_, 
-                                par.nbinfreq_, par.nthreads_);
-    if (par.action_ == "viscktt")  proc.ActivateTimeTagCheck(par.TotalNPaquets());
+    /*    BRVisibilityCalculator proc(mmgr, par.outpath_, par.nmean_, par.nthreads_);
+    proc.SelectFreqBinning(par.freqmin_, par.freqmax_, par.nbinfreq_);  */
+    BRVisCalcGroup procg(par.nbcalgrp_, mmgr, par.outpath_, par.nmean_, par.nthreads_);
+    procg.SelectFreqBinning(par.freqmin_, par.freqmax_, par.nbinfreq_);
+
+    if (par.action_ == "viscktt")  procg.ActivateTimeTagCheck(par.TotalNPaquets());
     BRMeanSpecCalculator procms(mmgr, par.outpath_, par.nmean_);
+
     FitsCubeWriter wrt(mmgr, par.outpath_, par.nbloc_);
     //    BRBaseProcessor proc(mmgr);
@@ -73 +84 @@
     if (par.action_ == "cube3d")   wrt.start();
     else if (par.action_ == "mspec")   procms.start();
-    else  proc.start();
+    else  procg.start();
     usleep(200000);
     reader.join();
     if (par.action_ == "cube3d")  wrt.join();
     else if (par.action_ == "mspec")  procms.join();
-    else proc.join();
+    else procg.join();
     mmgr.Print(cout);
     cout << resu ;