Changeset 3348 in Sophya for trunk/Cosmo/SimLSS/pkspectrum.h

Timestamp:

Oct 11, 2007, 4:37:03 PM (18 years ago)

Author:

cmv

Message:

• definition des options par enum
• mise en variable privee du rayon R du filtre de VarianceSpectrum Elle disparait des arguments des methodes: Variance FindMaximum FindLimits

cmv 11/10/2007

File:

• trunk/Cosmo/SimLSS/pkspectrum.h (modified) (8 diffs)

trunk/Cosmo/SimLSS/pkspectrum.h

@@ -23 +23 @@
 class TransfertEisenstein : public GenericFunc {
 public:
+
+  typedef enum{ALL=0, CDM=1, BARYON=2} ReturnPart;
+
   TransfertEisenstein(double h100,double OmegaCDM0,double OmegaBaryon0,double tcmb,bool nobaryon=false,int lp=0);
   TransfertEisenstein(TransfertEisenstein& tf);
@@ -29 +32 @@
   double KPeak(void);
   void SetNoOscEnv(unsigned short nooscenv=0);
-  void SetReturnPart(unsigned short retpart=0);
+  void SetReturnPart(ReturnPart retpart=ALL);
 protected:
   int lp_;
@@ -39 +42 @@
 
   bool nobaryon_;
-  unsigned short nooscenv_, retpart_;
+  unsigned short nooscenv_;
+  ReturnPart retpart_;
 
   double T0tild(double k,double alphac,double betac);
@@ -94 +98 @@
 class PkSpectrumZ : public GenericFunc {
 public:
+  typedef enum {PK=0, DELTA=1} ReturnSpectrum;
   PkSpectrumZ(PkSpectrum0& pk0,GrowthFactor& d1,double zref=0.);
   PkSpectrumZ(PkSpectrumZ& pkz);
@@ -101 +106 @@
   inline void   SetZ(double z) {zref_ = z;}
   inline double GetZ(void) {return zref_;}
-  void SetTypSpec(unsigned short typspec=0);
+  void SetTypSpec(ReturnSpectrum typspec=PK);
   inline void SetScale(double scale=1.) {scale_=scale; zold_=-1.;}
   inline double GetScale(void) {return scale_;}
@@ -110 +115 @@
   GrowthFactor& d1_;
   double zref_, scale_;
-  unsigned short typspec_;
+  ReturnSpectrum typspec_;
   mutable double zold_, d1old_;
 };
@@ -117 +122 @@
 class VarianceSpectrum : public GenericFunc {
 public:
-  VarianceSpectrum(GenericFunc& pk,unsigned short typfilter);
+
+  typedef enum {TOPHAT=0, GAUSSIAN=1, NOFILTER=2} TypeFilter;
+
+  VarianceSpectrum(GenericFunc& pk,double R,TypeFilter typfilter);
   VarianceSpectrum(VarianceSpectrum& pkinf);
   virtual ~VarianceSpectrum(void);
 
-  void SetFilter(unsigned short typfilter=0);
+  void SetRadius(double R);
+  void SetFilter(TypeFilter typfilter=TOPHAT);
   void SetInteg(double dperc=0.1,double dlogkinc=-1.,double dlogkmax=-1.,unsigned short glorder=4);
 
-  double Variance(double R,double kmin,double kmax);
+  double Variance(double kmin,double kmax);
 
   // ATTENTION: La fonction a integrer est : f(k)dk = k^3*Pk(k)/(2Pi^2) *filter2(k*R) *dk/k
@@ -131 +140 @@
 
   // Aide a l'integration
-  double FindMaximum(double R,double kmin,double kmax,double eps=1.e-3);
-  int FindLimits(double R,double high,double &kmin,double &kmax,double eps=1.e-3);
+  double FindMaximum(double kmin,double kmax,double eps=1.e-3);
+  int FindLimits(double high,double &kmin,double &kmax,double eps=1.e-3);
 
 protected:
 
   GenericFunc& pk_;
-  unsigned short typfilter_;
+  TypeFilter typfilter_;
   double R_;