Changeset 3246 in Sophya

Timestamp:

May 15, 2007, 10:39:59 AM (18 years ago)

Author:

cmv

Message:

modifs ... cmv 15/05/2007

Location:

trunk/Cosmo/SimLSS

Files:

• cmvconcherr.cc (modified) (1 diff)
• cmvdefsurv.cc (modified) (1 diff)
• cmvobserv3d.cc (modified) (1 diff)
• cmvtstsch.cc (modified) (3 diffs)
• cmvtvarspec.cc (modified) (2 diffs)
• pkspectrum.cc (modified) (1 diff)

trunk/Cosmo/SimLSS/cmvconcherr.cc

@@ -57 +57 @@
  cout<<"nameh = "<<nameh
      <<" , number of file to be read = "<<ppfname.size()
-     <<" , write_type="<<Write_Type<<endl;
+     <<" , write_type="<<Write_Type<<" , cov="<<Do_Cov<<endl;
 
  // --- Quel type d'objet ?

trunk/Cosmo/SimLSS/cmvdefsurv.cc

@@ -366 +366 @@
  cout<<"Observation flux density limit: "<<slim<<" Jy (in 1 lobe)"<<endl;
 
- slim = slim * sqrt(nlobes);
- cout<<"Observation flux density limit: "<<slim<<" Jy (in "<<nlobes<<" lobes)"<<endl;
+ double slim_nl = slim * sqrt(nlobes);
+ cout<<"Observation flux density limit: "<<slim_nl<<" Jy (in "<<nlobes<<" lobes)"<<endl;
 
  double SsN = ssig/slim;
- cout<<"\nSignal to noise ratio = "<<SsN<<endl;
+ cout<<"\nSignal to noise ratio = "<<SsN<<" (1 lobe)"<<endl;
+ double SsN_nl = ssig/slim_nl;
+ cout<<"\nSignal to noise ratio = "<<SsN_nl<<" ("<<nlobes<<" lobes)"<<endl;
 
  double smass = mhiref/ssig*slim;

trunk/Cosmo/SimLSS/cmvobserv3d.cc

@@ -166 +166 @@
      <<", npt="<<npt<<endl;
  cout<<"R="<<R<<" Rg="<<Rg<<" Mpc, sigmaR="<<sigmaR<<endl;
- cout<<"nstar= "<<nstar<<"  mstar="<<mstar<<"  alpa="<<alpha<<endl;
+ cout<<"nstar= "<<nstar<<"  mstar="<<mstar<<"  alpha="<<alpha<<endl;
  cout<<"schmin="<<schmin<<" ("<<lschmin
      <<"), schmax="<<schmax<<" ("<<lschmax<<") Msol"

trunk/Cosmo/SimLSS/cmvtstsch.cc

@@ -39 +39 @@
  double mstar = pow(10.,9.8/(h75*h75));  // MSol
  double alpha = -1.37;
- cout<<"nstar= "<<nstar<<"  mstar="<<mstar<<"  alpha="<<alpha<<endl;
+ cout<<"h75= "<<h75<<" nstar= "<<nstar<<"  mstar="<<mstar<<"  alpha="<<alpha<<endl;
 
  double xmin=1e6, xmax=1e12;
@@ -84 +84 @@
 
  Schechter sch(nstar,mstar,alpha);
- cout<<"sch(mstar) = "<<sch(mstar)<<" /Mpc^3/Msol"<<endl;
 
  InitTim();
@@ -90 +89 @@
  //-------dn/dm
  cout<<endl;
+ cout<<"sch(mstar) = "<<sch(mstar)<<" /Mpc^3/Msol"<<endl;
  sch.SetOutValue(0);
  for(int i=0;i<=5;i++) {

trunk/Cosmo/SimLSS/cmvtvarspec.cc

@@ -13 +13 @@
 #include "pkspectrum.h"
 
-// cmvtvarspec [zref,R]
 void usage(void);
 void usage(void)
@@ -117 +116 @@
  
  //----
-  cout<<endl<<"Filtrage 1 (integrale du sppectre)"<<endl;
+  cout<<endl<<"Filtrage 1 (integrale du spectre)"<<endl;
  VarianceSpectrum varpk_int(pkz,2);
  double kfind_int = varpk_int.FindMaximum(Rg,kmin,kmax,eps);

trunk/Cosmo/SimLSS/pkspectrum.cc

@@ -71 +71 @@
   nobaryon_ = false;
   O0_ = Oc_ + Ob_;
-    if(lp) cout<<"Omatter="<<O0_<<" Ocdm="<<Oc_<<" Ob="<<Ob_<<endl;
+  if(lp) cout<<"h100="<<h_<<" Omatter="<<O0_<<" Ocdm="<<Oc_<<" Ob="<<Ob_<<endl;
 
   double H0 = 100. * h_, h2 = h_*h_;