Use OPTIMIZED evaluator by default when supported.

This closes #8.
diffpy · Oct 18, 2016 · 5ac0108 · 5ac0108
1 parent 9b0c8ad
commit 5ac0108
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 0 deletions.
diff --git a/src/diffpy/srreal/BaseDebyeSum.cpp b/src/diffpy/srreal/BaseDebyeSum.cpp
@@ -54,6 +54,7 @@ BaseDebyeSum::BaseDebyeSum()
     this->setQmax(DEFAULT_QGRID_QMAX);
     this->setQstep(DEFAULT_QGRID_QSTEP);
     this->setDebyePrecision(DEFAULT_DEBYE_PRECISION);
+    this->setEvaluatorType(OPTIMIZED);
     // attributes
     this->registerDoubleAttribute("debyeprecision", this,
             &BaseDebyeSum::getDebyePrecision,

diff --git a/src/diffpy/srreal/BondCalculator.cpp b/src/diffpy/srreal/BondCalculator.cpp
@@ -102,6 +102,7 @@ class BondOp {
 BondCalculator::BondCalculator()
 {
     this->setRmax(DEFAULT_BONDCALCULATOR_RMAX);
+    this->setEvaluatorType(OPTIMIZED);
     mevaluator->setFlag(USEFULLSUM, true);
     mevaluator->setFlag(FIXEDSITEINDEX, true);
 }

diff --git a/src/diffpy/srreal/PDFCalculator.cpp b/src/diffpy/srreal/PDFCalculator.cpp
@@ -57,6 +57,8 @@ PDFCalculator::PDFCalculator()
     // cache all internal data according to an empty structure.
     // this rebuilds mstructure_cache and mrlimits_cache.
     this->setStructure(mstructure);
+    // setup the OPTIMIZED evaluator last so that its validation passes.
+    this->setEvaluatorType(OPTIMIZED);
     // attributes
     this->registerDoubleAttribute("qmin", this,
             &PDFCalculator::getQmin, &PDFCalculator::setQmin);