diff --git a/App/src/IsGISAXSTools.cpp b/App/src/IsGISAXSTools.cpp index 372f84facd64d2ef04dbcf5a6b335e549d05f8bd..e3deda6484807bfd77c7dfa5d3b35bf440a8dd2b 100644 --- a/App/src/IsGISAXSTools.cpp +++ b/App/src/IsGISAXSTools.cpp @@ -692,12 +692,12 @@ void IsGISAXSTools::drawOutputDataComparisonResults( if(hasMinimum()) IsGISAXSTools::setMinimum(hmin); //if(hmax>0) IsGISAXSTools::setMaximum(hmax); if(hasMaximum()) IsGISAXSTools::setMaximum(hmax); - IsGISAXSTools::drawOutputDataInPad(data, "CONT4 Z", "this"); + IsGISAXSTools::drawOutputDataInPad(data, "CONT4 Z", "data"); // isgisaxs data c1->cd(2); gPad->SetLogz(); gPad->SetRightMargin(0.12); - IsGISAXSTools::drawOutputDataInPad(reference, "CONT4 Z", "isgi"); + IsGISAXSTools::drawOutputDataInPad(reference, "CONT4 Z", "reference"); // difference c1->cd(3); diff --git a/App/src/TestFunctionalTests.cpp b/App/src/TestFunctionalTests.cpp index 1654bedaa371a6a46e190be17cb0c9aabdcd660f..75a5435e08a01b23e827fd7572f744fe32ec9c8b 100644 --- a/App/src/TestFunctionalTests.cpp +++ b/App/src/TestFunctionalTests.cpp @@ -1,6 +1,7 @@ #include "TestFunctionalTests.h" #include "ProgramOptions.h" #include "IsGISAXSTools.h" +#include "OutputDataFunctions.h" #include <iostream> #include <vector> #include <string> @@ -13,6 +14,17 @@ void TestFunctionalTests::execute() for(size_t i=0; i<m_testNames.size(); ++i) { FunctionalTest_t test = m_testRegistry.getTest(m_testNames[i]); test->runTest(); + test->analyseResults(); + + double diff = OutputDataFunctions::GetDifference(*test->getResult(), *test->getReference()); + std::cout << "XXX " << diff << std::endl; + + for(size_t j=0; j<test->getResult()->getAllocatedSize(); ++j) { + std::cout << "AAA " << j << " " << (*test->getResult())[j] + << " " << (*test->getReference())[j] + << " diff:" << ((*test->getResult())[j] - (*test->getReference())[j])/(*test->getReference())[j] + << std::endl; + } IsGISAXSTools::drawOutputDataComparisonResults( *test->getResult(), *test->getReference(), test->getName(), test->getDescription());