Function GetDifference is implemented.

Core/Tools/inc/OutputDataFunctions.h

@@ -93,6 +93,10 @@ namespace OutputDataFunctions
     BA_CORE_API_ Mask *CreateEllipticMask(
         const OutputData<double>& data,
         double xc, double yc, double rx, double ry);
+
+    // compare result with reference and return the difference
+    double GetDifference(const OutputData<double> &result,
+                         const OutputData<double> &reference);
 }
 
 #endif // OUTPUTDATAFUNCTIONS_H

Core/Tools/src/OutputDataFunctions.cpp

@@ -482,3 +482,27 @@ Mask* OutputDataFunctions::CreateEllipticMask(
     return OutputDataFunctions::CreateEllipticMask(data, center, radii);
 }
 
+double OutputDataFunctions::GetDifference(const OutputData<double> &result,
+                     const OutputData<double> &reference)
+{
+    OutputData<double> *c_result = result.clone();
+    OutputData<double> *c_reference = reference.clone();
+
+    // Calculating average relative difference.
+    *c_result -= *c_reference;
+    *c_result /= *c_reference;
+
+    double diff(0);
+    for(OutputData<double>::const_iterator it =
+            c_result->begin(); it!=c_result->end(); ++it) {
+        diff+= std::fabs(*it);
+    }
+    diff /= c_result->getAllocatedSize();
+
+    if (std::isnan(diff)) throw RuntimeErrorException("diff=NaN!");
+
+    delete c_result;
+    delete c_reference;
+
+    return diff;
+}

Tests/FunctionalTests/TestCore/IsGISAXS01/IsGISAXS01.cpp

@@ -6,6 +6,7 @@
 #include "Units.h"
 #include "MathFunctions.h"
 #include "SimulationRegistry.h"
+#include "OutputDataFunctions.h"
 #include <iostream>
 #include <cmath>
 
@@ -40,19 +41,12 @@ int FunctionalTests::IsGISAXS01::analyseResults()
     const double threshold(2e-10);
 
     // Calculating average relative difference.
-    *m_result -= *m_reference;
-    *m_result /= *m_reference;
-
-    double diff(0);
-    for(OutputData<double>::const_iterator it =
-            m_result->begin(); it!=m_result->end(); ++it) {
-        diff+= std::fabs(*it);
-    }
-    diff /= m_result->getAllocatedSize();
+    double diff = OutputDataFunctions::GetDifference(*m_result,*m_reference);
 
     // Assess result.
 	bool status_ok(true);
-    if( diff > threshold || std::isnan(diff)) status_ok=false;
+    if( diff > threshold ) status_ok=false;
+
 
     std::cout << " diff " << diff << std::endl;
     std::cout << m_name << " " << m_description << " " <<

Tests/FunctionalTests/TestCore/IsGISAXS02/IsGISAXS02.cpp

@@ -6,6 +6,7 @@
 #include "SampleBuilderFactory.h"
 #include "MathFunctions.h"
 #include "SimulationRegistry.h"
+#include "OutputDataFunctions.h"
 #include <iostream>
 #include <cmath>
 
@@ -40,18 +41,11 @@ int FunctionalTests::IsGISAXS02::analyseResults()
     const double threshold(2e-10);
 
     // calculating average relative difference
-    *m_result -= *m_reference;
-    *m_result /= *m_reference;
-
-    double diff(0);
-    for(OutputData<double>::const_iterator it=m_result->begin(); it!=m_result->end(); ++it) {
-        diff+= std::fabs(*it);
-    }
-    diff /= m_result->getAllocatedSize();
+    double diff = OutputDataFunctions::GetDifference(*m_result,*m_reference);
 	
 	// Assess result.
 	bool status_ok(true);
-    if( diff > threshold || std::isnan(diff)) status_ok=false;
+    if( diff > threshold ) status_ok=false;
 
     std::cout << " diff " << diff << std::endl;
     std::cout << m_name << " " << m_description << " " <<

Tests/FunctionalTests/TestCore/IsGISAXS03BA/IsGISAXS03BA.cpp

@@ -6,6 +6,7 @@
 #include "Units.h"
 #include "MathFunctions.h"
 #include "SimulationRegistry.h"
+#include "OutputDataFunctions.h"
 #include <iostream>
 #include <cmath>
 
@@ -40,19 +41,11 @@ int FunctionalTests::IsGISAXS03BA::analyseResults()
     const double threshold(2e-10);
 
     // Calculating average relative difference.
-    *m_result -= *m_reference;
-    *m_result /= *m_reference;
-
-    double diff(0);
-    for(OutputData<double>::const_iterator it =
-            m_result->begin(); it!=m_result->end(); ++it) {
-        diff+= std::fabs(*it);
-    }
-    diff /= m_result->getAllocatedSize();
+    double diff = OutputDataFunctions::GetDifference(*m_result,*m_reference);
 
     // Assess result.
 	bool status_ok(true);
-    if( diff > threshold || std::isnan(diff)) status_ok=false;
+    if( diff > threshold ) status_ok=false;
 
     std::cout << " diff " << diff << std::endl;
     std::cout << m_name << " " << m_description << " " <<

Tests/FunctionalTests/TestCore/IsGISAXS03DWBA/IsGISAXS03DWBA.cpp

@@ -6,6 +6,7 @@
 #include "Units.h"
 #include "MathFunctions.h"
 #include "SimulationRegistry.h"
+#include "OutputDataFunctions.h"
 #include <iostream>
 #include <cmath>
 
@@ -40,19 +41,11 @@ int FunctionalTests::IsGISAXS03DWBA::analyseResults()
     const double threshold(2e-10);
 
     // Calculating average relative difference.
-    *m_result -= *m_reference;
-    *m_result /= *m_reference;
-
-    double diff(0);
-    for(OutputData<double>::const_iterator it =
-            m_result->begin(); it!=m_result->end(); ++it) {
-        diff+= std::fabs(*it);
-    }
-    diff /= m_result->getAllocatedSize();
+    double diff = OutputDataFunctions::GetDifference(*m_result,*m_reference);
 
     // Assess result.
 	bool status_ok(true);
-    if( diff > threshold || std::isnan(diff)) status_ok=false;
+    if( diff > threshold ) status_ok=false;
 
     std::cout << " diff " << diff << std::endl;
     std::cout << m_name << " " << m_description << " " <<

Tests/FunctionalTests/TestCore/IsGISAXS041DDL/IsGISAXS041DDL.cpp

@@ -6,6 +6,7 @@
 #include "Utils.h"
 #include "MathFunctions.h"
 #include "SimulationRegistry.h"
+#include "OutputDataFunctions.h"
 #include <iostream>
 #include <cmath>
 #include <gsl/gsl_errno.h>
@@ -40,19 +41,11 @@ int FunctionalTests::IsGISAXS041DDL::analyseResults()
     const double threshold(2e-10);
 
     // Calculating average relative difference.
-    *m_result -= *m_reference;
-    *m_result /= *m_reference;
-
-    double diff(0);
-    for(OutputData<double>::const_iterator it =
-            m_result->begin(); it!=m_result->end(); ++it) {
-        diff+= std::fabs(*it);
-    }
-    diff /= m_result->getAllocatedSize();
+    double diff = OutputDataFunctions::GetDifference(*m_result,*m_reference);
 
     // Assess result.
 	bool status_ok(true);
-    if( diff > threshold || std::isnan(diff)) status_ok=false;
+    if( diff > threshold ) status_ok=false;
 
     std::cout << " diff " << diff << std::endl;
     std::cout << m_name << " " << m_description << " " <<

Tests/FunctionalTests/TestCore/IsGISAXS042DDL/IsGISAXS042DDL.cpp

@@ -6,6 +6,7 @@
 #include "Utils.h"
 #include "MathFunctions.h"
 #include "SimulationRegistry.h"
+#include "OutputDataFunctions.h"
 #include <iostream>
 #include <cmath>
 #include <gsl/gsl_errno.h>
@@ -40,19 +41,11 @@ int FunctionalTests::IsGISAXS042DDL::analyseResults()
     const double threshold(2e-10);
 
     // Calculating average relative difference.
-    *m_result -= *m_reference;
-    *m_result /= *m_reference;
-
-    double diff(0);
-    for(OutputData<double>::const_iterator it =
-            m_result->begin(); it!=m_result->end(); ++it) {
-        diff+= std::fabs(*it);
-    }
-    diff /= m_result->getAllocatedSize();
+    double diff = OutputDataFunctions::GetDifference(*m_result,*m_reference);
 
     // Assess result.
 	bool status_ok(true);
-    if( diff > threshold || std::isnan(diff)) status_ok=false;
+    if( diff > threshold ) status_ok=false;
 
     std::cout << " diff " << diff << std::endl;
     std::cout << m_name << " " << m_description << " " <<

Tests/FunctionalTests/TestCore/IsGISAXS06L1/IsGISAXS06L1.cpp

@@ -15,6 +15,7 @@
 #include "IsGISAXS06Builder.h"
 #include "MathFunctions.h"
 #include "SimulationRegistry.h"
+#include "OutputDataFunctions.h"
 
 #include <iostream>
 #include <cmath>
@@ -49,19 +50,11 @@ int FunctionalTests::IsGISAXS06L1::analyseResults()
     const double threshold(2e-10);
 
     // Calculating average relative difference.
-    *m_result -= *m_reference;
-    *m_result /= *m_reference;
-
-    double diff(0);
-    for(OutputData<double>::const_iterator it =
-            m_result->begin(); it!=m_result->end(); ++it) {
-        diff+= std::fabs(*it);
-    }
-    diff /= m_result->getAllocatedSize();
+    double diff = OutputDataFunctions::GetDifference(*m_result,*m_reference);
 
     // Assess result.
 	bool status_ok(true);
-    if( diff > threshold || std::isnan(diff)) status_ok=false;
+    if( diff > threshold ) status_ok=false;
 
     std::cout << " diff " << diff << std::endl;
     std::cout << m_name << " " << m_description << " " <<

Tests/FunctionalTests/TestCore/IsGISAXS06L2/IsGISAXS06L2.cpp

@@ -15,6 +15,7 @@
 #include "IsGISAXS06Builder.h"
 #include "MathFunctions.h"
 #include "SimulationRegistry.h"
+#include "OutputDataFunctions.h"
 
 #include <iostream>
 #include <cmath>
@@ -49,19 +50,11 @@ int FunctionalTests::IsGISAXS06L2::analyseResults()
     const double threshold(2e-10);
 
     // Calculating average relative difference.
-    *m_result -= *m_reference;
-    *m_result /= *m_reference;
-
-    double diff(0);
-    for(OutputData<double>::const_iterator it =
-            m_result->begin(); it!=m_result->end(); ++it) {
-        diff+= std::fabs(*it);
-    }
-    diff /= m_result->getAllocatedSize();
+    double diff = OutputDataFunctions::GetDifference(*m_result,*m_reference);
 
     // Assess result.
 	bool status_ok(true);
-    if( diff > threshold || std::isnan(diff)) status_ok=false;
+    if( diff > threshold ) status_ok=false;
 
     std::cout << " diff " << diff << std::endl;
     std::cout << m_name << " " << m_description << " " <<

Tests/FunctionalTests/TestCore/IsGISAXS06L3/IsGISAXS06L3.cpp

@@ -15,6 +15,7 @@
 #include "IsGISAXS06Builder.h"
 #include "MathFunctions.h"
 #include "SimulationRegistry.h"
+#include "OutputDataFunctions.h"
 
 #include <iostream>
 #include <cmath>
@@ -49,19 +50,11 @@ int FunctionalTests::IsGISAXS06L3::analyseResults()
     const double threshold(2e-10);
 
     // Calculating average relative difference.
-    *m_result -= *m_reference;
-    *m_result /= *m_reference;
-
-    double diff(0);
-    for(OutputData<double>::const_iterator it =
-            m_result->begin(); it!=m_result->end(); ++it) {
-        diff+= std::fabs(*it);
-    }
-    diff /= m_result->getAllocatedSize();
+    double diff = OutputDataFunctions::GetDifference(*m_result,*m_reference);
 
     // Assess result.
 	bool status_ok(true);
-    if( diff > threshold || std::isnan(diff)) status_ok=false;
+    if( diff > threshold ) status_ok=false;
 
     std::cout << " diff " << diff << std::endl;
     std::cout << m_name << " " << m_description << " " <<

Tests/FunctionalTests/TestCore/IsGISAXS06L4/IsGISAXS06L4.cpp

@@ -15,6 +15,7 @@
 #include "IsGISAXS06Builder.h"
 #include "MathFunctions.h"
 #include "SimulationRegistry.h"
+#include "OutputDataFunctions.h"
 
 #include <iostream>
 #include <cmath>
@@ -69,19 +70,11 @@ int FunctionalTests::IsGISAXS06L4::analyseResults()
     const double threshold(2e-10);
 
     // Calculating average relative difference.
-    *m_result -= *m_reference;
-    *m_result /= *m_reference;
-
-    double diff(0);
-    for(OutputData<double>::const_iterator it =
-            m_result->begin(); it!=m_result->end(); ++it) {
-        diff+= std::fabs(*it);
-    }
-    diff /= m_result->getAllocatedSize();
+    double diff = OutputDataFunctions::GetDifference(*m_result,*m_reference);
 
     // Assess result.
 	bool status_ok(true);
-    if( diff > threshold || std::isnan(diff)) status_ok=false;
+    if( diff > threshold ) status_ok=false;
 
     std::cout << " diff " << diff << std::endl;
     std::cout << m_name << " " << m_description << " " <<

Tests/FunctionalTests/TestCore/IsGISAXS07/IsGISAXS07.cpp

@@ -11,6 +11,7 @@
 #include "Units.h"
 #include "MathFunctions.h"
 #include "SimulationRegistry.h"
+#include "OutputDataFunctions.h"
 #include <iostream>
 #include <cmath>
 
@@ -42,17 +43,10 @@ int FunctionalTests::IsGISAXS07::analyseResults()
     const double threshold(2e-10);
 
     // calculating average relative difference
-    *m_result -= *m_reference;
-    *m_result /= *m_reference;
-
-    double diff(0);
-    for(OutputData<double>::const_iterator it=m_result->begin(); it!=m_result->end(); ++it) {
-        diff+= std::fabs(*it);
-    }
-    diff /= m_result->getAllocatedSize();
+    double diff = OutputDataFunctions::GetDifference(*m_result,*m_reference);
 
     bool status_ok(true);
-    if( diff > threshold || std::isnan(diff)) status_ok=false;
+    if( diff > threshold ) status_ok=false;
 
     std::cout << m_name << " " << m_description << " " << (status_ok ? "[OK]" : "[FAILED]") << std::endl;
     return (status_ok ? 0 : 1);

Tests/FunctionalTests/TestCore/IsGISAXS082DDL/IsGISAXS082DDL.cpp

@@ -6,6 +6,7 @@
 #include "Utils.h"
 #include "MathFunctions.h"
 #include "SimulationRegistry.h"
+#include "OutputDataFunctions.h"
 #include <iostream>
 #include <cmath>
 
@@ -39,19 +40,11 @@ int FunctionalTests::IsGISAXS082DDL::analyseResults()
     const double threshold(2e-10);
 
     // Calculating average relative difference.
-    *m_result -= *m_reference;
-    *m_result /= *m_reference;
-
-    double diff(0);
-    for(OutputData<double>::const_iterator it =
-            m_result->begin(); it!=m_result->end(); ++it) {
-        diff+= std::fabs(*it);
-    }
-    diff /= m_result->getAllocatedSize();
+    double diff = OutputDataFunctions::GetDifference(*m_result,*m_reference);
 
     // Assess result.
 	bool status_ok(true);
-    if( diff > threshold || std::isnan(diff)) status_ok=false;
+    if( diff > threshold ) status_ok=false;
 
     std::cout << " diff " << diff << std::endl;
     std::cout << m_name << " " << m_description << " " <<

Tests/FunctionalTests/TestCore/IsGISAXS082DDL2/IsGISAXS082DDL2.cpp

@@ -6,6 +6,7 @@
 #include "Utils.h"
 #include "MathFunctions.h"
 #include "SimulationRegistry.h"
+#include "OutputDataFunctions.h"
 #include <iostream>
 #include <cmath>
 
@@ -39,19 +40,11 @@ int FunctionalTests::IsGISAXS082DDL2::analyseResults()
     const double threshold(2e-10);
 
     // Calculating average relative difference.
-    *m_result -= *m_reference;
-    *m_result /= *m_reference;
-
-    double diff(0);
-    for(OutputData<double>::const_iterator it =
-            m_result->begin(); it!=m_result->end(); ++it) {
-        diff+= std::fabs(*it);
-    }
-    diff /= m_result->getAllocatedSize();
+    double diff = OutputDataFunctions::GetDifference(*m_result,*m_reference);
 
     // Assess result.
 	bool status_ok(true);
-    if( diff > threshold || std::isnan(diff)) status_ok=false;
+    if( diff > threshold ) status_ok=false;
 
     std::cout << " diff " << diff << std::endl;
     std::cout << m_name << " " << m_description << " " <<

Tests/FunctionalTests/TestCore/IsGISAXS09P/IsGISAXS09P.cpp

@@ -6,6 +6,7 @@
 #include "Units.h"
 #include "MathFunctions.h"
 #include "SimulationRegistry.h"
+#include "OutputDataFunctions.h"
 #include <iostream>
 #include <cmath>
 
@@ -40,19 +41,11 @@ int FunctionalTests::IsGISAXS09::analyseResults()
     const double threshold(2e-10);
 
     // Calculating average relative difference.
-    *m_result -= *m_reference;
-    *m_result /= *m_reference;
-
-    double diff(0);
-    for(OutputData<double>::const_iterator it =
-            m_result->begin(); it!=m_result->end(); ++it) {
-        diff+= std::fabs(*it);
-    }
-    diff /= m_result->getAllocatedSize();
+    double diff = OutputDataFunctions::GetDifference(*m_result,*m_reference);
 
     // Assess result.
 	bool status_ok(true);
-    if( diff > threshold || std::isnan(diff)) status_ok=false;
+    if( diff > threshold ) status_ok=false;
 
     std::cout << " diff " << diff << std::endl;
     std::cout << m_name << " " << m_description << " " <<

Tests/FunctionalTests/TestCore/IsGISAXS09R/IsGISAXS09R.cpp

@@ -6,6 +6,7 @@
 #include "Units.h"
 #include "MathFunctions.h"
 #include "SimulationRegistry.h"
+#include "OutputDataFunctions.h"
 #include <iostream>
 #include <cmath>
 
@@ -40,19 +41,11 @@ int FunctionalTests::IsGISAXS09R::analyseResults()
     const double threshold(2e-10);
 
     // Calculating average relative difference.
-    *m_result -= *m_reference;
-    *m_result /= *m_reference;
-
-    double diff(0);
-    for(OutputData<double>::const_iterator it =
-            m_result->begin(); it!=m_result->end(); ++it) {
-        diff+= std::fabs(*it);
-    }
-    diff /= m_result->getAllocatedSize();
+    double diff = OutputDataFunctions::GetDifference(*m_result,*m_reference);
 
     // Assess result.
 	bool status_ok(true);
-    if( diff > threshold || std::isnan(diff)) status_ok=false;
+    if( diff > threshold ) status_ok=false;
 
     std::cout << " diff " << diff << std::endl;
     std::cout << m_name << " " << m_description << " " <<

Tests/FunctionalTests/TestCore/IsGISAXS10/IsGISAXS10.cpp

@@ -10,6 +10,7 @@
 #include "Utils.h"
 #include "MathFunctions.h"
 #include "SimulationRegistry.h"
+#include "OutputDataFunctions.h"
 
 #include <iostream>
 #include <cmath>
@@ -44,18 +45,10 @@ int FunctionalTests::IsGISAXS10::analyseResults()
     const double threshold(2e-10);
 
     // calculating average relative difference
-    *m_result -= *m_reference;
-    *m_result /= *m_reference;
-
-    double diff(0);
-    for(OutputData<double>::const_iterator it=m_result->begin();
-            it!=m_result->end(); ++it) {
-        diff+= std::fabs(*it);
-    }
-    diff /= m_result->getAllocatedSize();
+    double diff = OutputDataFunctions::GetDifference(*m_result,*m_reference);
 
     bool status_ok(true);
-    if( diff > threshold || MathFunctions::isnan(diff)) status_ok=false;
+    if( diff > threshold ) status_ok=false;
 
     std::cout << m_name << " " << m_description << " " <<
             (status_ok ? "[OK]" : "[FAILED]") << std::endl;

Tests/FunctionalTests/TestCore/IsGISAXS11/IsGISAXS11.cpp

@@ -12,6 +12,7 @@
 #include "Utils.h"
 #include "MathFunctions.h"
 #include "SimulationRegistry.h"
+#include "OutputDataFunctions.h"
 #include <iostream>
 #include <cmath>
 
@@ -47,18 +48,10 @@ int FunctionalTests::IsGISAXS11::analyseResults()
     const double threshold(2e-10);
 
     // calculating average relative difference
-    *m_result -= *m_reference;
-    *m_result /= *m_reference;
-
-    double diff(0);
-    for(OutputData<double>::const_iterator it=m_result->begin();
-            it!=m_result->end(); ++it) {
-        diff+= std::fabs(*it);
-    }
-    diff /= m_result->getAllocatedSize();
+    double diff = OutputDataFunctions::GetDifference(*m_result,*m_reference);
 
     bool status_ok(true);
-    if( diff > threshold || MathFunctions::isnan(diff)) status_ok=false;
+    if( diff > threshold ) status_ok=false;
 
     std::cout << m_name << " " << m_description << " " <<
             (status_ok ? "[OK]" : "[FAILED]") << std::endl;

Tests/FunctionalTests/TestCore/IsGISAXS15/IsGISAXS15.cpp

@@ -13,6 +13,7 @@
 #include "Utils.h"
 #include "MathFunctions.h"
 #include "SimulationRegistry.h"
+#include "OutputDataFunctions.h"
 #include <iostream>
 #include <cmath>
 
@@ -46,18 +47,10 @@ int FunctionalTests::IsGISAXS15::analyseResults()
     const double threshold(2e-10);
 
     // calculating average relative difference
-    *m_result -= *m_reference;
-    *m_result /= *m_reference;
-
-    double diff(0);
-    for(OutputData<double>::const_iterator it=m_result->begin();
-            it!=m_result->end(); ++it) {
-        diff+= std::fabs(*it);
-    }
-    diff /= m_result->getAllocatedSize();
+    double diff = OutputDataFunctions::GetDifference(*m_result,*m_reference);
 
     bool status_ok(true);
-    if( diff > threshold || MathFunctions::isnan(diff)) status_ok=false;
+    if( diff > threshold ) status_ok=false;
 
     std::cout << m_name << " " << m_description << " " <<
             (status_ok ? "[OK]" : "[FAILED]") << std::endl;