Merge remote-tracking branch 'origin/roland_oreappplus'

Author: pcaspers

OREAnalytics/orea/app/analytic.cpp

@@ -107,7 +107,7 @@ boost::shared_ptr<EngineFactory> Analytic::engineFactory() {
 boost::shared_ptr<ore::data::EngineFactory> PricingAnalytic::engineFactory() {
     LOG("PricingAnalytic::engineFactory() called");
     boost::shared_ptr<EngineData> edCopy = boost::make_shared<EngineData>(*inputs_->pricingEngine());
-    edCopy->globalParameters()["GenerateAdditionalResults"] = inputs_->outputAdditionalResults() ? "true" : "false";
+    edCopy->globalParameters()["GenerateAdditionalResults"] = "true";
     edCopy->globalParameters()["RunType"] = "NPV";
     map<MarketContext, string> configurations;
     configurations[MarketContext::irCalibration] = inputs_->marketConfig("lgmcalibration");