Changeset 3485 in Sophya for trunk/Cosmo

Timestamp:

Apr 9, 2008, 6:56:01 PM (17 years ago)

Author:

cmv

Message:

reprise de la normalisation du spectre cmv 09/04/2008

File:

• trunk/Cosmo/SimLSS/cmvtstpk.cc (modified) (6 diffs)

trunk/Cosmo/SimLSS/cmvtstpk.cc

@@ -22 +22 @@
      <<" -H h100 -B Ob0 -M Om0 -L Ol0,w0"<<endl
      <<" -k npt,lkmin,lkmax : les valeurs sont en log10"<<endl
-     <<" -s scale : on multiplie pkz par scale"<<endl
+     <<" -s scale : on normalise le spectre avec scale"<<endl
      <<" -w : write spectra on ASCII file"<<endl;
 }
@@ -34 +34 @@
  int npt = 10000;
  double lkmin = -3., lkmax=2.;
- double scale = 2.54499e+07;  // normalisation di spectre a z=0 selon SDSS
+ double scale = 2.54499e+07;  // normalisation du spectre a z=0 selon SDSS
  bool wrascii = false;
 
@@ -81 +81 @@
  //--------------------------
  InitialSpectrum pkini(ns,as);
+ pkini.SetNorm(scale);
 
  TransfertEisenstein tf(h100,Om0-Ob0,Ob0,T_CMB_Par,false);
@@ -134 +135 @@
    xnt[2] = tf(k);
    xnt[3] = pk0(k);
-   xnt[4] = scale*pkz(k,zval);
+   xnt[4] = pkz(k,zval);
    xnt[5] = tfnosc2(k);
    xnt[6] = pk0nosc2(k);
-   xnt[7] = scale*pkznosc2(k,zval);
+   xnt[7] = pkznosc2(k,zval);
    xnt[8] = tfnosc1(k);
    xnt[9] = pk0nosc1(k);
-   xnt[10] = scale*pkznosc1(k,zval);
+   xnt[10] = pkznosc1(k,zval);
    xnt[11] = tfnob(k);
    xnt[12] = pk0nob(k);
-   xnt[13] = scale*pkznob(k,zval);
+   xnt[13] = pkznob(k,zval);
    nt.Fill(xnt);
  }
@@ -157 +158 @@
      fprintf(fdata,"%e %e %e %e %e %e %e %e %e %e %e %e %e %e\n",
              k,pkini(k),
-             tf(k),pk0(k),scale*pkz(k,zval),
-             tfnosc2(k),pk0nosc2(k),scale*pkznosc2(k,zval),
-             tfnosc1(k),pk0nosc1(k),scale*pkznosc1(k,zval),
-             tfnob(k),pk0nob(k),scale*pkznob(k,zval));
+             tf(k),pk0(k),pkz(k,zval),
+             tfnosc2(k),pk0nosc2(k),pkznosc2(k,zval),
+             tfnosc1(k),pk0nosc1(k),pkznosc1(k,zval),
+             tfnob(k),pk0nob(k),pkznob(k,zval));
    }
    fclose(fdata);
@@ -204 +205 @@
 addline -10 1 10 1
 
-#### Spectre a z=0   (scale ~= 2.54499e+07)
+#### Spectre a z=0
 zone
 n/plot nt.pk0%$xk ! ! "nsta connectpoints"