Changeset 3261 in Sophya for trunk/Cosmo/SimLSS/genefluct3d.cc

Timestamp:

Jun 4, 2007, 7:02:03 PM (18 years ago)

Author:

cmv

Message:

add sigma computation with bad pixel cmv 04/06/2007

File:

• trunk/Cosmo/SimLSS/genefluct3d.cc (modified) (4 diffs)

trunk/Cosmo/SimLSS/genefluct3d.cc

@@ -854 +854 @@
 }
 
-int_8 GeneFluct3D::MeanSigma2(double& rm,double& rs2,double vmin,double vmax)
-// mean,sigma^2 pour pixels avec valeurs ]vmin,vmax[ extremites exclues
-//   -> mean and sigma^2 are NOT computed with pixels values vmin and vmax
-{
+int_8 GeneFluct3D::MeanSigma2(double& rm,double& rs2,double vmin,double vmax
+                             ,bool useout,double vout)
+// Calcul de mean,sigma2 dans le cube reel avec valeurs ]vmin,vmax[ extremites exclues
+// useout = false: ne pas utiliser les pixels hors limites pour calculer mean,sigma2
+//          true : utiliser les pixels hors limites pour calculer mean,sigma2
+//                 en remplacant leurs valeurs par "vout"
+{
+ bool tstval = (vmax>vmin)? true: false;
+ if(lp_>0) {
+   cout<<"--- MeanSigma2: ";
+   if(tstval) cout<<"range=]"<<vmin<<","<<vmax<<"[";
+   if(useout) cout<<", useout="<<useout<<" vout="<<vout;
+   cout<<endl;
+ }
  check_array_alloc();
 
@@ -866 +876 @@
    int_8 ip = IndexR(i,j,l);
    double v = data_[ip];
-   if(v<=vmin || v>=vmax) continue;
+   if(tstval) {
+     if(v<=vmin || v>=vmax) {if(useout) v=vout; else continue;}
+   }
    rm += v;
    rs2 += v*v;
@@ -877 +889 @@
  }
 
+ if(lp_>0) cout<<"  n="<<n<<" m="<<rm<<" s2="<<rs2<<" s="<<sqrt(fabs(rs2))<<endl;
+
  return n;
 }
@@ -882 +896 @@
 int_8 GeneFluct3D::SetToVal(double vmin, double vmax,double val0)
 // set to "val0" if out of range ]vmin,vmax[ extremites exclues
-//     ->  vmin and vmax are set to val0
-{
+// cad set to "val0" if in [vmin,vmax] -> vmin and vmax are set to val0
+{
+ if(lp_>0) cout<<"--- SetToVal set to="<<val0
+               <<" when in range=["<<vmin<<","<<vmax<<"]"<<endl;
  check_array_alloc();