Changeset 3461 in Sophya for trunk/SophyaPI

Timestamp:

Feb 13, 2008, 12:24:11 PM (18 years ago)

Author:

cmv

Message:

• modifs sur le nombres de valeurs a traiter dans ComputLut_Range (gestion de nmax)
• changement "bin=binmax+(nbsig*sigr)" -> "bin=binmax+int(nbsig*sigr)" pour eviter les warning compilation "int from double"

cmv 13/02/2008

File:

• trunk/SophyaPI/PI/parradapter.cc (modified) (5 diffs)

trunk/SophyaPI/PI/parradapter.cc

@@ -335 +335 @@
 q = phis+binmax;
 while ( ((*q) > hmin) && (sigr < (nbin-binmax)) )  { sigr++;  q++; }
-if (sigr < 1) sigr = 1.;
+if (sigr < 1) sigr = 1;
 int sigl = 0;
 q = phis+binmax;
 while ( ((*q) > hmin) && (sigl < binmax) )  { sigl++; q--; }
-if (sigl < 1) sigl = 1.;
+if (sigl < 1) sigl = 1;
 
 if (nbsig <= 0.) nbsig = 1.;
 if (htail == false)  {  /*   On recherche le min/max autour du pic de l'histo  */
-  if ( (bin = binmax-(nbsig*sigl)) < 0 )  bin = 0;
+  if ( (bin = binmax-int(nbsig*sigl)) < 0 )  bin = 0;
   min = minhis + (double)bin*binwidth;
-  if ( (bin = binmax+(nbsig*sigr)) >= nbin ) bin = nbin-1;
+  if ( (bin = binmax+int(nbsig*sigr)) >= nbin ) bin = nbin-1;
   max = minhis + (double)bin*binwidth;
   if (max < (min+MINDYNAMIC))  max = min+MINDYNAMIC;
@@ -352 +352 @@
 
 //  On recherche le min/max en supprimant le pic de l'histo  (la queue, > pic)
-if ( (bin = binmax+(nbsig*sigl)) >= nbin ) {
+if ( (bin = binmax+int(nbsig*sigl)) >= nbin ) {
   min = minhis + binmax*binwidth;
   max = maxhis;
@@ -380 +380 @@
 int P2DArrayAdapter::ComputeLut_Range(double& min, double& max, double fracmin, double fracmax,int nmax)
 // Compute min and max by throwing away the "fracmin" lowest values and the "fracmax" greatest values
-// Use 1 value over "vit". Maximum number values to be used is "nmax".
-// Si echec alors min,max restent inchanges.
-{
-  int lp=0;
+// .."fracmin" in [0,1[  and   "fracmax" in [0,1[. If not they are set to zero.
+// ..If min<max, use only the values inside [min,max]
+// ..Maximum number values to be used is "nmax" (uniformly spread)
+//     if "nmax" is in [-100,0[ take "-nmax%" values (-nmax/100*sX*sY)
+//     if "nmax=0" or "nmax<-100" take all the values (sX*sY)
+// ..If failed: min,max stay unchanged.
+{
+ int lp=0;
  if(fracmin<0. || fracmin>=1.) fracmin=0.;
  if(fracmax<0. || fracmax>=1.) fracmax=0.;
- if(nmax<10) nmax = 5000;
+ if(nmax>=-100 && nmax<0) nmax = int(-nmax/100. * sX*sY);
+ if(nmax<=2) nmax = sX*sY;
 
  int vit = sX*sY/nmax;  // Not too many values, we are using qsort !
@@ -398 +403 @@
  nmax = sX*sY/vit;
 
- double *buff = new double[nmax];
+ double *buff = new double[nmax+1]; // +1 pour protection si sX=sY=0
 
  if(lp) {printf("ComputeLut_Range: sX*sY=%d fracmin=%g fracmax=%g nmax=%d min=%g max=%g\n"
@@ -411 +416 @@
  }
 
- if(nfill<1) {delete [] buff; return nfill;}
+ if(nfill<=1) {delete [] buff; return nfill;}
 
  qsort(buff,(size_t) nfill,sizeof(double),qSort_Dble);