From ca95a1a9670bc3b50252a82cb0b52d3e1a767689 Mon Sep 17 00:00:00 2001 From: Marina Ganeva <m.ganeva@fz-juelich.de> Date: Tue, 7 Aug 2018 10:47:31 +0200 Subject: [PATCH] Re #22711 restore unit test reference data --- Framework/MDAlgorithms/test/LoadDNSSCDTest.h | 502 ++++--------------- 1 file changed, 93 insertions(+), 409 deletions(-) diff --git a/Framework/MDAlgorithms/test/LoadDNSSCDTest.h b/Framework/MDAlgorithms/test/LoadDNSSCDTest.h index 000a87616a3..f1625f0e78f 100644 --- a/Framework/MDAlgorithms/test/LoadDNSSCDTest.h +++ b/Framework/MDAlgorithms/test/LoadDNSSCDTest.h @@ -254,174 +254,35 @@ public: // 8*24 = 192 TS_ASSERT_EQUALS(events.size(), 192); // reference vector - const std::vector<coord_t> ref = {4366, - 4366, - 0, - 0, - -0.09776273f, - -0.09776273f, - 0.10005156f, - 31461, - 31461, - 0, - 1, - -0.15959044f, - -0.15959044f, - 0.14884006f, - 33314, - 33314, - 0, - 2, - -0.224231616093f, - -0.224231616093f, - 0.189927174618f, - 32369, - 32369, - 0, - 3, - -0.291194311172f, - -0.291194311172f, - 0.223000198347f, - 31851, - 31851, - 0, - 4, - -0.359968893923f, - -0.359968893923f, - 0.247807429194f, - 30221, - 30221, - 0, - 5, - -0.430031948245f, - -0.430031948245f, - 0.264160069153f, - 26267, - 26267, - 0, - 6, - -0.500850251989f, - -0.500850251989f, - 0.271933664761f, - 26788, - 26788, - 0, - 7, - -0.571884835101f, - -0.571884835101f, - 0.27106905426f, - 29729, - 29729, - 0, - 8, - -0.642595081514f, - -0.642595081514f, - 0.26157281786f, - 30188, - 30188, - 0, - 9, - -0.712442843555f, - -0.712442843555f, - 0.243517227652f, - 28116, - 28116, - 0, - 10, - -0.78089653758f, - -0.78089653758f, - 0.217039697581f, - 30277, - 30277, - 0, - 11, - -0.847435189645f, - -0.847435189645f, - 0.182341737639f, - 20231, - 20231, - 0, - 12, - -0.911552400429f, - -0.911552400429f, - 0.13968742025f, - 24538, - 24538, - 0, - 13, - -0.972760199244f, - -0.972760199244f, - 0.089401370527f, - 16416, - 16416, - 0, - 14, - -1.03059275778f, - -1.03059275778f, - 0.0318662956709f, - 20225, - 20225, - 0, - 15, - -1.08460993535f, - -1.08460993535f, - -0.0324799276578f, - 19957, - 19957, - 0, - 16, - -1.13440062862f, - -1.13440062862f, - -0.103147585846f, - 19570, - 19570, - 0, - 17, - -1.17958590034f, - -1.17958590034f, - -0.179598855345f, - 20743, - 20743, - 0, - 18, - -1.21982186332f, - -1.21982186332f, - -0.261251895832f, - 22758, - 22758, - 0, - 19, - -1.25480229757f, - -1.25480229757f, - -0.347485278364f, - 23001, - 23001, - 0, - 20, - -1.28426098088f, - -1.28426098088f, - -0.437642714831f, - 21836, - 21836, - 0, - 21, - -1.30797371487f, - -1.30797371487f, - -0.531038052704f, - 23877, - 23877, - 0, - 22, - -1.32576003133f, - -1.32576003133f, - -0.626960497068f, - 13340, - 13340, - 0, - 23, - -1.33748456564f, - -1.33748456564f, - -0.724680020201f}; + const std::vector<coord_t> ref = { + 4366, 4366, 0, 0, -0.09776273f, -0.09776273f, 0.10005156f, 0.0f, 31461, + 31461, 0, 1, -0.15959044f, -0.15959044f, 0.14884006f, 0.0f, 33314, + 33314, 0, 2, -0.224231616093f, -0.224231616093f, 0.189927174618f, 0.0f, + 32369, 32369, 0, 3, -0.291194311172f, -0.291194311172f, 0.223000198347f, + 0.0f, 31851, 31851, 0, 4, -0.359968893923f, -0.359968893923f, + 0.247807429194f, 0.0f, 30221, 30221, 0, 5, -0.430031948245f, + -0.430031948245f, 0.264160069153f, 0.0f, 26267, 26267, 0, 6, + -0.500850251989f, -0.500850251989f, 0.271933664761f, 0.0f, 26788, 26788, + 0, 7, -0.571884835101f, -0.571884835101f, 0.27106905426f, 0.0f, 29729, + 29729, 0, 8, -0.642595081514f, -0.642595081514f, 0.26157281786f, 0.0f, + 30188, 30188, 0, 9, -0.712442843555f, -0.712442843555f, 0.243517227652f, + 0.0f, 28116, 28116, 0, 10, -0.78089653758f, -0.78089653758f, + 0.217039697581f, 0.0f, 30277, 30277, 0, 11, -0.847435189645f, + -0.847435189645f, 0.182341737639f, 0.0f, 20231, 20231, 0, 12, + -0.911552400429f, -0.911552400429f, 0.13968742025f, 0.0f, 24538, 24538, + 0, 13, -0.972760199244f, -0.972760199244f, 0.089401370527f, 0.0f, 16416, + 16416, 0, 14, -1.03059275778f, -1.03059275778f, 0.0318662956709f, 0.0f, + 20225, 20225, 0, 15, -1.08460993535f, -1.08460993535f, + -0.0324799276578f, 0.0f, 19957, 19957, 0, 16, -1.13440062862f, + -1.13440062862f, -0.103147585846f, 0.0f, 19570, 19570, 0, 17, + -1.17958590034f, -1.17958590034f, -0.179598855345f, 0.0f, 20743, 20743, + 0, 18, -1.21982186332f, -1.21982186332f, -0.261251895832f, 0.0f, 22758, + 22758, 0, 19, -1.25480229757f, -1.25480229757f, -0.347485278364f, 0.0f, + 23001, 23001, 0, 20, -1.28426098088f, -1.28426098088f, -0.437642714831f, + 0.0f, 21836, 21836, 0, 21, -1.30797371487f, -1.30797371487f, + -0.531038052704f, 0.0f, 23877, 23877, 0, 22, -1.32576003133f, + -1.32576003133f, -0.626960497068f, 0.0f, 13340, 13340, 0, 23, + -1.33748456564f, -1.33748456564f, -0.724680020201f, 0.0f}; double d(1.0e-06); for (auto i = 0; i < 192; i++) { TS_ASSERT_DELTA(events[i], ref[i], d); @@ -529,174 +390,37 @@ public: // 8*24 = 192 TS_ASSERT_EQUALS(events.size(), 192); // reference vector - const std::vector<coord_t> ref = {8332872, - 8332872, - 0, - 0, - -0.09776273f, - -0.09776273f, - 0.10005156f, - 8332872, - 8332872, - 0, - 1, - -0.15959044f, - -0.15959044f, - 0.14884006f, - 8332872, - 8332872, - 0, - 2, - -0.224231616093f, - -0.224231616093f, - 0.189927174618f, - 8332872, - 8332872, - 0, - 3, - -0.291194311172f, - -0.291194311172f, - 0.223000198347f, - 8332872, - 8332872, - 0, - 4, - -0.359968893923f, - -0.359968893923f, - 0.247807429194f, - 8332872, - 8332872, - 0, - 5, - -0.430031948245f, - -0.430031948245f, - 0.264160069153f, - 8332872, - 8332872, - 0, - 6, - -0.500850251989f, - -0.500850251989f, - 0.271933664761f, - 8332872, - 8332872, - 0, - 7, - -0.571884835101f, - -0.571884835101f, - 0.27106905426f, - 8332872, - 8332872, - 0, - 8, - -0.642595081514f, - -0.642595081514f, - 0.26157281786f, - 8332872, - 8332872, - 0, - 9, - -0.712442843555f, - -0.712442843555f, - 0.243517227652f, - 8332872, - 8332872, - 0, - 10, - -0.78089653758f, - -0.78089653758f, - 0.217039697581f, - 8332872, - 8332872, - 0, - 11, - -0.847435189645f, - -0.847435189645f, - 0.182341737639f, - 8332872, - 8332872, - 0, - 12, - -0.911552400429f, - -0.911552400429f, - 0.13968742025f, - 8332872, - 8332872, - 0, - 13, - -0.972760199244f, - -0.972760199244f, - 0.089401370527f, - 8332872, - 8332872, - 0, - 14, - -1.03059275778f, - -1.03059275778f, - 0.0318662956709f, - 8332872, - 8332872, - 0, - 15, - -1.08460993535f, - -1.08460993535f, - -0.0324799276578f, - 8332872, - 8332872, - 0, - 16, - -1.13440062862f, - -1.13440062862f, - -0.103147585846f, - 8332872, - 8332872, - 0, - 17, - -1.17958590034f, - -1.17958590034f, - -0.179598855345f, - 8332872, - 8332872, - 0, - 18, - -1.21982186332f, - -1.21982186332f, - -0.261251895832f, - 8332872, - 8332872, - 0, - 19, - -1.25480229757f, - -1.25480229757f, - -0.347485278364f, - 8332872, - 8332872, - 0, - 20, - -1.28426098088f, - -1.28426098088f, - -0.437642714831f, - 8332872, - 8332872, - 0, - 21, - -1.30797371487f, - -1.30797371487f, - -0.531038052704f, - 8332872, - 8332872, - 0, - 22, - -1.32576003133f, - -1.32576003133f, - -0.626960497068f, - 8332872, - 8332872, - 0, - 23, - -1.33748456564f, - -1.33748456564f, - -0.724680020201f}; + const std::vector<coord_t> ref = { + 8332872, 8332872, 0, 0, -0.09776273f, -0.09776273f, 0.10005156f, 0.0f, + 8332872, 8332872, 0, 1, -0.15959044f, -0.15959044f, 0.14884006f, 0.0f, + 8332872, 8332872, 0, 2, -0.224231616093f, -0.224231616093f, + 0.189927174618f, 0.0f, 8332872, 8332872, 0, 3, -0.291194311172f, + -0.291194311172f, 0.223000198347f, 0.0f, 8332872, 8332872, 0, 4, + -0.359968893923f, -0.359968893923f, 0.247807429194f, 0.0f, 8332872, + 8332872, 0, 5, -0.430031948245f, -0.430031948245f, 0.264160069153f, + 0.0f, 8332872, 8332872, 0, 6, -0.500850251989f, -0.500850251989f, + 0.271933664761f, 0.0f, 8332872, 8332872, 0, 7, -0.571884835101f, + -0.571884835101f, 0.27106905426f, 0.0f, 8332872, 8332872, 0, 8, + -0.642595081514f, -0.642595081514f, 0.26157281786f, 0.0f, 8332872, + 8332872, 0, 9, -0.712442843555f, -0.712442843555f, 0.243517227652f, + 0.0f, 8332872, 8332872, 0, 10, -0.78089653758f, -0.78089653758f, + 0.217039697581f, 0.0f, 8332872, 8332872, 0, 11, -0.847435189645f, + -0.847435189645f, 0.182341737639f, 0.0f, 8332872, 8332872, 0, 12, + -0.911552400429f, -0.911552400429f, 0.13968742025f, 0.0f, 8332872, + 8332872, 0, 13, -0.972760199244f, -0.972760199244f, 0.089401370527f, + 0.0f, 8332872, 8332872, 0, 14, -1.03059275778f, -1.03059275778f, + 0.0318662956709f, 0.0f, 8332872, 8332872, 0, 15, -1.08460993535f, + -1.08460993535f, -0.0324799276578f, 0.0f, 8332872, 8332872, 0, 16, + -1.13440062862f, -1.13440062862f, -0.103147585846f, 0.0f, 8332872, + 8332872, 0, 17, -1.17958590034f, -1.17958590034f, -0.179598855345f, + 0.0f, 8332872, 8332872, 0, 18, -1.21982186332f, -1.21982186332f, + -0.261251895832f, 0.0f, 8332872, 8332872, 0, 19, -1.25480229757f, + -1.25480229757f, -0.347485278364f, 0.0f, 8332872, 8332872, 0, 20, + -1.28426098088f, -1.28426098088f, -0.437642714831f, 0.0f, 8332872, + 8332872, 0, 21, -1.30797371487f, -1.30797371487f, -0.531038052704f, + 0.0f, 8332872, 8332872, 0, 22, -1.32576003133f, -1.32576003133f, + -0.626960497068f, 0.0f, 8332872, 8332872, 0, 23, -1.33748456564f, + -1.33748456564f, -0.724680020201f, 0.0f}; double d(1.0e-06); for (auto i = 0; i < 192; i++) { TS_ASSERT_DELTA(events[i], ref[i], d); @@ -754,30 +478,30 @@ public: TS_ASSERT_EQUALS(events.size(), 192); // reference vector const std::vector<coord_t> ref = { - 600, 0, 0, 0, -0.09776273f, -0.09776273f, 0.10005156f, - 600, 0, 0, 1, -0.15959044f, -0.15959044f, 0.14884006f, - 600, 0, 0, 2, -0.224231616093f, -0.224231616093f, 0.189927174618f, - 600, 0, 0, 3, -0.291194311172f, -0.291194311172f, 0.223000198347f, - 600, 0, 0, 4, -0.359968893923f, -0.359968893923f, 0.247807429194f, - 600, 0, 0, 5, -0.430031948245f, -0.430031948245f, 0.264160069153f, - 600, 0, 0, 6, -0.500850251989f, -0.500850251989f, 0.271933664761f, - 600, 0, 0, 7, -0.571884835101f, -0.571884835101f, 0.27106905426f, - 600, 0, 0, 8, -0.642595081514f, -0.642595081514f, 0.26157281786f, - 600, 0, 0, 9, -0.712442843555f, -0.712442843555f, 0.243517227652f, - 600, 0, 0, 10, -0.78089653758f, -0.78089653758f, 0.217039697581f, - 600, 0, 0, 11, -0.847435189645f, -0.847435189645f, 0.182341737639f, - 600, 0, 0, 12, -0.911552400429f, -0.911552400429f, 0.13968742025f, - 600, 0, 0, 13, -0.972760199244f, -0.972760199244f, 0.089401370527f, - 600, 0, 0, 14, -1.03059275778f, -1.03059275778f, 0.0318662956709f, - 600, 0, 0, 15, -1.08460993535f, -1.08460993535f, -0.0324799276578f, - 600, 0, 0, 16, -1.13440062862f, -1.13440062862f, -0.103147585846f, - 600, 0, 0, 17, -1.17958590034f, -1.17958590034f, -0.179598855345f, - 600, 0, 0, 18, -1.21982186332f, -1.21982186332f, -0.261251895832f, - 600, 0, 0, 19, -1.25480229757f, -1.25480229757f, -0.347485278364f, - 600, 0, 0, 20, -1.28426098088f, -1.28426098088f, -0.437642714831f, - 600, 0, 0, 21, -1.30797371487f, -1.30797371487f, -0.531038052704f, - 600, 0, 0, 22, -1.32576003133f, -1.32576003133f, -0.626960497068f, - 600, 0, 0, 23, -1.33748456564f, -1.33748456564f, -0.724680020201f}; + 600, 0, 0, 0, -0.09776273f, -0.09776273f, 0.10005156f, 0.0f, 600, 0, 0, + 1, -0.15959044f, -0.15959044f, 0.14884006f, 0.0f, 600, 0, 0, 2, + -0.224231616093f, -0.224231616093f, 0.189927174618f, 0.0f, 600, 0, 0, 3, + -0.291194311172f, -0.291194311172f, 0.223000198347f, 0.0f, 600, 0, 0, 4, + -0.359968893923f, -0.359968893923f, 0.247807429194f, 0.0f, 600, 0, 0, 5, + -0.430031948245f, -0.430031948245f, 0.264160069153f, 0.0f, 600, 0, 0, 6, + -0.500850251989f, -0.500850251989f, 0.271933664761f, 0.0f, 600, 0, 0, 7, + -0.571884835101f, -0.571884835101f, 0.27106905426f, 0.0f, 600, 0, 0, 8, + -0.642595081514f, -0.642595081514f, 0.26157281786f, 0.0f, 600, 0, 0, 9, + -0.712442843555f, -0.712442843555f, 0.243517227652f, 0.0f, 600, 0, 0, + 10, -0.78089653758f, -0.78089653758f, 0.217039697581f, 0.0f, 600, 0, 0, + 11, -0.847435189645f, -0.847435189645f, 0.182341737639f, 0.0f, 600, 0, + 0, 12, -0.911552400429f, -0.911552400429f, 0.13968742025f, 0.0f, 600, 0, + 0, 13, -0.972760199244f, -0.972760199244f, 0.089401370527f, 0.0f, 600, + 0, 0, 14, -1.03059275778f, -1.03059275778f, 0.0318662956709f, 0.0f, 600, + 0, 0, 15, -1.08460993535f, -1.08460993535f, -0.0324799276578f, 0.0f, + 600, 0, 0, 16, -1.13440062862f, -1.13440062862f, -0.103147585846f, 0.0f, + 600, 0, 0, 17, -1.17958590034f, -1.17958590034f, -0.179598855345f, 0.0f, + 600, 0, 0, 18, -1.21982186332f, -1.21982186332f, -0.261251895832f, 0.0f, + 600, 0, 0, 19, -1.25480229757f, -1.25480229757f, -0.347485278364f, 0.0f, + 600, 0, 0, 20, -1.28426098088f, -1.28426098088f, -0.437642714831f, 0.0f, + 600, 0, 0, 21, -1.30797371487f, -1.30797371487f, -0.531038052704f, 0.0f, + 600, 0, 0, 22, -1.32576003133f, -1.32576003133f, -0.626960497068f, 0.0f, + 600, 0, 0, 23, -1.33748456564f, -1.33748456564f, -0.724680020201f, 0.0f}; double d(1.0e-06); for (auto i = 0; i < 192; i++) { TS_ASSERT_DELTA(events[i], ref[i], d); @@ -936,55 +660,15 @@ public: // 8*7 = 56 TS_ASSERT_EQUALS(events.size(), 56); // reference vector - const std::vector<coord_t> ref = {32369, - 32369, - 0, - 3, - -0.291194311172f, - -0.291194311172f, - 0.223000198347f, - 31851, - 31851, - 0, - 4, - -0.359968893923f, - -0.359968893923f, - 0.247807429194f, - 30221, - 30221, - 0, - 5, - -0.430031948245f, - -0.430031948245f, - 0.264160069153f, - 26267, - 26267, - 0, - 6, - -0.500850251989f, - -0.500850251989f, - 0.271933664761f, - 26788, - 26788, - 0, - 7, - -0.571884835101f, - -0.571884835101f, - 0.27106905426f, - 29729, - 29729, - 0, - 8, - -0.642595081514f, - -0.642595081514f, - 0.26157281786f, - 30188, - 30188, - 0, - 9, - -0.712442843555f, - -0.712442843555f, - 0.243517227652f}; + const std::vector<coord_t> ref = { + 32369, 32369, 0, 3, -0.291194311172f, -0.291194311172f, 0.223000198347f, + 0.0f, 31851, 31851, 0, 4, -0.359968893923f, -0.359968893923f, + 0.247807429194f, 0.0f, 30221, 30221, 0, 5, -0.430031948245f, + -0.430031948245f, 0.264160069153f, 0.0f, 26267, 26267, 0, 6, + -0.500850251989f, -0.500850251989f, 0.271933664761f, 0.0f, 26788, 26788, + 0, 7, -0.571884835101f, -0.571884835101f, 0.27106905426f, 0.0f, 29729, + 29729, 0, 8, -0.642595081514f, -0.642595081514f, 0.26157281786f, 0.0f, + 30188, 30188, 0, 9, -0.712442843555f, -0.712442843555f, 0.243517227652f, 0.0f}; double d(1.0e-06); for (auto i = 0; i < 56; i++) { TS_ASSERT_DELTA(events[i], ref[i], d); -- GitLab