Changeset 3780 in Sophya for trunk/AddOn

Timestamp:

May 18, 2010, 9:57:17 PM (15 years ago)

Author:

ansari

Message:

Passage a 6 proc/thread max ds BRVisibilityCalculator , Reza 18/05/2010

Location:

trunk/AddOn/TAcq

Files:

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

trunk/AddOn/TAcq/brproc.cc

@@ -106 +106 @@
 void BRVisibilityCalculator::DefineRank(uint_4 nbc, uint_4 cid)
 {
-  if ((nbc>4)||(cid>=nbc)) 
-    throw ParmError("BRVisibilityCalculator::DefineRank() NbCalc > 4 !");
+  if ((nbc>6)||(cid>=nbc)) 
+    throw ParmError("BRVisibilityCalculator::DefineRank() NbCalc > 6 !");
   nbcalc_=nbc;
   calcid_=cid;
@@ -117 +117 @@
     else 
       SelectPairs(calcid_*npairs, npairs);
-    MemZaction mmzas[4]={MemZA_ProcA,MemZA_ProcB,MemZA_ProcC,MemZA_ProcD};
+    MemZaction mmzas[6]={MemZA_ProcA,MemZA_ProcB,MemZA_ProcC,MemZA_ProcD,MemZA_ProcE,MemZA_ProcF};
     SetMemZAction(mmzas[calcid_]);
     setNameId("viscalc_grp", calcid_); 
@@ -476 +476 @@
   : tm_(false)
 {
-  if ((nbcalc<1)||(nbcalc>4)) 
-    throw ParmError("BRVisCalcGroup::BRVisCalcGroup NbCalc > 4 !");
+  if ((nbcalc<1)||(nbcalc>6)) 
+    throw ParmError("BRVisCalcGroup::BRVisCalcGroup NbCalc > 6 !");
   for(size_t i=0; i<nbcalc; i++) {
     BRVisibilityCalculator * viscp=new BRVisibilityCalculator(memgr, outpath, nmean, nthr);

trunk/AddOn/TAcq/vismfib.cc

@@ -64 +64 @@
       else if (par.nbcalgrp_==4) 
         mmgr.SetFinalizedMask((uint_4)MemZS_ProcA|(uint_4)MemZS_ProcB|(uint_4)MemZS_ProcC|(uint_4)MemZS_ProcD);
+      else if (par.nbcalgrp_==5) 
+        mmgr.SetFinalizedMask((uint_4)MemZS_ProcA|(uint_4)MemZS_ProcB|(uint_4)MemZS_ProcC|(uint_4)MemZS_ProcD|(uint_4)MemZS_ProcE);
+      else if (par.nbcalgrp_==6) 
+        mmgr.SetFinalizedMask((uint_4)MemZS_ProcA|(uint_4)MemZS_ProcB|(uint_4)MemZS_ProcC|
+                              (uint_4)MemZS_ProcD|(uint_4)MemZS_ProcE|(uint_4)MemZS_ProcF);
       else mmgr.SetFinalizedMask((uint_4)MemZS_ProcA);  
     }