Changeset 3351 in Sophya for trunk/Cosmo/SimLSS/cmvdefsurv.cc

Timestamp:

Oct 12, 2007, 7:45:12 PM (18 years ago)

Author:

cmv

Message:

suite des modifs importantes , cmv 12/10/2007

File:

• trunk/Cosmo/SimLSS/cmvdefsurv.cc (modified) (5 diffs)

trunk/Cosmo/SimLSS/cmvdefsurv.cc

@@ -41 +41 @@
       <<"   \'M\' : en distance (pour X-Y-Z) : resolution et largeur Mpc"<<endl
       <<"----------------"<<endl
-      <<" -K k,pk,dk : k(Mpc^-1) dk(Mpc^-1) pk(a z=0 en Mpc^-3) pour estimer la variance cosmique"<<endl
+      <<" -K k,dk,pk : k(Mpc^-1) dk(Mpc^-1) pk(a z=0 en Mpc^-3) pour estimer la variance cosmique"<<endl
       <<"----------------"<<endl
       <<" -O surf,tobs : surface effective (m^2) et temps d\'observation (s)"<<endl
@@ -146 +146 @@
     break;
   case 'K' :
-    sscanf(optarg,"%lf,%lf,%lf",&kcosm,&pkcosm,&dkcosm);
+    sscanf(optarg,"%lf,%lf,%lf",&kcosm,&dkcosm,&pkcosm);
     break;
   case 'h' :
@@ -252 +252 @@
      <<"  dy = "<<dy<<" Mpc,  tylarg = "<<tylarg<<" Mpc com, ny = "<<ny<<" pix"<<endl;
  cout<<"---- Npix total = "<<Npix<<" -> "<<Npix*sizeof(double)/1.e6<<" Mo"<<endl;
+ cout<<"     Volume pixel = "<<dx*dy*dz<<" Mpc^3"<<endl;
+ cout<<"     Volume total = "<<Npix*dx*dy*dz<<" Mpc^3"<<endl;
 
  // --- Cosmolographie Transverse
@@ -308 +310 @@
  // --- Variance cosmique
  //                      cosmique                    poisson
- // (sigma/P)^2 = 2*(2Pi)^3 / (4Pi dk Vsurvey) * [(1+n*P)/(n*P)]^2
+ // (sigma/P)^2 = 2*(2Pi)^3 / (4Pi k^2 dk Vsurvey) * [(1+n*P)/(n*P)]^2
  // nombre de mode = 1/2 * Vsurvey/(2Pi)^3 * 4Pi*k^2*dk
  if(kcosm>0. && pkcosm>0.) {
@@ -322 +324 @@
    dk.push_back(dk_x); dk.push_back(dk_y); dk.push_back(dk_z);
    for(int i=0;i<(int)dk.size();i++) { // la variance cosmique pure
-     double vcosm = sqrt( 2.*pow(2.*M_PI,3.)/(4.*M_PI*dk[i]*vol) );
+     double vcosm = sqrt( 2.*pow(2.*M_PI,3.)/(4.*M_PI*pow(kcosm,2.)*dk[i]*vol) );
      double nmode = 0.5*vol/pow(2.*M_PI,3.) * 4.*M_PI*pow(kcosm,2.)*dk[i];
      cout<<"  pour dk = "<<dk[i]<<" Mpc^-1:  sigma/P = "<<vcosm