Changeset 3348 in Sophya for trunk/Cosmo/SimLSS/cmvtvarspec.cc

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/cmvtvarspec.cc (modified) (1 diff)

trunk/Cosmo/SimLSS/cmvtvarspec.cc

@@ -91 +91 @@
  //----
  cout<<endl<<"Filtrage top_hat"<<endl;
- VarianceSpectrum varpk_th(pkz,0);
- double kfind_th = varpk_th.FindMaximum(R,kmin,kmax,eps);
+ VarianceSpectrum varpk_th(pkz,R,VarianceSpectrum::TOPHAT);
+ double kfind_th = varpk_th.FindMaximum(kmin,kmax,eps);
  double pkmax_th = varpk_th(kfind_th);
  cout<<"kfind_th = "<<kfind_th<<" ("<<log10(kfind_th)<<"), integrand="<<pkmax_th<<endl;
  k1=kmin, k2=kmax;
- rc = varpk_th.FindLimits(R,pkmax_th*fracmax,k1,k2,eps);
+ rc = varpk_th.FindLimits(pkmax_th*fracmax,k1,k2,eps);
  cout<<"limit_th: rc="<<rc<<" : "<<k1<<" ("<<log10(k1)<<") , "<<k2<<" ("<<log10(k2)<<")"<<endl;
 
  varpk_th.SetInteg(0.01,dlk,-1.,4);
- cout<<"varpk_th="<<varpk_th.Variance(R,k1,k2)<<endl;
+ cout<<"varpk_th="<<varpk_th.Variance(k1,k2)<<endl;
 
  //----
  cout<<endl<<"Filtrage gaussien"<<endl;
- VarianceSpectrum varpk_ga(pkz,1);
- double kfind_ga = varpk_ga.FindMaximum(Rg,kmin,kmax,eps);
+ VarianceSpectrum varpk_ga(pkz,Rg,VarianceSpectrum::GAUSSIAN);
+ double kfind_ga = varpk_ga.FindMaximum(kmin,kmax,eps);
  double pkmax_ga = varpk_ga(kfind_ga);
  cout<<"kfind_ga = "<<kfind_ga<<" -> "<<log10(kfind_ga)<<", integrand="<<pkmax_ga<<endl;
  k1=kmin, k2=kmax;
- rc = varpk_ga.FindLimits(Rg,pkmax_ga*fracmax,k1,k2,eps);
+ rc = varpk_ga.FindLimits(pkmax_ga*fracmax,k1,k2,eps);
  cout<<"limit_ga: rc="<<rc<<" : "<<k1<<" ("<<log10(k1)<<") , "<<k2<<" ("<<log10(k2)<<")"<<endl;
 
  varpk_ga.SetInteg(0.01,dlk,-1.,4);
- cout<<"varpk_ga="<<varpk_ga.Variance(Rg,k1,k2)<<endl;
+ cout<<"varpk_ga="<<varpk_ga.Variance(k1,k2)<<endl;
  
  //----
   cout<<endl<<"Filtrage 1 (integrale du spectre)"<<endl;
- VarianceSpectrum varpk_int(pkz,2);
- double kfind_int = varpk_int.FindMaximum(Rg,kmin,kmax,eps);
+ VarianceSpectrum varpk_int(pkz,Rg,VarianceSpectrum::NOFILTER);
+ double kfind_int = varpk_int.FindMaximum(kmin,kmax,eps);
  double pkmax_int = varpk_int(kfind_int);
  cout<<"kfind_int = "<<kfind_int<<" -> "<<log10(kfind_int)<<", integrand="<<pkmax_int<<endl;
  k1=kmin, k2=kmax;
- rc = varpk_int.FindLimits(Rg,pkmax_int*fracmax,k1,k2,eps);
+ rc = varpk_int.FindLimits(pkmax_int*fracmax,k1,k2,eps);
  cout<<"limit_int: rc="<<rc<<" : "<<k1<<" ("<<log10(k1)<<") , "<<k2<<" ("<<log10(k2)<<")"<<endl;
 
  varpk_int.SetInteg(0.01,dlk,-1.,4);
- cout<<"varpk_int="<<varpk_int.Variance(Rg,k1,k2)<<endl;
+ cout<<"varpk_int="<<varpk_int.Variance(k1,k2)<<endl;
  
 //-----------------------------------------------------------------