Changeset 3149 in Sophya for trunk/SophyaPI/PIext/pihisto2d.cc

Timestamp:

Jan 18, 2007, 7:21:49 PM (19 years ago)

Author:

cmv

Message:

suite adaptation travail reza 2D et adapteur + adaptation aux modifs HistoErr cmv 18/01/2007

File:

• trunk/SophyaPI/PIext/pihisto2d.cc (modified) (15 diffs)

trunk/SophyaPI/PIext/pihisto2d.cc

@@ -51 +51 @@
       mRetFg = 0;
     }    
-    else if(opts.substr(0,8) == "hbinerr") {
+    else if(opts.substr(0,7) == "hbinerr") {
       mRetFg = 1;
     }    
-    else if(opts.substr(0,8) == "hbinent") {
+    else if(opts.substr(0,7) == "hbinent") {
       mRetFg = 2;
     }    
@@ -157 +157 @@
 
 //++
-void PIHisto2D::UseScale(unsigned short type,float logscale)
+void PIHisto2D::UseScale(unsigned short type,double logscale)
 //
 //      Pour changer les echelles (lineaire ou logarithmique)
@@ -184 +184 @@
 
 //++
-void PIHisto2D::UseDisplay(unsigned short type,float fnpt)
+void PIHisto2D::UseDisplay(unsigned short type,double fnpt)
 //
 //      Type de Display
@@ -212 +212 @@
 
 //++
-void PIHisto2D::UseDyn(float fmin,float fmax)
+void PIHisto2D::UseDyn(double fmin,double fmax)
 //
 //      Gestion de la dynamique a representer:
@@ -224 +224 @@
 //--
 {
-  if( (mHistoWp) && (mHistoWp->NBinX()>0) && (mHistoWp->NBinY()>0) && (fmin>=fmax) ) {
-    double v,hmin,hmax;
-    hmin = hmax = (*mHistoWp)(0,0);
-    for (int_4 i=0; i<mHistoWp->NBinX(); i++) 
-      for (int_4 j=0; j<mHistoWp->NBinY(); j++) {
-        v = (*mHistoWp)(i, j);
-        if(v<hmin) hmin = v;
-        if(v>hmax) hmax = v;
-      }
-    fmin = hmin;  fmax = hmax;   // $CHECK$ CMV : attention, double vers float !!
-  }
-
-// $CHECK$ CMV : Ne faut-il pas passer les attributs de la classe en double ??
+if( (mHistoWp) && (mHistoWp->NBinX()>0) && (mHistoWp->NBinY()>0) && (fmin>=fmax) ) {
+  double v,hmin,hmax;
+  hmin = hmax = (*mHistoWp)(0,0);
+  for (int_4 i=0; i<mHistoWp->NBinX(); i++) 
+    for (int_4 j=0; j<mHistoWp->NBinY(); j++) {
+      v = (*mHistoWp)(i, j);
+      if(v<hmin) hmin = v;
+      if(v>hmax) hmax = v;
+    }
+  fmin = hmin;  fmax = hmax;
+}
+
 if(fmin>=fmax) fmax = fmin+1.;
 mHMin = fmin; mHMax = fmax;
@@ -242 +241 @@
 
 //++
-void PIHisto2D::UseFrac(float frmin,float frmax)
+void PIHisto2D::UseFrac(double frmin,double frmax)
 //
 //      Pour definir la fraction de la dynamique a dessiner:
@@ -274 +273 @@
 printf("                 Dyn=%g,%g Frac=%g,%g LogSc=%g H=%p\n"
       ,mHMin,mHMax,mFracMin,mFracMax,mLogScale,mHistoWp);
-// if(lp>=1) mHistoWp->PrintStatus();  $CHECK$ CMV : que faut-il faire ? 
 fflush(stdout);
 }
@@ -352 +350 @@
 
 // Gamme a representer entre [0,1] mais >=fracmin et scale fracmax
-float fracmin=FMin(), fracmax=FMax();
-float llscale = (float) log10((double)LogScale());
+double fracmin=FMin(), fracmax=FMax();
+double llscale = log10(LogScale());
 
 // gestion Couleurs.
@@ -377 +375 @@
 if(mTypDisp==1) {
   g->SelMarker(1,PI_DotMarker);
-  npt = (int) ((float)NPixBin(g)*FPoints()); if(npt<=0) npt = 2;
+  npt = (int)(NPixBin(g)*FPoints()); if(npt<=0) npt = 2;
 }
 
@@ -400 +398 @@
 
   // Gestion de la dynamique a dessiner
-  float frac = ((*mHistoWp)(i,j)-HMin())/(HMax()-HMin());
+  double frac = ((*mHistoWp)(i,j)-HMin())/(HMax()-HMin());
   if(frac<0.) continue;
   if(mTypScal==1) {              // echelle log10
@@ -408 +406 @@
   if(frac<=fracmin) continue;
   if(frac>1.) frac = 1.;
-  float fracred = frac * fracmax;
+  double fracred = frac * fracmax;
 
   // Gestion de la couleur
   int icol = 0;
   if (cmap) {
-    icol = int( (float) ncol*frac );
+    icol = int(ncol*frac);
     if(icol>=ncol) icol = ncol-1; else if(icol<0) icol=0;
     g->SelForeground(*cmap,icol);
@@ -431 +429 @@
   } else if(mTypDisp==1) {
     //..... nuage de points .....
-    int ipt  = int( (float) npt *frac );
+    int ipt  = int(npt *frac);
     for(int k=0;k<ipt;k++) {
       double x = left0 + frand01()*dx;
@@ -559 +557 @@
 
 //++
-char PIHisto2D::HPrint2(float f)
+char PIHisto2D::HPrint2(double f)
 //
 //      Codage des valeurs en caracteres (fct privee).
@@ -638 +636 @@
       SetStats(false);
     } else  if(opts.substr(0,11) == "statposoff=") {
-      float xo=0., yo=0.;
-      sscanf(opts.substr(11).c_str(),"%g,%g",&xo, &yo);
+      double xo=0., yo=0.;
+      sscanf(opts.substr(11).c_str(),"%lf,%lf",&xo, &yo);
       SetStatPosOffset(xo, yo);
     } else if(opts.substr(0,8)=="h2scale=") {
-      unsigned short t=TypScale(); float ls=LogScale();
+      unsigned short t=TypScale(); double ls=LogScale();
       if(opts.substr(8,3)=="lin") t=0;
       else if(opts.substr(8,3)=="log")
-        {t=1; sscanf(opts.c_str(),"h2scale=log,%g",&ls);}
+        {t=1; sscanf(opts.c_str(),"h2scale=log,%lf",&ls);}
       UseScale(t,ls);
     } else if(opts.substr(0,7)=="h2disp=") {
-      unsigned short t=TypDisplay(); float fpts=FPoints();
+      unsigned short t=TypDisplay(); double fpts=FPoints();
       if(opts.substr(7,3)=="var") t=0;
       else if(opts.substr(7,3)=="hbk") t=2;
       else if(opts.substr(7,3)=="img") t=3;
       else if(opts.substr(7,3)=="pts")
-        {t=1; sscanf(opts.c_str(),"h2disp=pts,%g",&fpts);}
+        {t=1; sscanf(opts.c_str(),"h2disp=pts,%lf",&fpts);}
       UseDisplay(t,fpts);
     } else if(opts.substr(0,6)=="h2dyn=") {
-      float hmin=HMin(),hmax=HMax(); size_t q = opts.find(',');
-      sscanf(opts.c_str(),"h2dyn=%g",&hmin);
-      if(q<opts.length()-1) sscanf(opts.substr(q+1).c_str(),"%g",&hmax);
+      double hmin=HMin(),hmax=HMax(); size_t q = opts.find(',');
+      sscanf(opts.c_str(),"h2dyn=%lf",&hmin);
+      if(q<opts.length()-1) sscanf(opts.substr(q+1).c_str(),"%lf",&hmax);
       UseDyn(hmin,hmax);
     } else if(opts.substr(0,7)=="h2frac=") {
-      float fmin=FMin(),fmax=FMax(); size_t q = opts.find(',');
-      sscanf(opts.c_str(),"h2frac=%g",&fmin);
-      if(q<opts.length()-1) sscanf(opts.substr(q+1).c_str(),"%g",&fmax);
+      double fmin=FMin(),fmax=FMax(); size_t q = opts.find(',');
+      sscanf(opts.c_str(),"h2frac=%lf",&fmin);
+      if(q<opts.length()-1) sscanf(opts.substr(q+1).c_str(),"%lf",&fmax);
       UseFrac(fmin,fmax);
    } else {
@@ -1077 +1075 @@
 
 else if(opt==6001) {
-  sscanf(mText[0]->GetText().c_str(),"%g %g",&mHMin,&mHMax);
-  sscanf(mText[1]->GetText().c_str(),"%g %g",&mFracMin,&mFracMax);
-  sscanf(mText[2]->GetText().c_str(),"%g",&mLogScale);
+  sscanf(mText[0]->GetText().c_str(),"%lf %lf",&mHMin,&mHMax);
+  sscanf(mText[1]->GetText().c_str(),"%lf %lf",&mFracMin,&mFracMax);
+  sscanf(mText[2]->GetText().c_str(),"%lf",&mLogScale);
   mpih->UseColors(mFgCol,mCmap,mRevCmap);
   mpih->UseScale(mTypScal,mLogScale);