fixing tolerance for xmin

src/DIS_new/ExternalDISOperator.f

@@ -92,11 +92,12 @@ function ExternalDISOperator(SF,ihq,i,x,beta)
          tau = 1d0 + 4d0 * rhop * x**2d0
          xi  = 2d0 * x / ( 1d0 + dsqrt(tau) )
 *
-         if(xi.lt.xmin(1).or.xi.gt.xmax+tol)then
+         if(xi.lt.xmin(1)-tol.or.xi.gt.xmax+tol)then
             write(6,*) "In ExternalDISOperator.f:"
             write(6,*) "Invalid value of x =",xi
             call exit(-10)
          endif
+         if (xi.lt.xmin(1)) xi = xmin(1)
          if (xi.gt.xmax) xi = 1d0
 *
 *     interpolate
@@ -135,11 +136,12 @@ function ExternalDISOperator(SF,ihq,i,x,beta)
             enddo
          endif
       else
-         if(x.lt.xmin(1).or.x.gt.xmax+tol)then
+         if(x.lt.xmin(1)-tol.or.x.gt.xmax+tol)then
             write(6,*) "In ExternalDISOperator.f:"
             write(6,*) "Invalid value of x =",x
             call exit(-10)
          endif
+         if (x.lt.xmin(1)) x = xmin(1)
          if (x.gt.xmax) x = 1d0
 *
 *     interpolate

src/DIS_new/F2bottom.f

@@ -40,11 +40,12 @@ function F2bottom(x)
          c1 = x**2d0 / xi**2d0 / tau**1.5d0
          c2 = 6d0 * rhop * x**3d0 / tau**2d0
 *
-         if(xi.lt.xmin(1).or.xi.gt.xmax+tol)then
+         if(xi.lt.xmin(1)-tol.or.xi.gt.xmax+tol)then
             write(6,*) "In F2bottom.f:"
             write(6,*) "Invalid value of x =",xi
             call exit(-10)
          endif
+         if (xi.lt.xmin(1)) xi = xmin(1)
          if (xi.gt.xmax) xi = 1d0
 *
 *     Interpolation
@@ -57,11 +58,12 @@ function F2bottom(x)
          enddo
          if(dabs(F2bottom).le.1d-14) F2bottom = 0d0
       else
-         if(x.lt.xmin(1).or.x.gt.xmax+tol)then
+         if(x.lt.xmin(1)-tol.or.x.gt.xmax+tol)then
             write(6,*) "In F2bottom.f:"
             write(6,*) "Invalid value of x =",x
             call exit(-10)
          endif
+         if (x.lt.xmin(1)) x = xmin(1)
          if (x.gt.xmax) x = 1d0
 *
 *     Interpolation

src/DIS_new/F2charm.f

@@ -40,11 +40,12 @@ function F2charm(x)
          c1 = x**2d0 / xi**2d0 / tau**1.5d0
          c2 = 6d0 * rhop * x**3d0 / tau**2d0
 *
-         if(xi.lt.xmin(1).or.xi.gt.xmax+tol)then
+         if(xi.lt.xmin(1)-tol.or.xi.gt.xmax+tol)then
             write(6,*) "In F2charm.f:"
             write(6,*) "Invalid value of x =",xi
             call exit(-10)
          endif
+         if (xi.lt.xmin(1)) xi = xmin(1)
          if (xi.gt.xmax) xi = 1d0
 *
 *     Interpolation
@@ -57,11 +58,12 @@ function F2charm(x)
          enddo
          if(dabs(F2charm).le.1d-14) F2charm = 0d0
       else
-         if(x.lt.xmin(1).or.x.gt.xmax+tol)then
+         if(x.lt.xmin(1)-tol.or.x.gt.xmax+tol)then
             write(6,*) "In F2charm.f:"
             write(6,*) "Invalid value of x =",x
             call exit(-10)
          endif
+         if (x.lt.xmin(1)) x = xmin(1)
          if (x.gt.xmax) x = 1d0
 *
 *     Interpolation

src/DIS_new/F2light.f

@@ -40,11 +40,12 @@ function F2light(x)
          c1 = x**2d0 / xi**2d0 / tau**1.5d0
          c2 = 6d0 * rhop * x**3d0 / tau**2d0
 *
-         if(xi.lt.xmin(1).or.xi.gt.xmax+tol)then
+         if(xi.lt.xmin(1)-tol.or.xi.gt.xmax+tol)then
             write(6,*) "In F2light.f:"
             write(6,*) "Invalid value of x =",xi
             call exit(-10)
          endif
+         if (xi.lt.xmin(1)) xi = xmin(1)
          if (xi.gt.xmax) xi = 1d0
 *
 *     Interpolation
@@ -57,11 +58,12 @@ function F2light(x)
          enddo
          if(dabs(F2light).le.1d-14) F2light = 0d0
       else
-         if(x.lt.xmin(1).or.x.gt.xmax+tol)then
+         if(x.lt.xmin(1)-tol.or.x.gt.xmax+tol)then
             write(6,*) "In F2light.f:"
             write(6,*) "Invalid value of x =",x
             call exit(-10)
          endif
+         if (x.lt.xmin(1)) x = xmin(1)
          if (x.gt.xmax) x = 1d0
 *
 *     Interpolation

src/DIS_new/F2top.f

@@ -40,11 +40,12 @@ function F2top(x)
          c1 = x**2d0 / xi**2d0 / tau**1.5d0
          c2 = 6d0 * rhop * x**3d0 / tau**2d0
 *
-         if(xi.lt.xmin(1).or.xi.gt.xmax+tol)then
+         if(xi.lt.xmin(1)-tol.or.xi.gt.xmax+tol)then
             write(6,*) "In F2top.f:"
             write(6,*) "Invalid value of x =",xi
             call exit(-10)
          endif
+         if (xi.lt.xmin(1)) xi = xmin(1)
          if (xi.gt.xmax) xi = 1d0
 *
 *     Interpolation
@@ -57,11 +58,12 @@ function F2top(x)
          enddo
          if(dabs(F2top).le.1d-14) F2top = 0d0
       else
-         if(x.lt.xmin(1).or.x.gt.xmax+tol)then
+         if(x.lt.xmin(1)-tol.or.x.gt.xmax+tol)then
             write(6,*) "In F2top.f:"
             write(6,*) "Invalid value of x =",x
             call exit(-10)
          endif
+         if (x.lt.xmin(1)) x = xmin(1)
          if (x.gt.xmax) x = 1d0
 *
 *     Interpolation

src/DIS_new/F2total.f

@@ -65,11 +65,12 @@ function F2total(x)
 c$$$         c1 = x**2d0 / xi**2d0 / tau**1.5d0
 c$$$         c2 = 6d0 * rhop * x**3d0 / tau**2d0
 c$$$*
-c$$$         if(xi.lt.xmin(1).or.xi.gt.xmax+tol)then
+c$$$         if(xi.lt.xmin(1)-tol.or.xi.gt.xmax+tol)then
 c$$$            write(6,*) "In F2total.f:"
 c$$$            write(6,*) "Invalid value of x =",xi
 c$$$            call exit(-10)
 c$$$         endif
+c$$$         if (xi.lt.xmin(1)) xi = xmin(1)
 c$$$         if (xi.gt.xmax) xi = 1d0
 c$$$*
 c$$$*     Interpolation
@@ -82,11 +83,12 @@ function F2total(x)
 c$$$         enddo
 c$$$         if(dabs(F2total).le.1d-14) F2total = 0d0
 c$$$      else
-c$$$         if(x.lt.xmin(1).or.x.gt.xmax+tol)then
+c$$$         if(x.lt.xmin(1)-tol.or.x.gt.xmax+tol)then
 c$$$            write(6,*) "In F2total.f:"
 c$$$            write(6,*) "Invalid value of x =",x
 c$$$            call exit(-10)
 c$$$         endif
+c$$$         if (x.lt.xmin(1)) x = xmin(1)
 c$$$         if (x.gt.xmax) x = 1d0
 c$$$*
 c$$$*     Interpolation

src/DIS_new/F3bottom.f

@@ -41,11 +41,12 @@ function F3bottom(x)
          c1 = x**2d0 / xi**2d0 / tau
          c2 = 4d0 * rhop * x**3d0 / tau**1.5d0
 *
-         if(xi.lt.xmin(1).or.xi.gt.xmax+tol)then
+         if(xi.lt.xmin(1)-tol.or.xi.gt.xmax+tol)then
             write(6,*) "In F3bottom.f:"
             write(6,*) "Invalid value of x =",xi
             call exit(-10)
          endif
+         if (xi.lt.xmin(1)) xi = xmin(1)
          if (xi.gt.xmax) xi = 1d0
 *
 *     Interpolation
@@ -58,11 +59,12 @@ function F3bottom(x)
          enddo
          if(dabs(F3bottom).le.1d-14) F3bottom = 0d0
       else
-         if(x.lt.xmin(1).or.x.gt.xmax+tol)then
+         if(x.lt.xmin(1)-tol.or.x.gt.xmax+tol)then
             write(6,*) "In F3bottom.f:"
             write(6,*) "Invalid value of x =",x
             call exit(-10)
          endif
+         if (x.lt.xmin(1)) x = xmin(1)
          if (x.gt.xmax) x = 1d0
 *
 *     Interpolation

src/DIS_new/F3charm.f

@@ -41,11 +41,12 @@ function F3charm(x)
          c1 = x**2d0 / xi**2d0 / tau
          c2 = 4d0 * rhop * x**3d0 / tau**1.5d0
 *
-         if(xi.lt.xmin(1).or.xi.gt.xmax+tol)then
+         if(xi.lt.xmin(1)-tol.or.xi.gt.xmax+tol)then
             write(6,*) "In F3charm.f:"
             write(6,*) "Invalid value of x =",xi
             call exit(-10)
          endif
+         if (xi.lt.xmin(1)) xi = xmin(1)
          if (xi.gt.xmax) xi = 1d0
 *
 *     Interpolation
@@ -58,11 +59,12 @@ function F3charm(x)
          enddo
          if(dabs(F3charm).le.1d-14) F3charm = 0d0
       else
-         if(x.lt.xmin(1).or.x.gt.xmax+tol)then
+         if(x.lt.xmin(1)-tol.or.x.gt.xmax+tol)then
             write(6,*) "In F3charm.f:"
             write(6,*) "Invalid value of x =",x
             call exit(-10)
          endif
+         if (x.lt.xmin(1)) x = xmin(1)
          if (x.gt.xmax) x = 1d0
 *
 *     Interpolation

src/DIS_new/F3light.f

@@ -40,11 +40,12 @@ function F3light(x)
          c1 = x**2d0 / xi**2d0 / tau
          c2 = 4d0 * rhop * x**3d0 / tau**1.5d0
 *
-         if(xi.lt.xmin(1).or.xi.gt.xmax+tol)then
+         if(xi.lt.xmin(1)-tol.or.xi.gt.xmax+tol)then
             write(6,*) "In F3light.f:"
             write(6,*) "Invalid value of x =",xi
             call exit(-10)
          endif
+         if (xi.lt.xmin(1)) xi = xmin(1)
          if (xi.gt.xmax) xi = 1d0
 *
 *     Interpolation
@@ -57,11 +58,12 @@ function F3light(x)
          enddo
          if(dabs(F3light).le.1d-14) F3light = 0d0
       else
-         if(x.lt.xmin(1).or.x.gt.xmax+tol)then
+         if(x.lt.xmin(1)-tol.or.x.gt.xmax+tol)then
             write(6,*) "In F3light.f:"
             write(6,*) "Invalid value of x =",x
             call exit(-10)
          endif
+         if (x.lt.xmin(1)) x = xmin(1)
          if (x.gt.xmax) x = 1d0
 *
 *     Interpolation

src/DIS_new/F3top.f

@@ -41,11 +41,12 @@ function F3top(x)
          c1 = x**2d0 / xi**2d0 / tau
          c2 = 4d0 * rhop * x**3d0 / tau**1.5d0
 *
-         if(xi.lt.xmin(1).or.xi.gt.xmax+tol)then
+         if(xi.lt.xmin(1)-tol.or.xi.gt.xmax+tol)then
             write(6,*) "In F3top.f:"
             write(6,*) "Invalid value of x =",xi
             call exit(-10)
          endif
+         if (xi.lt.xmin(1)) xi = xmin(1)
          if (xi.gt.xmax) xi = 1d0
 *
 *     Interpolation
@@ -58,11 +59,12 @@ function F3top(x)
          enddo
          if(dabs(F3top).le.1d-14) F3top = 0d0
       else
-         if(x.lt.xmin(1).or.x.gt.xmax+tol)then
+         if(x.lt.xmin(1)-tol.or.x.gt.xmax+tol)then
             write(6,*) "In F3top.f:"
             write(6,*) "Invalid value of x =",x
             call exit(-10)
          endif
+         if (x.lt.xmin(1)) x = xmin(1)
          if (x.gt.xmax) x = 1d0
 *
 *     Interpolation

src/DIS_new/F3total.f

@@ -66,11 +66,12 @@ function F3total(x)
 c$$$         c1 = x**2d0 / xi**2d0 / tau
 c$$$         c2 = 4d0 * rhop * x**3d0 / tau**1.5d0
 c$$$*
-c$$$         if(xi.lt.xmin(1).or.xi.gt.xmax+tol)then
+c$$$         if(xi.lt.xmin(1)-tol.or.xi.gt.xmax+tol)then
 c$$$            write(6,*) "In F3total.f:"
 c$$$            write(6,*) "Invalid value of x =",xi
 c$$$            call exit(-10)
 c$$$         endif
+c$$$         if (xi.lt.xmin(1)) xi = xmin(1)
 c$$$         if (xi.gt.xmax) xi = 1d0
 c$$$*
 c$$$*     Interpolation
@@ -83,11 +84,12 @@ function F3total(x)
 c$$$         enddo
 c$$$         if(dabs(F3total).le.1d-14) F3total = 0d0
 c$$$      else
-c$$$         if(x.lt.xmin(1).or.x.gt.xmax+tol)then
+c$$$         if(x.lt.xmin(1)-tol.or.x.gt.xmax+tol)then
 c$$$            write(6,*) "In F3total.f:"
 c$$$            write(6,*) "Invalid value of x =",x
 c$$$            call exit(-10)
 c$$$         endif
+c$$$         if (x.lt.xmin(1)) x = xmin(1)
 c$$$         if (x.gt.xmax) x = 1d0
 c$$$*
 c$$$*     Interpolation

src/DIS_new/FLbottom.f

@@ -40,11 +40,12 @@ function FLbottom(x)
          c1 = ( 1d0 - tau ) * x**2d0 / xi**2d0 / tau**1.5d0
          c2 = ( 6d0 - 2d0 * tau ) * rhop * x**3d0 / tau**2d0
 *
-         if(xi.lt.xmin(1).or.xi.gt.xmax+tol)then
+         if(xi.lt.xmin(1)-tol.or.xi.gt.xmax+tol)then
             write(6,*) "In FLbottom.f:"
             write(6,*) "Invalid value of x =",xi
             call exit(-10)
          endif
+         if (xi.lt.xmin(1)) xi = xmin(1)
          if (xi.gt.xmax) xi = 1d0
 *
 *     Interpolation
@@ -58,11 +59,12 @@ function FLbottom(x)
          enddo
          if(dabs(FLbottom).le.1d-14) FLbottom = 0d0
       else
-         if(x.lt.xmin(1).or.x.gt.xmax+tol)then
+         if(x.lt.xmin(1)-tol.or.x.gt.xmax+tol)then
             write(6,*) "In FLbottom.f:"
             write(6,*) "Invalid value of x =",x
             call exit(-10)
          endif
+         if (x.lt.xmin(1)) x = xmin(1)
          if (x.gt.xmax) x = 1d0
 *
 *     Interpolation

src/DIS_new/FLcharm.f

@@ -40,11 +40,12 @@ function FLcharm(x)
          c1 = ( 1d0 - tau ) * x**2d0 / xi**2d0 / tau**1.5d0
          c2 = ( 6d0 - 2d0 * tau ) * rhop * x**3d0 / tau**2d0
 *
-         if(xi.lt.xmin(1).or.xi.gt.xmax+tol)then
+         if(xi.lt.xmin(1)-tol.or.xi.gt.xmax+tol)then
             write(6,*) "In FLcharm.f:"
             write(6,*) "Invalid value of x =",xi
             call exit(-10)
          endif
+         if (xi.lt.xmin(1)) xi = xmin(1)
          if (xi.gt.xmax) xi = 1d0
 *
 *     Interpolation
@@ -58,11 +59,12 @@ function FLcharm(x)
          enddo
          if(dabs(FLcharm).le.1d-14) FLcharm = 0d0
       else
-         if(x.lt.xmin(1).or.x.gt.xmax+tol)then
+         if(x.lt.xmin(1)-tol.or.x.gt.xmax+tol)then
             write(6,*) "In FLcharm.f:"
             write(6,*) "Invalid value of x =",x
             call exit(-10)
          endif
+         if (x.lt.xmin(1)) x = xmin(1)
          if (x.gt.xmax) x = 1d0
 *
 *     Interpolation

src/DIS_new/FLlight.f

@@ -40,11 +40,12 @@ function FLlight(x)
          c1 = ( 1d0 - tau ) * x**2d0 / xi**2d0 / tau**1.5d0
          c2 = ( 6d0 - 2d0 * tau ) * rhop * x**3d0 / tau**2d0
 *
-         if(xi.lt.xmin(1).or.xi.gt.xmax+tol)then
+         if(xi.lt.xmin(1)-tol.or.xi.gt.xmax+tol)then
             write(6,*) "In FLlight.f:"
             write(6,*) "Invalid value of x =",xi
             call exit(-10)
          endif
+         if (xi.lt.xmin(1)) xi = xmin(1)
          if (xi.gt.xmax) xi = 1d0
 *
 *     Interpolation
@@ -58,11 +59,12 @@ function FLlight(x)
          enddo
          if(dabs(FLlight).le.1d-14) FLlight = 0d0
       else
-         if(x.lt.xmin(1).or.x.gt.xmax+tol)then
+         if(x.lt.xmin(1)-tol.or.x.gt.xmax+tol)then
             write(6,*) "In FLlight.f:"
             write(6,*) "Invalid value of x =",x
             call exit(-10)
          endif
+         if (x.lt.xmin(1)) x = xmin(1)
          if (x.gt.xmax) x = 1d0
 *
 *     Interpolation