Changeset 4027 in Sophya for trunk/Cosmo/RadioBeam/specpk.h

Timestamp:

Oct 17, 2011, 10:56:41 AM (14 years ago)

Author:

ansari

Message:

Implementatiom prise en compte dA(z) ds la calcul de bruit Pnoise(k) - Reza 17/10/2011

File:

• trunk/Cosmo/RadioBeam/specpk.h (modified) (6 diffs)

trunk/Cosmo/RadioBeam/specpk.h

@@ -46 +46 @@
   Four3DPk(TArray< complex<TF> > & fourcoedd, RandomGeneratorInterface& rg);
   Four3DPk(RandomGeneratorInterface& rg, sa_size_t szx=128, sa_size_t szy=256, sa_size_t szz=128);
+  virtual ~Four3DPk(); 
+
   inline void SetCellSize(double dkx=DeuxPI, double dky=DeuxPI, double dkz=DeuxPI) 
   { dkx_=dkx;  dky_=dky;  dkz_=dkz; } 
@@ -54 +56 @@
 // typically = ComovRadialDistance 
   void ComputeNoiseFourierAmp(Four2DResponse& resp, double angscale=1., bool crmask=false);
-  void ComputeNoiseFourierAmp(Four2DResponse& resp, double f0, double df, double angscale=1.);
+  void ComputeNoiseFourierAmp(Four2DResponse& resp, double f0, double df, Vector& angscales);
 
 // Return the array size 
   inline sa_size_t NCells() { return fourAmp.Size(); }
+  inline sa_size_t SizeX() { return fourAmp.SizeX(); }
+  inline sa_size_t SizeY() { return fourAmp.SizeY(); }
+  inline sa_size_t SizeZ() { return fourAmp.SizeZ(); }
+
 // Set the cell size/step in Fourier Space
 // Return the fourier amplitude matrix  
@@ -66 +72 @@
 
 // Return the reconstructed power spectrum as a profile histogram   
-  HProf ComputePk(double s2cut=0., int nbin=256, double kmin=0., double kmax=-1.);
-  void  ComputePkCumul(HProf& hp, double s2cut=0.);
+  HProf ComputePk(double s2cut=0., int nbin=256, double kmin=0., double kmax=-1., bool fgmodcnt=false);
+  void  ComputePkCumul();
 
 // angscale is a multiplicative factor converting transverse k (wave number) values to angular wave numbers 
 // typically = ComovRadialDistance 
-  HProf ComputeNoisePk(Four2DResponse& resp, Histo& fracmodok, DataTable& dt, double angscale=1.,
-                       double s2cut=0., int nbin=256, double kmin=0., double kmax=-1.);
+  HProf ComputeNoisePk(Four2DResponse& resp, double angscale=1., double s2cut=0., 
+                       int nbin=256, double kmin=0., double kmax=-1.);
+
+  // Fills a data table from the computed P(k) profile histogram and mode count 
+  Histo FillPkDataTable(DataTable& dt);
+  inline HProf& GetPk() { return *hp_pk_p_; }
 
 protected:
@@ -81 +91 @@
   int prtlev_;
   int prtmodulo_;
+  // Profile histograms for power spectrum and number of modes 
+  HProf* hp_pk_p_;
+  Histo* hmcnt_p_;
+  Histo* hmcntok_p_;
+  double s2cut_;
 };
 
@@ -94 +109 @@
   { freq0_=freq0;  dfreq_=dfreq; }
   inline void SetAngScaleConversion(double angscale=1.)
-  { angscale_=angscale; }
+  { angscales_=angscale; }
+  inline void SetAngScaleConversion(Vector& angscs)
+  { angscales_=angscs; }
   inline void SetS2Cut(double s2cut=100.)
   {  S2CUT=s2cut; }
   inline double GetS2Cut() { return S2CUT; }
-  HProf Compute();
+  HProf Compute(int nbin=256, double kmin=0., double kmax=-1.);
   inline int SetPrtLevel(int lev=0, int prtmod=10) 
   { int olev=prtlev_; prtlev_=lev; prtmodulo_=prtmod; return olev; }
@@ -106 +123 @@
   Four2DResponse& frep;
   double freq0_,dfreq_;
-  double angscale_; 
+  Vector angscales_; 
   double S2CUT;
   int NGEN;