Changeset 3345 in Sophya for trunk/Cosmo/SimLSS

Timestamp:

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

Author:

cmv

Message:

test compatibilite relecture fichier SchechterMassDist, cmv 09102007

Location:

trunk/Cosmo/SimLSS

Files:

• cmvobserv3d.cc (modified) (1 diff)
• schechter.cc (modified) (1 diff)
• schechter.h (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;
  }

trunk/Cosmo/SimLSS/schechter.cc

@@ -415 +415 @@
   sch2.GetParam(nstar2,mstar2,alpha2);
 
+  // nstar et mstar ne sont jamais nuls
   if(fabs(nstar1-nstar2)>fabs(nstar1+nstar2)/2.*eps) return false;
   if(fabs(mstar1-mstar2)>fabs(mstar1+mstar2)/2.*eps) return false;
+
+  // alpha peut etre eventuellement nul
+  if(fabs(alpha1)<1.e-100 && fabs(alpha2)<1.e-100 && fabs(alpha1-alpha2)>eps) return false;
   if(fabs(alpha1-alpha2)>fabs(alpha1+alpha2)/2.*eps) return false;
   return true;

trunk/Cosmo/SimLSS/schechter.h

@@ -46 +46 @@
   int GetNgalLim(int& ngalmax,int& ngalmin);
   int GetNgalLim(void) {return nvalngal_;}
-  Schechter GetSchechter(void) {return sch_;}
+  Schechter& GetSchechter(void) {return sch_;}
 
   inline int IndexFrNGal(int ngal) {