Index: trunk/Cosmo/SimLSS/cmvobserv3d.cc
===================================================================
--- trunk/Cosmo/SimLSS/cmvobserv3d.cc	(revision 3261)
+++ trunk/Cosmo/SimLSS/cmvobserv3d.cc	(revision 3262)
@@ -100,4 +100,8 @@
 
  // --- Decodage arguments
+ if(narg>0) {
+   for(int i=0;i<narg;i++) cout<<arg[i]<<" ";
+   cout<<endl;
+ }
 
  char c;
@@ -414,8 +418,6 @@
  if(1) {
    cout<<"\n--- Check mean and variance in real space"<<endl;
-   int_8 nlowone = fluct3d.NumberOfBad(-1.,1e+200);
+   fluct3d.NumberOfBad(-1.,1e+200);
    nm = fluct3d.MeanSigma2(rm,rs2);
-   cout<<"rgen:("<<nm<<") Mean = "<<rm<<", Sigma^2 = "
-       <<rs2<<" -> "<<sqrt(rs2)<<",  n(<-1)="<<nlowone<<endl;
    PrtTim(">>>> End Check mean and variance in real space");
  }
@@ -424,6 +426,5 @@
    cout<<"\n--- Check variance sigmaR in real space"<<endl;
    double varr;
-   int_8 nvarr = fluct3d.VarianceFrReal(R,varr);
-   cout<<"R="<<R<<" : sigmaR^2="<<varr<<" -> "<<sqrt(varr)<<",   n="<<nvarr<<endl;
+   fluct3d.VarianceFrReal(R,varr);
    PrtTim(">>>> End Check variance sigmaR in real space");
  }
@@ -432,40 +433,21 @@
  cout<<endl<<"\n--- Converting fluctuations into mass"<<endl;
  fluct3d.TurnFluct2Mass();
- nm = fluct3d.MeanSigma2(rm,rs2);
- cout<<"1+rgen: ("<<nm<<") Mean = "<<rm<<", Sigma^2 = "
-     <<rs2<<" -> "<<sqrt(rs2)<<endl;
- nm = fluct3d.MeanSigma2(rm,rs2,0.,1e200,true,0.);
- cout<<"1+rgen with_neg_a_zero: ("<<nm<<") Mean = "<<rm<<", Sigma^2 = "
-     <<rs2<<" -> "<<sqrt(rs2)<<endl;
+   nm = fluct3d.MeanSigma2(rm,rs2);
  PrtTim(">>>> End Converting fluctuations into mass");
 
  cout<<"\n--- Converting mass into galaxy number"<<endl;
  rm = fluct3d.TurnMass2MeanNumber(ngal_by_mpc3);
- cout<<rm<<" galaxies put into survey"<<endl;
- nm = fluct3d.MeanSigma2(rm,rs2,0.);
- cout<<"galaxy mass: ("<<nm<<") Mean = "<<rm<<", Sigma^2 = "
-     <<rs2<<" -> "<<sqrt(rs2)<<endl;
- nm = fluct3d.MeanSigma2(rm,rs2,0.,1e200,true,0.);
- cout<<"galaxy mass with_neg_a_zero: ("<<nm<<") Mean = "<<rm<<", Sigma^2 = "
-     <<rs2<<" -> "<<sqrt(rs2)<<endl;
- PrtTim(">>>> End Converting mass into galaxy number");
+   nm = fluct3d.MeanSigma2(rm,rs2,0.,1e200);
+   nm = fluct3d.MeanSigma2(rm,rs2,0.,1e200,true,0.);
+  PrtTim(">>>> End Converting mass into galaxy number");
 
  cout<<"\n--- Set negative and null pixels to BAD"<<endl;
  nm = fluct3d.SetToVal(0.,1e+200,-999.);
- cout<<nm<<" negative in survey set to BAD"<<endl;
- nm = fluct3d.MeanSigma2(rm,rs2,-998.);
- cout<<"galaxy mass: ("<<nm<<") Mean = "<<rm<<", Sigma^2 = "
-     <<rs2<<" -> "<<sqrt(rs2)<<endl;
  PrtTim(">>>> End Set negative pixels to BAD etc...");
 
  cout<<"\n--- Apply poisson on galaxy number"<<endl;
- nm = fluct3d.ApplyPoisson();
- cout<<nm<<" galaxies into survey after poisson"<<endl;
- nm = fluct3d.MeanSigma2(rm,rs2,-998.);
- cout<<"galaxy number: ("<<nm<<") Mean = "<<rm<<", Sigma^2 = "
-     <<rs2<<" -> "<<sqrt(rs2)<<endl;
- nm = fluct3d.MeanSigma2(rm,rs2,0.,1e200,true,0.);
- cout<<"galaxy number with_neg_a_zero: ("<<nm<<") Mean = "<<rm<<", Sigma^2 = "
-     <<rs2<<" -> "<<sqrt(rs2)<<endl;
+ fluct3d.ApplyPoisson();
+   nm = fluct3d.MeanSigma2(rm,rs2,-998.,1e200);
+   nm = fluct3d.MeanSigma2(rm,rs2,0.,1e200,true,0.);
  PrtTim(">>>> End Apply poisson on galaxy number");
 
@@ -483,19 +465,11 @@
  double mhi = fluct3d.TurnNGal2Mass(tirhmdndm,true);
  cout<<mhi<<" MSol in survey / "<<mass_by_mpc3*fluct3d.GetVol()<<endl;
- nm = fluct3d.MeanSigma2(rm,rs2,-998.);
- cout<<"HI mass: ("<<nm<<") Mean = "<<rm<<", Sigma^2 = "
-     <<rs2<<" -> "<<sqrt(rs2)<<endl;
- cout<<"Equivalent: "<<rm*nm/fluct3d.NPix()<<" Msol / pixels"<<endl;
- nm = fluct3d.MeanSigma2(rm,rs2,0.,1e200,true,0.);
- cout<<"HI mass with_neg_a_zero: ("<<nm<<") Mean = "<<rm<<", Sigma^2 = "
-     <<rs2<<" -> "<<sqrt(rs2)<<endl;
+   nm = fluct3d.MeanSigma2(rm,rs2,-998.,1e200);
+   cout<<"Equivalent: "<<rm*nm/fluct3d.NPix()<<" Msol / pixels"<<endl;
+   nm = fluct3d.MeanSigma2(rm,rs2,0.,1e200,true,0.);
  PrtTim(">>>> End Convert Galaxy number to HI mass");
 
  cout<<"\n--- Set BAD pixels to Zero"<<endl;
  nm = fluct3d.SetToVal(-998.,1e+200,0.);
- cout<<nm<<" BAD in survey set to zero"<<endl;
- nm = fluct3d.MeanSigma2(rm,rs2);
- cout<<"galaxy: ("<<nm<<") Mean = "<<rm<<", Sigma^2 = "
-     <<rs2<<" -> "<<sqrt(rs2)<<endl;
  PrtTim(">>>> End Set BAD pixels to Zero etc...");
 
@@ -513,7 +487,5 @@
        <<" , powlaw="<<powlaw_agn<<endl;
    fluct3d.AddAGN(lfjy_agn,lsigma_agn,powlaw_agn);
-   nm = fluct3d.MeanSigma2(rm,rs2);
-   cout<<"HI mass with AGN: ("<<nm<<") Mean = "<<rm<<", Sigma^2 = "
-       <<rs2<<" -> "<<sqrt(rs2)<<endl;
+     nm = fluct3d.MeanSigma2(rm,rs2);
    PrtTim(">>>> End Add AGN");
  }
@@ -522,7 +494,5 @@
    cout<<"\n--- Add noise to HI Flux snoise="<<snoise<<endl;
    fluct3d.AddNoise2Real(snoise);
-   nm = fluct3d.MeanSigma2(rm,rs2);
-   cout<<"HI mass with noise: ("<<nm<<") Mean = "<<rm<<", Sigma^2 = "
-       <<rs2<<" -> "<<sqrt(rs2)<<endl;
+     nm = fluct3d.MeanSigma2(rm,rs2);
    PrtTim(">>>> End Add noise");
  }
