Changeset 3770 in Sophya for trunk/Cosmo/SimLSS/genefluct3d.cc

Timestamp:

May 7, 2010, 7:32:40 PM (15 years ago)

Author:

cmv

Message:

relecture des redshift-distorsion + calcul des spectres, cmv 07/05/2010

File:

• trunk/Cosmo/SimLSS/genefluct3d.cc (modified) (14 diffs)

trunk/Cosmo/SimLSS/genefluct3d.cc

@@ -92 +92 @@
  kredsh_ref_ = 0.;
  dred_ref_ = -999.;
+ h_ref_ = -999.;
  loscom_ref_ = -999.;
  dtrc_ref_ = dlum_ref_ = dang_ref_ = -999.;
@@ -277 +278 @@
  dlum_ref_ = cosmo_->Dlum(redsh_ref_);
  dang_ref_ = cosmo_->Dang(redsh_ref_);
- h_ref = cosmo_->H(redsh_ref_);
+ h_ref_ = cosmo_->H(redsh_ref_);
  growth_ref_ = (*growth_)(redsh_ref_);
  dsdz_growth_ref_ = growth_->DsDz(redsh_ref_,zinc);
@@ -287 +288 @@
        <<", nuref="<<nu_ref_ <<" GHz"
        <<", dnuref="<<dnu_ref_ <<" GHz"<<endl
-       <<"   H="<<h_ref<<" km/s/Mpc"
+       <<"   H="<<h_ref_<<" km/s/Mpc"
        <<", D="<<growth_ref_
        <<", dD/dz="<<dsdz_growth_ref_<<endl
@@ -445 +446 @@
    fwrt.WriteKey("ZREF",redsh_ref_," reference redshift");
    fwrt.WriteKey("KZREF",kredsh_ref_," reference redshift on z axe");
+   fwrt.WriteKey("HREF",h_ref_," ref H(z)");
    fwrt.WriteKey("Growth",Dref()," growth at reference redshift");
    fwrt.WriteKey("GrowthPk",DrefPk()," growth at Pk computed redshift");
@@ -503 +505 @@
    R_.Info()["ZREF"] = (r_8)redsh_ref_;
    R_.Info()["KZREF"] = (r_8)kredsh_ref_;
+   R_.Info()["HREF"] = (r_8)h_ref_;
    R_.Info()["Growth"] = (r_8)Dref();
    R_.Info()["GrowthPk"] = (r_8)DrefPk();
@@ -691 +694 @@
  long lmod = Nx_/20; if(lmod<1) lmod=1;
  for(long i=0;i<Nx_;i++) {
-   double kx = Kx(i);  kx *= kx;
-   if(lp_>0 && i%lmod==0) cout<<"i="<<i<<"\t nx-i="<<Nx_-i<<"\t kx="<<kx<<"\t pk="<<pk_at_z(kx)<<endl;
+   double kx = AbsKx(i);  kx *= kx;
+   if(lp_>0 && i%lmod==0) cout<<"i="<<i<<"\t nx-i="<<Nx_-i<<"\t kx="<<Kx(i)<<"\t pk="<<pk_at_z(kx)<<endl;
    for(long j=0;j<Ny_;j++) {
-     double ky = Ky(j);  ky *= ky;
+     double ky = AbsKy(j);  ky *= ky;
      for(long l=0;l<NCz_;l++) {
-       double kz = Kz(l);  kz *= kz;
+       double kz = AbsKz(l);  kz *= kz;
        if(i==0 && j==0 && l==0) continue; // Suppression du continu
        double k = sqrt(kx+ky+kz);
@@ -734 +737 @@
  long lmod = Nx_/20; if(lmod<1) lmod=1;
  for(long i=0;i<Nx_;i++) {
-   double kx = Kx(i);  kx *= kx;
-   if(lp_>0 && i%lmod==0) cout<<"i="<<i<<"\t nx-i="<<Nx_-i<<"\t kx="<<kx<<"\t pk="<<pk_at_z(kx)<<endl;
+   double kx = AbsKx(i);  kx *= kx;
+   if(lp_>0 && i%lmod==0) cout<<"i="<<i<<"\t nx-i="<<Nx_-i<<"\t kx="<<Kx(i)<<"\t pk="<<pk_at_z(kx)<<endl;
    for(long j=0;j<Ny_;j++) {
-     double ky = Ky(j);  ky *= ky;
+     double ky = AbsKy(j);  ky *= ky;
      for(long l=0;l<NCz_;l++) {
-       double kz = Kz(l);  kz *= kz;
+       double kz = AbsKz(l);  kz *= kz;
        if(i==0 && j==0 && l==0) continue; // Suppression du continu
        double k = sqrt(kx+ky+kz);
@@ -877 +880 @@
 
  for(long i=0;i<Nx_;i++) {
-   double kx = Kx(i) *Dx_/2;
+   double kx = AbsKx(i) *Dx_/2;
    double pk_x = pixelfilter(kx);
    for(long j=0;j<Ny_;j++) {
-     double ky = Ky(j) *Dy_/2;
+     double ky = AbsKy(j) *Dy_/2;
      double pk_y = pixelfilter(ky);
      for(long l=0;l<NCz_;l++) {
-       double kz = Kz(l) *Dz_/2;
+       double kz = AbsKz(l) *Dz_/2;
        double pk_z =  pixelfilter(kz);
        T_(l,j,i) *= pk_x*pk_y*pk_z;
@@ -893 +896 @@
 
 //-------------------------------------------------------------------
-void GeneFluct3D::ToVelTrans(void)
-{
-  cout<<"-------------------- TO BE VERIFIED ToVelTrans"<<endl;
-
+void GeneFluct3D::ToVelLoS(void)
+{
  double zpk = compute_pk_redsh_ref_;
  double dpsd = -cosmo_->H(zpk) * growth_->DsDz(zpk,good_dzinc_) / (*growth_)(zpk);
- if(lp_>0) cout<<"--- ToVelTrans --- at z="<<zpk<<", D'/D="<<dpsd
+ if(lp_>0) cout<<"--- ToVelLoS --- at z="<<zpk<<", D'/D="<<dpsd
                <<" (km/s)/Mpc (comp. for dz="<<good_dzinc_<<")"<<endl;
  check_array_alloc();
@@ -963 +964 @@
 // Apply Conformal derivative of Growth to real space for transverse velocity cube
 {
-  cout<<"-------------------- TO BE VERIFIED ApplyDerGrowthFactor"<<endl;
-
  if(lp_>0) cout<<"--- ApplyDerGrowthFactor: evol="<<type_evol<<endl;
  check_array_alloc();
@@ -1044 +1043 @@
  // Attention a l'ordre
  for(long i=0;i<Nx_;i++) {
-   double kx = Kx(i);  kx *= kx;
+   double kx = AbsKx(i);  kx *= kx;
    for(long j=0;j<Ny_;j++) {
-     double ky = Ky(j);  ky *= ky;
+     double ky = AbsKy(j);  ky *= ky;
      for(long l=0;l<NCz_;l++) {
-       double kz = Kz(l);
+       double kz = AbsKz(l);
        double k = sqrt(kx+ky+kz*kz);
        double pk = MODULE2(T_(l,j,i));
@@ -1074 +1073 @@
  // Attention a l'ordre
  for(long i=0;i<Nx_;i++) {
-   double kx = Kx(i);  kx *= kx;
+   double kx = AbsKx(i);  kx *= kx;
    for(long j=0;j<Ny_;j++) {
-     double ky = Ky(j);  ky *= ky;
+     double ky = AbsKy(j);  ky *= ky;
      double kt = sqrt(kx+ky);
      for(long l=0;l<NCz_;l++) {
-       double kz = Kz(l);
+       double kz = AbsKz(l);
        double pk = MODULE2(T_(l,j,i));
        herr.Add(kt,kz,pk);
@@ -1118 +1117 @@
  // Attention a l'ordre
  for(long i=0;i<Nx_;i++) {
-   double kx = Kx(i);
+   double kx = AbsKx(i);
    double fx = (pixcor) ? pixelfilter(kx*Dx_/2): 1.;
    kx *= kx; fx *= fx;
    for(long j=0;j<Ny_;j++) {
-     double ky = Ky(j);
+     double ky = AbsKy(j);
      double fy = (pixcor) ? pixelfilter(ky*Dy_/2): 1.;
      ky *= ky; fy *= fy;
      for(long l=0;l<NCz_;l++) {
-       double kz = Kz(l);
+       double kz = AbsKz(l);
        double k = sqrt(kx+ky+kz*kz);
        double pk = MODULE2(T_(l,j,i)) - sigma2;
@@ -1163 +1162 @@
  // Attention a l'ordre
  for(long i=0;i<Nx_;i++) {
-   double kx = Kx(i);
+   double kx = AbsKx(i);
    double fx = (pixcor) ? pixelfilter(kx*Dx_/2) : 1.;
    kx *= kx; fx *= fx;
    for(long j=0;j<Ny_;j++) {
-     double ky = Ky(j);
+     double ky = AbsKy(j);
      double fy = (pixcor) ? pixelfilter(ky*Dy_/2) : 1.;
      ky *= ky; fy *= fy;
      double kt = sqrt(kx+ky);
      for(long l=0;l<NCz_;l++) {
-       double kz = Kz(l);
+       double kz = AbsKz(l);
        double pk = MODULE2(T_(l,j,i)) - sigma2;
        double fz = (pixcor) ? vfz(l): 1.;