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

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.h (modified) (4 diffs)

trunk/Cosmo/SimLSS/genefluct3d.h

@@ -22 +22 @@
 #define WITH_FFTW_THREAD
 
-//NE PAS DECOMMENTER, UTILISEZ LA MAKEFILE ("g++ -DGEN3D_FLOAT ...")
+//NE PAS DECOMMENTER, UTILISEZ LA MAKEFILE ("g++ -c -DGEN3D_FLOAT ...")
 #if defined(GEN3D_FLOAT)
 #define GEN3D_TYPE r_4
@@ -85 +85 @@
 
   // Return |K_i| module relative to pixel indices
-  inline r_8 Kx(long i) {long ii=(i>Nx_/2)? Nx_-i :i; return ii*Dkx_;}
-  inline r_8 Ky(long j) {long jj=(j>Ny_/2)? Ny_-j :j; return jj*Dky_;}
+  inline r_8 AbsKx(long i) {long ii=(i>Nx_/2)? Nx_-i :i; return ii*Dkx_;}
+  inline r_8 AbsKy(long j) {long jj=(j>Ny_/2)? Ny_-j :j; return jj*Dky_;}
+  inline r_8 AbsKz(long l) {return l*Dkz_;}
+  inline r_8 Kx(long i) {long ii=(i>Nx_/2)? i-Nx_ :i; return ii*Dkx_;}
+  inline r_8 Ky(long j) {long jj=(j>Ny_/2)? j-Ny_ :j; return jj*Dky_;}
   inline r_8 Kz(long l) {return l*Dkz_;}
 
@@ -109 +112 @@
   double DrefPk(void)
     {return (growth_!=NULL && compute_pk_redsh_ref_>=0.) ? (*growth_)(compute_pk_redsh_ref_): -999.;}
+  double Href(void) {return h_ref_;}
 
   void ComputeFourier0(PkSpectrumZ& pk_at_z);
   void ComputeFourier(PkSpectrumZ& pk_at_z);
   void FilterByPixel(void);
-  void ToVelTrans(void);
+  void ToVelLoS(void);
 
   void ComputeReal(void);
@@ -202 +206 @@
   double redsh_ref_,kredsh_ref_,dred_ref_;
   double compute_pk_redsh_ref_;
-  double h_ref, loscom_ref_,dtrc_ref_, dlum_ref_, dang_ref_;
+  double h_ref_, loscom_ref_,dtrc_ref_, dlum_ref_, dang_ref_;
   double growth_ref_, dsdz_growth_ref_;
   double nu_ref_, dnu_ref_ ;