Adapted to new cuba interface

diff --git a/cubaint.cpp b/cubaint.cpp
index 9c9fef3af04da39b00b37bac79681d7de48bc691..cca1faa01417355923b53c9cd1a1441ac7910e52 100644 (file)
--- a/cubaint.cpp
+++ b/cubaint.cpp
@@ -53,8 +53,9 @@ int cubaint::_integrate (integrandtype integrand, const intmethod& IntMethod,
           Options.epsrel, Options.epsabs,
           Options.flags | verbosity, Options.seed,
           Options.mineval, Options.maxeval,
           Options.epsrel, Options.epsabs,
           Options.flags | verbosity, Options.seed,
           Options.mineval, Options.maxeval,

-          Options.Suave.nnew, Options.Suave.flatness,
-          Options.statefile,
+          Options.Suave.nnew, Options.Suave.nmin,
+          Options.Suave.flatness,
+          Options.statefile, Options.spin,

           &nregions, &neval, &fail,
           reinterpret_cast<double*>(integral), 
           reinterpret_cast<double*>(error), 
           &nregions, &neval, &fail,
           reinterpret_cast<double*>(integral), 
           reinterpret_cast<double*>(error), 


@@ -74,7 +75,7 @@ int cubaint::_integrate (integrandtype integrand, const intmethod& IntMethod,
             Options.Divonne.ngiven, Options.Divonne.ldxgiven, 
             Options.Divonne.xgiven,
             Options.Divonne.nextra, Options.Divonne.peakfinder,
             Options.Divonne.ngiven, Options.Divonne.ldxgiven, 
             Options.Divonne.xgiven,
             Options.Divonne.nextra, Options.Divonne.peakfinder,

-            Options.statefile,
+            Options.statefile, Options.spin,

             &nregions, &neval, &fail,
             reinterpret_cast<double*>(integral), 
             reinterpret_cast<double*>(error), 
             &nregions, &neval, &fail,
             reinterpret_cast<double*>(integral), 
             reinterpret_cast<double*>(error), 


@@ -88,7 +89,7 @@ int cubaint::_integrate (integrandtype integrand, const intmethod& IntMethod,
           Options.flags | verbosity, Options.seed,
           Options.mineval, Options.maxeval,
           Options.Vegas.nstart, Options.Vegas.nincrease, Options.Vegas.nbatch,
           Options.flags | verbosity, Options.seed,
           Options.mineval, Options.maxeval,
           Options.Vegas.nstart, Options.Vegas.nincrease, Options.Vegas.nbatch,

-          Options.Vegas.gridno, Options.statefile,
+          Options.Vegas.gridno, Options.statefile, Options.spin,

           &neval, &fail,
           reinterpret_cast<double*>(integral), 
           reinterpret_cast<double*>(error), 
           &neval, &fail,
           reinterpret_cast<double*>(integral), 
           reinterpret_cast<double*>(error), 


@@ -101,7 +102,7 @@ int cubaint::_integrate (integrandtype integrand, const intmethod& IntMethod,
           Options.epsrel, Options.epsabs,
           Options.flags, Options.mineval, Options.maxeval,
           Options.Cuhre.key,
           Options.epsrel, Options.epsabs,
           Options.flags, Options.mineval, Options.maxeval,
           Options.Cuhre.key,

-          Options.statefile,
+          Options.statefile, Options.spin,

           &nregions, &neval, &fail,
           reinterpret_cast<double*>(integral), 
           reinterpret_cast<double*>(error), 
           &nregions, &neval, &fail,
           reinterpret_cast<double*>(integral), 
           reinterpret_cast<double*>(error), 

diff --git a/cubaint.hpp b/cubaint.hpp
index 103ea8627d009b029b9f9b1a29b9a86c980589c5..3e99648ee5e13b41ffafa618d1c563fd0d0a72b6 100644 (file)
--- a/cubaint.hpp
+++ b/cubaint.hpp
@@ -41,8 +41,9 @@ namespace cubaint
     struct suave {
       int nnew;
       double flatness;
     struct suave {
       int nnew;
       double flatness;

+      int nmin;

       suave() :
       suave() :

-       nnew(1000), flatness(25.)
+       nnew(1000), flatness(25.), nmin(2)

       {};
     };
 
       {};
     };