From 7f6911d7acbdb79e54c8671f0cd8b26d2f039620 Mon Sep 17 00:00:00 2001 From: "Bastian M. Wojek" Date: Wed, 16 Sep 2009 12:36:06 +0000 Subject: [PATCH] Change of the algorithm to calculate gap integrals --- src/external/libGapIntegrals/TGapIntegrals.cpp | 2 +- src/external/libGapIntegrals/TGapIntegrals.h | 2 +- src/external/libGapIntegrals/TIntegrator.cpp | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/external/libGapIntegrals/TGapIntegrals.cpp b/src/external/libGapIntegrals/TGapIntegrals.cpp index e3c5a5cb..3555cec2 100644 --- a/src/external/libGapIntegrals/TGapIntegrals.cpp +++ b/src/external/libGapIntegrals/TGapIntegrals.cpp @@ -74,7 +74,7 @@ TGapDWave::TGapDWave() { } TGapAnSWave::TGapAnSWave() { - TAnSWaveGapIntegralSuave *gapint = new TAnSWaveGapIntegralSuave(); + TAnSWaveGapIntegralCuhre *gapint = new TAnSWaveGapIntegralCuhre(); fGapIntegral = gapint; gapint = 0; delete gapint; diff --git a/src/external/libGapIntegrals/TGapIntegrals.h b/src/external/libGapIntegrals/TGapIntegrals.h index d49093ca..4efa847f 100644 --- a/src/external/libGapIntegrals/TGapIntegrals.h +++ b/src/external/libGapIntegrals/TGapIntegrals.h @@ -89,7 +89,7 @@ public: double operator()(double, const vector&) const; private: - TAnSWaveGapIntegralSuave *fGapIntegral; + TAnSWaveGapIntegralCuhre *fGapIntegral; mutable vector fTemp; mutable vector::const_iterator fTempIter; mutable vector fIntegralValues; diff --git a/src/external/libGapIntegrals/TIntegrator.cpp b/src/external/libGapIntegrals/TIntegrator.cpp index 40364bf1..c17700ec 100644 --- a/src/external/libGapIntegrals/TIntegrator.cpp +++ b/src/external/libGapIntegrals/TIntegrator.cpp @@ -75,7 +75,7 @@ double TAnSWaveGapIntegralCuhre::IntegrateFunc() const double EPSABS (1e-6); const unsigned int VERBOSE (0); const unsigned int LAST (4); - const unsigned int MINEVAL (10000); + const unsigned int MINEVAL (1000); const unsigned int MAXEVAL (1000000); const unsigned int KEY (13); @@ -107,7 +107,7 @@ double TAnSWaveGapIntegralDivonne::IntegrateFunc() const double EPSREL (1e-4); const double EPSABS (1e-6); const unsigned int VERBOSE (0); - const unsigned int MINEVAL (10000); + const unsigned int MINEVAL (1000); const unsigned int MAXEVAL (1000000); const unsigned int KEY1 (47); const unsigned int KEY2 (1); @@ -149,7 +149,7 @@ double TAnSWaveGapIntegralSuave::IntegrateFunc() const double EPSABS (1e-6); const unsigned int VERBOSE (0); const unsigned int LAST (4); - const unsigned int MINEVAL (10000); + const unsigned int MINEVAL (1000); const unsigned int MAXEVAL (1000000); const unsigned int NNEW (1000);