Changeset 3248 in Sophya for trunk/Cosmo

Timestamp:

May 15, 2007, 12:08:20 PM (18 years ago)

Author:

cmv

Message:

correction erreur format dans sscanf cmv 15/05/2007

Location:

trunk/Cosmo/SimLSS

Files:

• cmvdefsurv.cc (modified) (2 diffs)
• cmvtstblack.cc (modified) (1 diff)
• cmvtuniv.cc (modified) (1 diff)

trunk/Cosmo/SimLSS/cmvdefsurv.cc

@@ -115 +115 @@
     break;
   case 'U' :
-    sscanf(optarg,"%lf,%lf,%lf,%lf,%u",&h100,&om0,&ol0,&w0,&flat);
+    sscanf(optarg,"%lf,%lf,%lf,%lf,%hu",&h100,&om0,&ol0,&w0,&flat);
     break;
   case '2' :
@@ -375 +375 @@
 
  double smass = mhiref/ssig*slim;
- cout<<"\nSigma noise equivalent = "<<smass<<" Msol"<<endl;
+ cout<<"\nSigma noise equivalent = "<<smass<<" Msol (1 lobe)"<<endl;
+ double smass_nl = mhiref/ssig*slim_nl;
+ cout<<"\nSigma noise equivalent = "<<smass_nl<<" Msol ("<<nlobes<<" lobes)"<<endl;
 
  return 0;

trunk/Cosmo/SimLSS/cmvtstblack.cc

@@ -27 +27 @@
  if(narg>1) sscanf(arg[1],"%lf,%lf",&T,&nutest);
  if(T<=0.) T = 2.718;
- if(narg>2) sscanf(arg[2],"%u",&deriv);
+ if(narg>2) sscanf(arg[2],"%hu",&deriv);
  if(deriv!=0) deriv = 1;
 

trunk/Cosmo/SimLSS/cmvtuniv.cc

@@ -43 +43 @@
 
  double perc=0.01,dzinc=-1.,dzmax=5.; unsigned short glorder=4;
- if(narg>2) sscanf(arg[2],"%lf,%lf,%lf,%u",&perc,&dzinc,&dzmax,&glorder);
+ if(narg>2) sscanf(arg[2],"%lf,%lf,%lf,%hu",&perc,&dzinc,&dzmax,&glorder);
  if(dzinc<=0.) dzinc = dz/2.;
  cout<<" perc="<<perc<<" dzinc="<<dzinc<<" dzmax="<<dzmax<<" glorder="<<glorder<<endl;