Changeset 3881 in Sophya

Timestamp:

Sep 20, 2010, 4:48:38 PM (15 years ago)

Author:

ansari

Message:

Ajout calcul sigma des spectres ds BRMeanSpecCalculator, Reza 20/09/2010

Location:

trunk/AddOn/TAcq

Files:

• brproc.cc (modified) (4 diffs)
• brproc.h (modified) (1 diff)

trunk/AddOn/TAcq/brproc.cc

@@ -42 +42 @@
   setNameId("meanSpecCalc",1);
   BRPaquet paq(memgr_.PaqSize());
-  if (fgsinglechannel_) 
+  if (fgsinglechannel_) {
     mspecmtx_.SetSize(memgr_.NbFibres(), paq.DataSize()/2); 
-  else
+    sigspecmtx_.SetSize(memgr_.NbFibres(), paq.DataSize()/2); 
+  }
+  else {
     mspecmtx_.SetSize(2*memgr_.NbFibres(), paq.DataSize()/4); 
-  mspecmtx_=(r_8)(0.);
+    sigspecmtx_.SetSize(2*memgr_.NbFibres(), paq.DataSize()/4); 
+  }
+  mspecmtx_=(r_4)(0.);
+  sigspecmtx_=(r_4)(0.);
   numfile_=0;
   nbpaq4mean_=0;
@@ -79 +84 @@
       }
       TVector< r_4 > spec = mspecmtx_.Row(i); 
-      for(sa_size_t f=1; f<spec.Size(); f++)  spec(f) += zp[f].module2F();
+      TVector< r_4 > sspec = sigspecmtx_.Row(i); 
+      for(sa_size_t f=1; f<spec.Size(); f++) {
+        r_4 m2zf=zp[f].module2F();;
+        spec(f) += m2zf;
+        sspec(f) += m2zf*m2zf;
+      }
     }
   }
@@ -93 +103 @@
       }
       TVector< r_4 > spec = mspecmtx_.Row(i); 
-      for(sa_size_t f=1; f<spec.Size(); f++)  spec(f) += Zmod2(zp[f]);
-      
+      TVector< r_4 > sspec = sigspecmtx_.Row(i); 
+      for(sa_size_t f=1; f<spec.Size(); f++)  {
+        r_4 m2zf=Zmod2(zp[f]);
+        spec(f) += m2zf;
+        sspec(f) += (m2zf*m2zf);        
+      }     
     }
   }
@@ -106 +120 @@
   mspecmtx_.Info()["NPAQSUM"] = nbpaq4mean_;
   mspecmtx_ /= (double)nbpaq4mean_;
-  char nfile[32];
+  sigspecmtx_.Info()["NPAQSUM"] = nbpaq4mean_;
+  sigspecmtx_ /= (double)nbpaq4mean_;
+  sigspecmtx_ -= (mspecmtx_ && mspecmtx_);  // Mean(X^2) - [ Mean(X) ]^2
+  char nfile[64];
+  string flnm;
+  {
   sprintf(nfile,"mspecmtx%d.ppf",numfile_);
-  string flnm=outpath_+nfile;
+  flnm=outpath_+nfile;
   POutPersist po(flnm);
   po << mspecmtx_;
+  }
+  {
+  sprintf(nfile,"sigspecmtx%d.ppf",numfile_);
+  flnm=outpath_+nfile;
+  POutPersist po(flnm);
+  po << sigspecmtx_;
+  }
   cout << numfile_ << "-BRMeanSpecCalculator::SaveSpectra() NPaqProc="
-       << totnbpaq_ << "  -> Mean spectra Matrix in " << flnm << endl;
+       << totnbpaq_ << "  -> Mean/Sig spectra Matrix in " << flnm << " /sigspec...ppf" << endl;
   numfile_++;  nbpaq4mean_=0;
-  mspecmtx_ = (r_8)(0.);
+  mspecmtx_ = (r_4)(0.);
+  sigspecmtx_ = (r_4)(0.);
   return;
 }

trunk/AddOn/TAcq/brproc.h

@@ -52 +52 @@
   uint_8 totnbpaq_;
   TMatrix< r_4 > mspecmtx_;    // Matrice des spectres moyennees 
+  TMatrix< r_4 > sigspecmtx_;    // Matrice des sigmas des spectres  
+
 };