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


Ignore:
Timestamp:
Nov 14, 2007, 7:25:34 PM (18 years ago)
Author:
cmv
Message:

1-/ pkspectrum: GrowthFactor + PkSpectrum on enleve les memorisations

des calculs precedents, tout est recalcule

2-/ cmvfitpk: mise de Ob+Ol+Oc+h100+ns dans le fit

cmv 14/11/2007

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/Cosmo/SimLSS/pkspectrum.h

    r3378 r3381  
    1414  virtual ~InitialSpectrum(void);
    1515  virtual double operator() (double k) {return A_ * pow(k,n_);}
    16   void SetNorm(double a);
    17   void SetSlope(double n);
     16  void SetNorm(double a) {A_ = a;}
     17  void SetSlope(double n) {n_ = n;}
    1818protected:
    1919  double n_, A_;
    … …  
    2929  TransfertEisenstein(TransfertEisenstein& tf);
    3030  virtual ~TransfertEisenstein(void);
    31   bool SetParTo(double h100=-1.,double OmegaCDM0=-1.,double OmegaBaryon0=-1.,double tcmb=-1.,bool nobaryon=false);
     31  bool SetParTo(double h100,double OmegaCDM0,double OmegaBaryon0);
    3232  virtual double operator() (double k);
    3333  double KPeak(void);
    … …  
    7777  virtual ~GrowthFactor(void);
    7878  virtual double operator() (double z);
    79   bool SetParTo(double OmegaMatter0=-1.,double OmegaLambda0=-12345.);
     79  void SetParTo(double OmegaMatter0,double OmegaLambda0);
     80  bool SetParTo(double OmegaMatter0);
    8081protected:
    81   double O0_,Ol_,Ok_;
    82   double norm_;
     82  double O0_,Ol_;
    8383};
    8484
    … …  
    107107  virtual double operator() (double k);
    108108  virtual double operator() (double k,double z);
    109   inline void   SetZ(double z) {zref_ = z;}
    110   inline double GetZ(void) {return zref_;}
     109  void   SetZ(double z) {zref_ = z;}
     110  double GetZ(void) {return zref_;}
    111111  void SetTypSpec(ReturnSpectrum typspec=PK);
    112   inline void SetScale(double scale=1.) {scale_=scale; zold_=-1.;}
    113   inline double GetScale(void) {return scale_;}
     112  void SetScale(double scale=1.) {scale_=scale;}
     113  double GetScale(void) {return scale_;}
    114114  PkSpectrum0& GetPk0(void) {return pk0_;}
    115115  GrowthFactor& GetGrowthFactor(void) {return d1_;}
    … …  
    119119  double zref_, scale_;
    120120  ReturnSpectrum typspec_;
    121   mutable double zold_, d1old_;
    122121};
    123122
Note: See TracChangeset for help on using the changeset viewer.