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

Timestamp:

May 3, 2010, 4:08:34 PM (15 years ago)

Author:

cmv

Message:

• refonte du code pour creer uniquement des conditions initiales
• introduction du tirage des vitesse LOS pour les redshift-distortion

cmv 03/05/2010

File:

• trunk/Cosmo/SimLSS/genefluct3d.h (modified) (5 diffs)

trunk/Cosmo/SimLSS/genefluct3d.h

@@ -18 +18 @@
 #include "cosmocalc.h"
 #include "pkspectrum.h"
+#include "schechter.h"
 
 #define WITH_FFTW_THREAD
 
-//NE PAS DECOMMENTER, UTILISEZ LA MAKEFILE #define GEN3D_FLOAT
-
+//NE PAS DECOMMENTER, UTILISEZ LA MAKEFILE ("g++ -DGEN3D_FLOAT ...")
 #if defined(GEN3D_FLOAT)
 #define GEN3D_TYPE r_4
@@ -77 +77 @@
   vector<long> GetNpix(void) {return N_;}
   int_8 NPix(void) {return NRtot_;}
-  long GetNx(void) {return Nx_;}
-  long GetNy(void) {return Ny_;}
-  long GetNz(void) {return Nz_;}
+  long Nx(void) {return Nx_;}
+  long Ny(void) {return Ny_;}
+  long Nz(void) {return Nz_;}
+  double Dx(void) {return Dx_;}
+  double Dy(void) {return Dy_;}
+  double Dz(void) {return Dz_;}
 
   // Return |K_i| module relative to pixel indices
@@ -101 +104 @@
   double GetKTincMax(void) {return max(Dk_[0],Dk_[1]);}
 
-  void ComputeFourier0(GenericFunc& pk_at_z);
-  void ComputeFourier(GenericFunc& pk_at_z);
+  double Zref(void) {return redsh_ref_;}
+  double ZrefPk(void) {return compute_pk_redsh_ref_;}
+  double Dref(void) {return growth_ref_;}
+  double DrefPk(void)
+    {return (growth_!=NULL && compute_pk_redsh_ref_>=0.) ? (*growth_)(compute_pk_redsh_ref_): -999.;}
+
+  void ComputeFourier0(PkSpectrumZ& pk_at_z);
+  void ComputeFourier(PkSpectrumZ& pk_at_z);
   void FilterByPixel(void);
+  void ToVelTrans(void);
 
   void ComputeReal(void);
   void ApplyGrowthFactor(int type_evol=1);
+  void ApplyDerGrowthFactor(int type_evol=1);
 
   void ReComputeFourier(void);
@@ -188 +199 @@
   CosmoCalc *cosmo_;
   GrowthFactor *growth_;
+  double good_dzinc_;
   double redsh_ref_,kredsh_ref_,dred_ref_;
-  double loscom_ref_,dtrc_ref_, dlum_ref_, dang_ref_;
+  double compute_pk_redsh_ref_;
+  double h_ref, loscom_ref_,dtrc_ref_, dlum_ref_, dang_ref_;
+  double growth_ref_, dsdz_growth_ref_;
   double nu_ref_, dnu_ref_ ;
   double xobs_[3];
+
   double loscom_min_, loscom_max_;
   vector<double> zred_, loscom_;
@@ -197 +212 @@
   vector<double> loscom2zred_;
 
+  double zredmin_dpsd_, zredmax_dpsd_;
+  vector<double> dpsdfrzred_;
+
 };