Changeset 3782 in Sophya for trunk/Cosmo

Timestamp:

Jun 7, 2010, 5:57:28 PM (15 years ago)

Author:

cmv

Message:

ajout des spectre NoOsc dans cmvginit3d, cmv 7/6/2010

Location:

trunk/Cosmo/SimLSS

Files:

• cmvginit3d.cc (modified) (6 diffs)
• cmvrvloscor.cc (modified) (2 diffs)

trunk/Cosmo/SimLSS/cmvginit3d.cc

@@ -24 +24 @@
 void usage(void)
 {
- cout<<"cmvobserv3d [...options...]"<<endl
+ cout<<"cmvginit3d [...options...]"<<endl
      <<" -a : auto init random seed (needed for multiple simul)"<<endl
      <<" -G typevol: compute Pk(z=0) and apply growth factor in real space"<<endl
@@ -44 +44 @@
      <<"                   temporary save cube in temp_file.ppf"<<endl
      <<" -n nent : fill control ntuple with nent entries (def: do not fill)"<<endl
-     <<" -O a,b : tell what you want to write (with the -W and -P options)"<<endl
+     <<" -O a,b : tell what you want to write"<<endl
      <<"      a : write generated fourier cube (_k0)"<<endl
      <<"      b : write real space cube dRho/Rho at z (_r0)"<<endl
      <<"      a,b= 0 no write, 1 ppf write, 2 fits write, 3 ppf+fits write"<<endl
      <<" -S : write cube slices in PPF format"<<endl
-     <<" -o root_name_out : root string for output file name (def: cmvobserv3d)"<<endl
+     <<" -o out_base_name : base string for output file name (def: cmvginit3d)"<<endl
      <<" -V : compute variance from real space (for check, default: no)"<<endl
      <<" -T nth : nombre de threads (si compil multi-thread, default: 0)"<<endl
@@ -221 +221 @@
 
  TransfertEisenstein tf(h100,om0-ob0,ob0,T_CMB_Par,false);
- //tf.SetNoOscEnv(2);
+ TransfertEisenstein tfnos(h100,om0-ob0,ob0,T_CMB_Par,false);
+   tfnos.SetNoOscEnv(2);
 
  GrowthFactor growth(om0,ol0);
@@ -229 +230 @@
 
  PkSpectrum0 pk0(pkini,tf);
+ PkSpectrum0 pk0nos(pkini,tfnos);
 
  PkSpectrumZ pkz(pk0,growth,zref);
+ PkSpectrumZ pkznos(pk0nos,growth,zref);
 
  //-----------------------------------------------------------------
  pkz.SetZ(0.);
+ pkznos.SetZ(0.);
  cout<<endl<<"\n--- Compute variance for top-hat R="<<R<<" at z="<<pkz.GetZ()<<endl;
  VarianceSpectrum varpk_th(pkz,R,VarianceSpectrum::TOPHAT);
@@ -251 +255 @@
  double normpkz = sigmaR*sigmaR/sr2;
  pkz.SetScale(normpkz);
+ pkznos.SetScale(normpkz);
  cout<<"Spectrum normalisation = "<<pkz.GetScale()<<endl;
  {
@@ -256 +261 @@
  FuncToHisto(pkz,hpkz0,true);
  posobs.PutObject(hpkz0,"hpkz0");
+ Histo hpkz0nos(hpkz0);
+ FuncToHisto(pkznos,hpkz0nos,true);
+ posobs.PutObject(hpkz0nos,"hpkz0nos");
  }
 
  pkz.SetZ(zref);
+ pkznos.SetZ(zref);
  {
  Histo hpkz(lkmin,lkmax,npt); hpkz.ReCenterBin();
  FuncToHisto(pkz,hpkz,true);
  posobs.PutObject(hpkz,"hpkz");
+ Histo hpkznos(hpkz);
+ FuncToHisto(pkznos,hpkznos,true);
+ posobs.PutObject(hpkznos,"hpkznos");
  }
 

trunk/Cosmo/SimLSS/cmvrvloscor.cc

@@ -18 +18 @@
 #include "geneutils.h"
 #include "genefluct3d.h"
-// cmvrvloscorf -n 1,30 -K 75 -S ginit3d_6_0p0_100_r.fits ginit3d_6_0p0_100_rv.fits
+// set simul = 6_0p0_780
+// cmvrvloscorf -K 75 -S ginit3d_${simul}_r.fits ginit3d_${simul}_rv.fits
+// cmvrvloscorf -n 1,30 -K 75 -S ginit3d_${simul}_r.fits ginit3d_${simul}_rv.fits
 
 void usage(void);
@@ -309 +311 @@
 n/plot hpkrec.val%x x>0 ! "nsta cpts logx"
 
-# recosntructed 2D power spectrum
+# reconstructed 2D power spectrum
 imag hpkrec2
 addoval 0 0 0.05 0.05 "green" false