Changeset 3971 in Sophya for trunk/Cosmo

Timestamp:

Apr 1, 2011, 5:47:26 PM (14 years ago)

Author:

cmv

Message:

intro possibilite de generer sans les BAO, cmv 01/04/2011

File:

• trunk/Cosmo/SimLSS/cmvginit3d.cc (modified) (11 diffs)

trunk/Cosmo/SimLSS/cmvginit3d.cc

@@ -37 +37 @@
      <<" -8 sigmaR,R : normalisation du spectre de puissance, R en Mpc"<<endl
      <<"               (default sigmaR=1, R=8/h100 Mpc)"<<endl
+     <<" -L : use no-oscillation (no-BAO) spectrum"<<endl
      <<" -f cambspec.dat,h100tab,ztab : use CAMB file (def: Eisenstein spectrum)"<<endl
      <<" -F : filter spectrum by pixel shape (0=no 1=yes(default)"<<endl
@@ -91 +92 @@
  // *** Spectrum and variance definition
  double ns = 1., as = 1.;
+ bool use_noosc = false;
  double R=8./h100, Rg=R/sqrt(5.);
  double sigmaR = 1.;
@@ -138 +140 @@
  // --- Decodage des arguments
  char c;
- while((c = getopt(narg,arg,"haG:F:KB:x:y:z:Z:128:v:n:CO:So:VT:f:")) != -1) {
+ while((c = getopt(narg,arg,"haG:F:LKB:x:y:z:Z:128:v:n:CO:So:VT:f:")) != -1) {
   int nth = 0;
   switch (c) {
@@ -149 +151 @@
   case 'F' :
     filter_by_pixel = atoi(optarg);
+    break;
+  case 'L' :
+    use_noosc = true;
     break;
   case 'K' :
@@ -223 +228 @@
  cout<<"kmin="<<kmin<<" ("<<log10(kmin)<<"), kmax="<<kmax<<" ("<<log10(kmax)<<") Mpc^-1"<<", npt="<<npt<<endl;
  cout<<"Filter by pixel = "<<filter_by_pixel<<endl;
+ if(use_noosc) cout<<"Use spectrum without BAO"<<endl;
  if(kaiser_modify) cout<<"Modify spectrum with Kaiser redshift distorted formula"<<endl;
  if(comptransveloc) cout<<"Tansverse velocity generation requested"<<endl;
@@ -270 +276 @@
 
  PkSpecCalc pkznos(pkini,tfnos,growth,zref);
+ PkSpecCalc pkzwos(pkini,tf,growth,zref);
  PkSpectrum* pkz = NULL;
  if(cambfread.size()>0) {  // read pk in CAMB file
+   cout<<"...using CAMB spectrum"<<endl;
    double h100tab, ztab;
    string fn = decodecambarg(cambfread,h100tab,ztab);
@@ -285 +293 @@
    kmax = pkzt->KMax();
    cout<<"Change k limits to kmin="<<kmin<<" kmax="<<kmax<<endl;
- } else {   // use Eisenstein pk
+ } else if(use_noosc) {   // use Eisenstein pk without BAO
+   cout<<"...using spectrum WITHOUT BAO"<<endl;
+   PkSpecCalc* pkze = new PkSpecCalc(pkini,tfnos,growth,zref);
+   pkz = pkze;
+ } else {   // use Eisenstein pk with BAO
+   cout<<"...using spectrum with BAO"<<endl;
    PkSpecCalc* pkze = new PkSpecCalc(pkini,tf,growth,zref);
    pkz = pkze;
@@ -294 +307 @@
 
  pkz->SetZ(0.);
+ pkzwos.SetZ(0.);
  pkznos.SetZ(0.);
 
  double normpkz[2] = {0.,0.};
  for(int i=0;i<2;i++) {
-   PkSpectrum* pkvar = NULL; string nam = "";
-   if(i==0) pkvar = pkz; else {pkvar = &pkznos; nam = "NoOsc";}
+   PkSpectrum* pkvar = NULL; string nam = "With-BAO";
+   if(i==0) pkvar = &pkzwos; else {pkvar = &pkznos; nam = "No-BAO";}
    cout<<endl<<"\n--- Compute variance for Pk "<<nam<<" with top-hat R="<<R<<" at z="<<pkvar->GetZ()<<endl;
    VarianceSpectrum varpk_th(*pkvar,R,VarianceSpectrum::TOPHAT);
@@ -317 +331 @@
  cout<<endl;
 
+ pkzwos.SetScale(normpkz[0]);
+ pkznos.SetScale(normpkz[1]);
  if(cambfread.size()>0) {
    pkz->SetScale(1.);
-   pkznos.SetScale(normpkz[1]);
    cout<<"Warning: CAMB spectrum, no normalisation applied, scale="<<pkz->GetScale()<<endl;
  } else {
-   pkz->SetScale(normpkz[0]);
-   pkznos.SetScale(normpkz[0]);
-   cout<<"Spectrum normalisation (osc+noosc), scale = "<<pkz->GetScale()<<endl;
+   pkz->SetScale( ((use_noosc) ? normpkz[1]: normpkz[0]) );
+   cout<<"Spectrum normalisation with scale = "<<pkz->GetScale()<<endl;
  }
 
@@ -334 +348 @@
  FuncToHisto(pkznos,hpkz0nos,true);
  posobs.PutObject(hpkz0nos,"hpkz0nos");
+ Histo hpkz0wos(hpkz0);
+ FuncToHisto(pkzwos,hpkz0wos,true);
+ posobs.PutObject(hpkz0wos,"hpkz0wos");
  }
 
  pkz->SetZ(zref);
  pkznos.SetZ(zref);
+ pkzwos.SetZ(zref);
 
  {
@@ -346 +364 @@
  FuncToHisto(pkznos,hpkznos,true);
  posobs.PutObject(hpkznos,"hpkznos");
+ Histo hpkzwos(hpkz);
+ FuncToHisto(pkzwos,hpkzwos,true);
+ posobs.PutObject(hpkzwos,"hpkzwos");
  }