Changeset 3920 in Sophya for trunk/AddOn/TAcq/racquproc.cc

Timestamp:

Dec 3, 2010, 4:51:54 AM (15 years ago)

Author:

ansari

Message:

Correction bug ds MonitorProc et ajout controle remplissage DataTable des visibiltes par BRVisibilityCalculator , cmv+Reza 02/12/2010

File:

• trunk/AddOn/TAcq/racquproc.cc (modified) (7 diffs)

trunk/AddOn/TAcq/racquproc.cc

@@ -181 +181 @@
   Histo* phexp[2*MAXNBFIB];
   TMatrix<r_4>* psatur[2*MAXNBFIB];  
+  TVector<uint_4>* pvsatfreq[2*MAXNBFIB];
   for(int ifib=0; ifib<2*MAXNBFIB; ifib++) {
     phist[ifib]=NULL; ph2[ifib]=NULL; phexp[ifib]=NULL; psatur[ifib]=NULL;
@@ -190 +191 @@
       phexp[lc] = new Histo(-128.5,+128.5,257);
       psatur[lc] = new TMatrix<r_4>(3,3);
+      pvsatfreq[lc] = new TVector<uint_4>(spectre_.NCols());
       *psatur[lc] = 0.;
     }
@@ -254 +256 @@
             else if (tbcp[j].imagI()==127) sii=1;
             (*psatur[lc])(sir+1,sii+1)+=1.;
-
+            if ((sir!=0)||(sii!=0))  (*pvsatfreq[lc])(j)+=1;
             spectre_(lc,j) += Zmod2(tbcp[j]);
           }
@@ -271 +273 @@
             else if (tbcp[j].imagI()==127) sii=1;
             (*psatur[lc])(sir+1,sii+1)+=1.;
+            if ((sir!=0)||(sii!=0))  (*pvsatfreq[lc])(j)+=1;
 
             spectre_(lc,j) += Zmod2(tbcp[j]);
@@ -333 +336 @@
           sprintf(buftag,"saturV%d",(int)lc);
           po << PPFNameTag(buftag) << (*psatur[lc]);
-          cout << " Matrice Saturation Voie[" << lc << "] : " <<  (*psatur[lc]);
-          if (nzm_[lc]>0)  { 
-            (*psatur[lc]) /= ((r_4)nzm_[lc]*0.01);  
-            cout << " Matrice Saturation Pourcentage Voie[" << lc << "] : " <<  (*psatur[lc]);
-          }
           (*psatur[lc])=0.;
+          sprintf(buftag,"satfreqV%d",(int)lc);
+          po << PPFNameTag(buftag) << (*pvsatfreq[lc]);
+          (*pvsatfreq[lc])=0;
         }
         nzm_[lc]=0;
@@ -389 +390 @@
         sprintf(buftag,"saturV%d",(int)lc);
         po << PPFNameTag(buftag) << (*psatur[lc]);
-        cout << " Matrice Saturation Voie[" << lc << "] : " <<  (*psatur[lc]);
-        if (nzm_[lc]>0)  { 
-          (*psatur[lc]) /= ((r_4)nzm_[lc]*0.01);  
-          cout << " Matrice Saturation Pourcentage Voie[" << lc << "] : " <<  (*psatur[lc]);
-        }
-        (*psatur[lc])=0.;
+        sprintf(buftag,"satfreqV%d",(int)lc);
+        po << PPFNameTag(buftag) << (*pvsatfreq[lc]);
+        delete psatur[lc]; 
+        delete pvsatfreq[lc];
       }
       nzm_[lc]=0;
@@ -413 +412 @@
          << " -> " << fracsame << " % )" << endl;
   }
-
-  for(sa_size_t lc=0; lc<2*memgr.NbFibres(); lc++) {
-    if (phist[lc]) delete phist[lc];
-    if (ph2[lc]) delete ph2[lc]; 
-    if (phexp[lc]) delete phexp[lc]; 
-    if (psatur[lc]) delete psatur[lc]; 
-  }
-
   return 0;
 }