Changeset 3345 in Sophya for trunk/Cosmo/SimLSS/cmvobserv3d.cc

Timestamp:

Oct 9, 2007, 2:08:31 PM (18 years ago)

Author:

cmv

Message:

test compatibilite relecture fichier SchechterMassDist, cmv 09102007

File:

• trunk/Cosmo/SimLSS/cmvobserv3d.cc (modified) (1 diff)

trunk/Cosmo/SimLSS/cmvobserv3d.cc

@@ -327 +327 @@
  SchechterMassDist schmdist(sch,schmin,schmax,schnpt);
  if(use_schmassdist && schmassdistfile.size()>0) {
-   cout<<"\nWARNING: SchechterMassDist read from "<<schmassdistfile<<endl
-       <<"      PLEASE CHECK CONSISTENCY WITH REQUESTED PARAMETERS"<<endl;
+   cout<<"\nSchechterMassDist read from "<<schmassdistfile<<endl;
    schmdist.ReadPPF(schmassdistfile);
+   bool compsch = IsCompatible(sch,schmdist.GetSchechter());
+   double m1,m2; schmdist.GetMassLim(m1,m2);
+   if( !compsch || fabs(m1-schmin)>1e-4*schmin || fabs(m2-schmax)>1e-4*schmax) {
+     cout<<"FATAL_ERROR: INCONSISTENT SchechterMassDist file / Schechter or limits"<<endl;
+     cout<<"Schechter:"<<endl; sch.Print();
+     cout<<"schmin="<<schmin<<" schmax="<<schmax<<endl;
+     cout<<"SchechterMassDist:"<<endl; schmdist.Print();
+     return -10;
+   }
    recompute_schmassdist = false;
  }