Changeset 3247 in Sophya for trunk/SophyaLib/HiStats

Timestamp:

May 15, 2007, 11:49:12 AM (18 years ago)

Author:

cmv

Message:

correction erreur format dans sscanf cmv 15/05/2007

Location:

trunk/SophyaLib/HiStats

Files:

• hist2err.cc (modified) (3 diffs)
• histerr.cc (modified) (3 diffs)

trunk/SophyaLib/HiStats/hist2err.cc

@@ -285 +285 @@
   for(long i=0;i<NBinX();i++) for(long j=0;j<NBinY();j++) {
     // ligne = i*NY+j
-    fprintf(file,"%d %d %.17e %.17e %.0f\n"
+    fprintf(file,"%ld %ld %.17e %.17e %.0f\n"
            ,i,j,(*this)(i,j),Error2(i,j),NEntBin(i,j));
   }
@@ -313 +313 @@
 
       r_8 xmin,xmax,wx, ymin,ymax,wy; long mnmean=1;
-      sscanf(line,"%d %lf %lf %lf %d %lf %lf %lf %d"
+      sscanf(line,"%ld %lf %lf %lf %ld %lf %lf %lf %ld"
             ,&nbinx,&xmin,&xmax,&wx
             ,&nbiny,&ymin,&ymax,&wy
@@ -327 +327 @@
 
       long i,j; r_8 v,e2,nb;
-      sscanf(line,"%d %d %lf %lf %lf",&i,&j,&v,&e2,&nb);
+      sscanf(line,"%ld %ld %lf %lf %lf",&i,&j,&v,&e2,&nb);
       SetBin(i,j,v);
       SetErr2(i,j,e2);

trunk/SophyaLib/HiStats/histerr.cc

@@ -292 +292 @@
   fprintf(file,"%ld %.17e %.17e %d\n",(long)NBins(),XMin(),XMax(),NMean());
   for(long i=0;i<NBins();i++) {
-      fprintf(file,"%d %.17e %.17e %.17e %.0f\n"
+      fprintf(file,"%ld %.17e %.17e %.17e %.0f\n"
              ,i,BinCenter(i),(*this)(i),Error2(i),NEntBin(i));
   }
@@ -320 +320 @@
 
       r_8 xmin,xmax; long mnmean=1;
-      sscanf(line,"%d %lf %lf %d",&nbin,&xmin,&xmax,&mnmean);
+      sscanf(line,"%ld %lf %lf %ld",&nbin,&xmin,&xmax,&mnmean);
       if(nbin<=0) {
         cout<<"HistoErr::ReadASCII_Error: nbin= "<<nbin<<endl;
@@ -331 +331 @@
 
       long i; r_8 x,v,e2,nb;
-      sscanf(line,"%d %lf %lf %lf %lf",&i,&x,&v,&e2,&nb);
+      sscanf(line,"%ld %lf %lf %lf %lf",&i,&x,&v,&e2,&nb);
       SetBin(i,v);
       SetErr2(i,e2);