Changeset 3908 in Sophya for trunk

Timestamp:

Nov 15, 2010, 4:11:32 PM (15 years ago)

Author:

cmv

Message:

Kaiser spectrum modif for redshift distortions cmvginit3d.cc interface, cmv 15/11/2010

Location:

trunk/Cosmo/SimLSS

Files:

• cmvginit3d.cc (modified) (7 diffs)
• genefluct3d.cc (modified) (2 diffs)

trunk/Cosmo/SimLSS/cmvginit3d.cc

@@ -33 +33 @@
      <<"       else : no evol, spectrum Pk(z=z_median) for all cube (def)"<<endl
      <<" -F : filter spectrum by pixel shape (0=no 1=yes(default)"<<endl
+     <<" -K : modify spectrum with Kaiser redshift distortion (default=no)"<<endl
      <<" -x nx,dx : size along x axis (npix,Mpc)"<<endl
      <<" -y ny,dy : size along y axis (npix,Mpc)"<<endl
@@ -92 +93 @@
  unsigned short nthread=0;
  int filter_by_pixel = 1;
+ bool kaiser_modify = false;
 
  // *** What to do
@@ -120 +122 @@
  // --- Decodage des arguments
  char c;
- while((c = getopt(narg,arg,"haG:F:x:y:z:Z:128:v:n:CO:So:VT:f:")) != -1) {
+ while((c = getopt(narg,arg,"haG:F:Kx:y:z:Z:128:v:n:CO:So:VT:f:")) != -1) {
   int nth = 0;
   switch (c) {
@@ -131 +133 @@
   case 'F' :
     filter_by_pixel = atoi(optarg);
+    break;
+  case 'K' :
+    kaiser_modify =  true;
     break;
   case 'x' :
@@ -199 +204 @@
  cout<<"kmin="<<kmin<<" ("<<log10(kmin)<<"), kmax="<<kmax<<" ("<<log10(kmax)<<") Mpc^-1"<<", npt="<<npt<<endl;
  cout<<"Filter by pixel = "<<filter_by_pixel<<endl;
+ if(kaiser_modify) cout<<"Modify spectrum with Kaiser redshift distorted formula"<<endl;
  if(comptransveloc) cout<<"Tansverse velocity generation requested"<<endl;
  if(cambfread.size()>0) cout<<"use CAMB file: cambfread="<<cambfread<<endl;
@@ -397 +403 @@
 
  //-----------------------------------------------------------------
+ bool spec_is_modified = false;
  if(filter_by_pixel!=0) {
    cout<<"\n--- Computing convolution by pixel shape"<<endl;
    fluct3d.FilterByPixel();
-   fluct3d.NTupleCheck(posobs,string("ntpkgenf"),ntnent);
+   spec_is_modified = true;
    PrtTim(">>>> End Computing convolution by pixel shape");
  }
 
+ //-----------------------------------------------------------------
+ if(kaiser_modify) {
+   cout<<"\n--- Modify spectrum coeff with Kaiser redshift distorted formula"<<endl;
+   fluct3d.ToRedshiftSpace();
+   spec_is_modified = true;
+   PrtTim(">>>> End Computing Modify spectrum coeff with Kaiser");
+ }
+
+ //-----------------------------------------------------------------
+ if(spec_is_modified) fluct3d.NTupleCheck(posobs,string("ntpkgenf"),ntnent);
  if(compdspec&1) {
    HistoErr hpkgenf(hpkgen);
-   if(filter_by_pixel!=0) {
+   if(spec_is_modified) {
      cout<<"\n--- Checking realization spectra"<<endl;
      hpkgenf.Zero(); hpkgenf.Show();
@@ -416 +433 @@
  if(compdspec&2) {
    Histo2DErr hpkgenf2(hpkgen2);
-   if(filter_by_pixel!=0) {
+   if(spec_is_modified) {
      cout<<"\n--- Checking realization 2D spectra"<<endl;
      hpkgenf2.Zero(); hpkgenf2.Show();

trunk/Cosmo/SimLSS/genefluct3d.cc

@@ -911 +911 @@
  double beta = -(1.+zpk) * growth_->DsDz(zpk,good_dzinc_) / (*growth_)(zpk);
  if(lp_>0) cout<<"--- ToRedshiftSpace --- at z="<<zpk<<", Beta="<<beta
-               <<" (km/s)/Mpc (comp. for dz="<<good_dzinc_<<")"<<endl;
+               <<" (comp. for dz="<<good_dzinc_<<")"<<endl;
  check_array_alloc();
 
@@ -1014 +1014 @@
 // Apply Growth(z) to redshift-distorted real space cube
 {
- const char *bla = "GeneFluct3D::ApplyRedshiftSpaceGrowthFactor_Error: redshift evolution impossible because factor depen on k";
+ const char *bla = "GeneFluct3D::ApplyRedshiftSpaceGrowthFactor_Error: redshift evolution impossible because factor depends on k";
  cout<<bla<<endl; throw ParmError(bla);
 }