Changeset 3805 in Sophya for trunk/Cosmo/SimLSS/cmvfitpk.cc

Timestamp:

Jul 24, 2010, 12:01:34 AM (15 years ago)

Author:

cmv

Message:

Refonte totale de la structure des classes InitialSpectrum, TransfertFunction, GrowthFactor, PkSpectrum et classes tabulate pour lecture des fichiers CAMB, cmv 24/07/2010

File:

• trunk/Cosmo/SimLSS/cmvfitpk.cc (modified) (5 diffs)

trunk/Cosmo/SimLSS/cmvfitpk.cc

@@ -26 +26 @@
 class MyFCN : public FCNBase {
 public:
-  MyFCN(HistoErr& herr,PkSpectrumZ& pk);
+  MyFCN(HistoErr& herr,PkEisenstein& pk);
   void Init(const vector<double>& par) const;
   double Func(double x,const vector<double>& par) const;
@@ -33 +33 @@
 private:
   HistoErr& herr_;
-  PkSpectrumZ& pk_;
+  PkEisenstein& pk_;
 };
 } }  // namespace ROOT + Minuit2
@@ -84 +84 @@
  // --- Create spectrum
  cout<<endl<<"\n--- Create Spectrum"<<endl;
- InitialSpectrum pkini(ns,as);
+ InitialPowerLaw pkini(ns,as);
  bool nobaryon = false;
  double ocdm0 = om0-ob0;
  TransfertEisenstein tf(h100,ocdm0,ob0,T_CMB_Par,nobaryon);
- GrowthFactor growth(om0,ol0); cout<<"...Growth="<<growth(zref)<<endl;
- PkSpectrum0 pk0(pkini,tf);
- PkSpectrumZ pkz(pk0,growth,zref);
+ GrowthEisenstein growth(om0,ol0); cout<<"...Growth="<<growth(zref)<<endl;
+ PkEisenstein pkz(pkini,tf,growth,zref);
 
  // --- Compute variance and normalize spectrum
@@ -256 +255 @@
 
 //--------------------------------------------------
-MyFCN::MyFCN(HistoErr& herr,PkSpectrumZ& pk)
+MyFCN::MyFCN(HistoErr& herr,PkEisenstein& pk)
   : herr_(herr) , pk_(pk)
 {
@@ -264 +263 @@
 {
  double A=par[1], Ocdm0=par[2], Ob0=par[3], Ol0=par[4], h100=par[5], ns=par[6];
- pk_.GetPk0().GetPkIni().SetSlope(ns);
- pk_.GetPk0().GetPkIni().SetNorm(A);
- pk_.GetPk0().GetTransfert().SetParTo(h100,Ocdm0,Ob0);
+ pk_.GetPkIni().SetSlope(ns);
+ pk_.GetPkIni().SetNorm(A);
+ pk_.GetTransfert().SetParTo(h100,Ocdm0,Ob0);
  pk_.GetGrowthFactor().SetParTo(Ocdm0+Ob0,Ol0);
 }