Changeset 3320 in Sophya for trunk/Cosmo/SimLSS/cmvtstsch.cc

Timestamp:

Sep 5, 2007, 9:58:05 AM (18 years ago)

Author:

cmv

Message:

intro SchechterMassDist pour accelerer la simulations cmv 05/09/2007

File:

• trunk/Cosmo/SimLSS/cmvtstsch.cc (modified) (2 diffs)

trunk/Cosmo/SimLSS/cmvtstsch.cc

@@ -93 +93 @@
  cout<<"......"<<endl;
  for(double lnx=lnx1-3.;lnx<=lnx2-1.;lnx+=1.) {
-   double num = IntegrateFuncLog(sch,lnx,lnx2,perc,dlxinc,dlxmax,glorder);
-   cout<<"["<<lnx<<","<<lnx2<<"] integrated number = "<<num<<" Mpc^-3"<<endl;
+   double num = sch.Integrate(pow(10.,lnx),pow(10.,lnx2),npt);
+   double numc = IntegrateFuncLog(sch,lnx,lnx2,perc,dlxinc,dlxmax,glorder);
+   cout<<"["<<lnx<<","<<lnx2<<"] integrated number = "<<num<<" Mpc^-3 , check: "<<numc<<endl;
  }
  cout<<"......"<<endl;
  for(double lnx=lnx1+1.;lnx<=lnx2+3.;lnx+=1.) {
-   double num = IntegrateFuncLog(sch,lnx1,lnx,perc,dlxinc,dlxmax,glorder);
-   cout<<"["<<lnx1<<","<<lnx<<"] integrated number = "<<num<<" Mpc^-3"<<endl;
+   double num = sch.Integrate(pow(10.,lnx1),pow(10.,lnx),npt);
+   double numc = IntegrateFuncLog(sch,lnx1,lnx,perc,dlxinc,dlxmax,glorder);
+   cout<<"["<<lnx1<<","<<lnx<<"] integrated number = "<<num<<" Mpc^-3 , check: "<<numc<<endl;
  }
  cout<<"......"<<endl;
  for(double lnx=lnx1-3.;lnx<=lnx2+3.;lnx+=1.) {
-   double num = IntegrateFuncLog(sch,lnx,lnx+1.,perc,dlxinc,dlxmax,glorder);
-   cout<<"["<<lnx<<","<<lnx+1.<<"] integrated number = "<<num<<" Mpc^-3"<<endl;
+   double num = sch.Integrate(pow(10.,lnx),pow(10.,lnx+1.),npt);
+   double numc = IntegrateFuncLog(sch,lnx,lnx+1.,perc,dlxinc,dlxmax,glorder);
+   cout<<"["<<lnx<<","<<lnx+1.<<"] integrated number = "<<num<<" Mpc^-3 , check: "<<numc<<endl;
  }
  Histo hdndm(lnx1,lnx2,npt); hdndm.ReCenterBin();
@@ -115 +118 @@
  cout<<"......"<<endl;
  for(double lnx=lnx1-3.;lnx<=lnx2-1.;lnx+=1.) {
-   double sum = IntegrateFuncLog(sch,lnx,lnx2,perc,dlxinc,dlxmax,glorder);
-   cout<<"["<<lnx<<","<<lnx2<<"] integrated mass = "<<sum<<" Msol.Mpc^-3"<<endl;
+   double sum = sch.Integrate(pow(10.,lnx),pow(10.,lnx2),npt);
+   double sumc = IntegrateFuncLog(sch,lnx,lnx2,perc,dlxinc,dlxmax,glorder);
+   cout<<"["<<lnx<<","<<lnx2<<"] integrated mass = "<<sum<<" Msol.Mpc^-3 , check: "<<sumc<<endl;
  }
  cout<<"......"<<endl;
  for(double lnx=lnx1+1.;lnx<=lnx2+3.;lnx+=1.) {
-   double sum = IntegrateFuncLog(sch,lnx1,lnx,perc,dlxinc,dlxmax,glorder);
-   cout<<"["<<lnx1<<","<<lnx<<"] integrated mass = "<<sum<<" Msol.Mpc^-3"<<endl;
+   double sum = sch.Integrate(pow(10.,lnx1),pow(10.,lnx),npt);
+   double sumc = IntegrateFuncLog(sch,lnx1,lnx,perc,dlxinc,dlxmax,glorder);
+   cout<<"["<<lnx1<<","<<lnx<<"] integrated mass = "<<sum<<" Msol.Mpc^-3 , check: "<<sumc<<endl;
  }
  cout<<"......"<<endl;
  for(double lnx=lnx1-3.;lnx<=lnx2+3.;lnx+=1.) {
-   double sum = IntegrateFuncLog(sch,lnx,lnx+1.,perc,dlxinc,dlxmax,glorder);
-   cout<<"["<<lnx<<","<<lnx+1.<<"] integrated mass = "<<sum<<" Msol.Mpc^-3"<<endl;
+   double sum = sch.Integrate(pow(10.,lnx),pow(10.,lnx+1.),npt);
+   double sumc = IntegrateFuncLog(sch,lnx,lnx+1.,perc,dlxinc,dlxmax,glorder);
+   cout<<"["<<lnx<<","<<lnx+1.<<"] integrated mass = "<<sum<<" Msol.Mpc^-3 , check: "<<sumc<<endl;
  }
  Histo hmdndm(lnx1,lnx2,npt); hmdndm.ReCenterBin();