diff --git a/Framework/MDAlgorithms/test/LoadDNSSCDTest.h b/Framework/MDAlgorithms/test/LoadDNSSCDTest.h
index 4ac9c39fad1125c19a784eef072996352742272c..80a0fa3d0851296686c36bd4bcbd33ff2b236d04 100644
--- a/Framework/MDAlgorithms/test/LoadDNSSCDTest.h
+++ b/Framework/MDAlgorithms/test/LoadDNSSCDTest.h
@@ -219,30 +219,30 @@ public:
TS_ASSERT_EQUALS(events.size(), 168);
// reference vector
const std::vector<coord_t> ref = {
- 4366, 4366, 1, 0, -0.09776273, -0.09776273, 0.10005156, 31461, 31461, 1,
- 1, -0.15959044, -0.15959044, 0.14884006, 33314, 33314, 1, 2,
- -0.224231616093, -0.224231616093, 0.189927174618, 32369, 32369, 1, 3,
- -0.291194311172, -0.291194311172, 0.223000198347, 31851, 31851, 1, 4,
- -0.359968893923, -0.359968893923, 0.247807429194, 30221, 30221, 1, 5,
- -0.430031948245, -0.430031948245, 0.264160069153, 26267, 26267, 1, 6,
- -0.500850251989, -0.500850251989, 0.271933664761, 26788, 26788, 1, 7,
- -0.571884835101, -0.571884835101, 0.27106905426, 29729, 29729, 1, 8,
- -0.642595081514, -0.642595081514, 0.26157281786, 30188, 30188, 1, 9,
- -0.712442843555, -0.712442843555, 0.243517227652, 28116, 28116, 1, 10,
- -0.78089653758, -0.78089653758, 0.217039697581, 30277, 30277, 1, 11,
- -0.847435189645, -0.847435189645, 0.182341737639, 20231, 20231, 1, 12,
- -0.911552400429, -0.911552400429, 0.13968742025, 24538, 24538, 1, 13,
- -0.972760199244, -0.972760199244, 0.089401370527, 16416, 16416, 1, 14,
- -1.03059275778, -1.03059275778, 0.0318662956709, 20225, 20225, 1, 15,
- -1.08460993535, -1.08460993535, -0.0324799276578, 19957, 19957, 1, 16,
- -1.13440062862, -1.13440062862, -0.103147585846, 19570, 19570, 1, 17,
- -1.17958590034, -1.17958590034, -0.179598855345, 20743, 20743, 1, 18,
- -1.21982186332, -1.21982186332, -0.261251895832, 22758, 22758, 1, 19,
- -1.25480229757, -1.25480229757, -0.347485278364, 23001, 23001, 1, 20,
- -1.28426098088, -1.28426098088, -0.437642714831, 21836, 21836, 1, 21,
- -1.30797371487, -1.30797371487, -0.531038052704, 23877, 23877, 1, 22,
- -1.32576003133, -1.32576003133, -0.626960497068, 13340, 13340, 1, 23,
- -1.33748456564, -1.33748456564, -0.724680020201};
+ 4366, 4366, 1, 0, -0.09776273f, -0.09776273f, 0.10005156f, 31461, 31461, 1,
+ 1, -0.15959044f, -0.15959044f, 0.14884006f, 33314, 33314, 1, 2,
+ -0.224231616093f, -0.224231616093f, 0.189927174618f, 32369, 32369, 1, 3,
+ -0.291194311172f, -0.291194311172f, 0.223000198347f, 31851, 31851, 1, 4,
+ -0.359968893923f, -0.359968893923f, 0.247807429194f, 30221, 30221, 1, 5,
+ -0.430031948245f, -0.430031948245f, 0.264160069153f, 26267, 26267, 1, 6,
+ -0.500850251989f, -0.500850251989f, 0.271933664761f, 26788, 26788, 1, 7,
+ -0.571884835101f, -0.571884835101f, 0.27106905426, 29729, 29729, 1, 8,
+ -0.642595081514f, -0.642595081514f, 0.26157281786f, 30188, 30188, 1, 9,
+ -0.712442843555f, -0.712442843555f, 0.243517227652f, 28116, 28116, 1, 10,
+ -0.78089653758f, -0.78089653758f, 0.217039697581f, 30277, 30277, 1, 11,
+ -0.847435189645f, -0.847435189645f, 0.182341737639f, 20231, 20231, 1, 12,
+ -0.911552400429f, -0.911552400429f, 0.13968742025f, 24538, 24538, 1, 13,
+ -0.972760199244f, -0.972760199244f, 0.089401370527f, 16416, 16416, 1, 14,
+ -1.03059275778f, -1.03059275778f, 0.0318662956709f, 20225, 20225, 1, 15,
+ -1.08460993535f, -1.08460993535f, -0.0324799276578f, 19957, 19957, 1, 16,
+ -1.13440062862f, -1.13440062862f, -0.103147585846f, 19570, 19570, 1, 17,
+ -1.17958590034f, -1.17958590034f, -0.179598855345f, 20743, 20743, 1, 18,
+ -1.21982186332f, -1.21982186332f, -0.261251895832f, 22758, 22758, 1, 19,
+ -1.25480229757f, -1.25480229757f, -0.347485278364f, 23001, 23001, 1, 20,
+ -1.28426098088f, -1.28426098088f, -0.437642714831f, 21836, 21836, 1, 21,
+ -1.30797371487f, -1.30797371487f, -0.531038052704f, 23877, 23877, 1, 22,
+ -1.32576003133f, -1.32576003133f, -0.626960497068f, 13340, 13340, 1, 23,
+ -1.33748456564f, -1.33748456564f, -0.724680020201f};
double d(1.0e-06);
for (auto i = 0; i < 168; i++) {
TS_ASSERT_DELTA(events[i], ref[i], d);
@@ -347,32 +347,32 @@ public:
// reference vector
const std::vector<coord_t> ref = {
8332872, 8332872, 1, 0, -0.09776273, -0.09776273, 0.10005156, 8332872,
- 8332872, 1, 1, -0.15959044, -0.15959044, 0.14884006, 8332872, 8332872,
- 1, 2, -0.224231616093, -0.224231616093, 0.189927174618, 8332872,
- 8332872, 1, 3, -0.291194311172, -0.291194311172, 0.223000198347,
- 8332872, 8332872, 1, 4, -0.359968893923, -0.359968893923,
- 0.247807429194, 8332872, 8332872, 1, 5, -0.430031948245,
- -0.430031948245, 0.264160069153, 8332872, 8332872, 1, 6,
- -0.500850251989, -0.500850251989, 0.271933664761, 8332872, 8332872, 1,
- 7, -0.571884835101, -0.571884835101, 0.27106905426, 8332872, 8332872, 1,
- 8, -0.642595081514, -0.642595081514, 0.26157281786, 8332872, 8332872, 1,
- 9, -0.712442843555, -0.712442843555, 0.243517227652, 8332872, 8332872,
- 1, 10, -0.78089653758, -0.78089653758, 0.217039697581, 8332872, 8332872,
- 1, 11, -0.847435189645, -0.847435189645, 0.182341737639, 8332872,
- 8332872, 1, 12, -0.911552400429, -0.911552400429, 0.13968742025,
- 8332872, 8332872, 1, 13, -0.972760199244, -0.972760199244,
- 0.089401370527, 8332872, 8332872, 1, 14, -1.03059275778, -1.03059275778,
- 0.0318662956709, 8332872, 8332872, 1, 15, -1.08460993535,
- -1.08460993535, -0.0324799276578, 8332872, 8332872, 1, 16,
- -1.13440062862, -1.13440062862, -0.103147585846, 8332872, 8332872, 1,
- 17, -1.17958590034, -1.17958590034, -0.179598855345, 8332872, 8332872,
- 1, 18, -1.21982186332, -1.21982186332, -0.261251895832, 8332872,
- 8332872, 1, 19, -1.25480229757, -1.25480229757, -0.347485278364,
- 8332872, 8332872, 1, 20, -1.28426098088, -1.28426098088,
- -0.437642714831, 8332872, 8332872, 1, 21, -1.30797371487,
- -1.30797371487, -0.531038052704, 8332872, 8332872, 1, 22,
- -1.32576003133, -1.32576003133, -0.626960497068, 8332872, 8332872, 1,
- 23, -1.33748456564, -1.33748456564, -0.724680020201};
+ 8332872, 1, 1, -0.15959044f, -0.15959044f, 0.14884006f, 8332872, 8332872,
+ 1, 2, -0.224231616093f, -0.224231616093f, 0.189927174618f, 8332872,
+ 8332872, 1, 3, -0.291194311172f, -0.291194311172f, 0.223000198347f,
+ 8332872, 8332872, 1, 4, -0.359968893923f, -0.359968893923f,
+ 0.247807429194f, 8332872, 8332872, 1, 5, -0.430031948245f,
+ -0.430031948245f, 0.264160069153f, 8332872, 8332872, 1, 6,
+ -0.500850251989f, -0.500850251989f, 0.271933664761f, 8332872, 8332872, 1,
+ 7, -0.571884835101f, -0.571884835101f, 0.27106905426, 8332872, 8332872, 1,
+ 8, -0.642595081514f, -0.642595081514f, 0.26157281786f, 8332872, 8332872, 1,
+ 9, -0.712442843555f, -0.712442843555f, 0.243517227652f, 8332872, 8332872,
+ 1, 10, -0.78089653758f, -0.78089653758f, 0.217039697581f, 8332872, 8332872,
+ 1, 11, -0.847435189645f, -0.847435189645f, 0.182341737639f, 8332872,
+ 8332872, 1, 12, -0.911552400429f, -0.911552400429f, 0.13968742025f,
+ 8332872, 8332872, 1, 13, -0.972760199244f, -0.972760199244f,
+ 0.089401370527f, 8332872, 8332872, 1, 14, -1.03059275778f, -1.03059275778f,
+ 0.0318662956709f, 8332872, 8332872, 1, 15, -1.08460993535f,
+ -1.08460993535f, -0.0324799276578f, 8332872, 8332872, 1, 16,
+ -1.13440062862f, -1.13440062862f, -0.103147585846f, 8332872, 8332872, 1,
+ 17, -1.17958590034f, -1.17958590034f, -0.179598855345f, 8332872, 8332872,
+ 1, 18, -1.21982186332f, -1.21982186332f, -0.261251895832f, 8332872,
+ 8332872, 1, 19, -1.25480229757f, -1.25480229757f, -0.347485278364f,
+ 8332872, 8332872, 1, 20, -1.28426098088f, -1.28426098088f,
+ -0.437642714831f, 8332872, 8332872, 1, 21, -1.30797371487f,
+ -1.30797371487f, -0.531038052704f, 8332872, 8332872, 1, 22,
+ -1.32576003133f, -1.32576003133f, -0.626960497068f, 8332872, 8332872, 1,
+ 23, -1.33748456564f, -1.33748456564f, -0.724680020201f};
double d(1.0e-06);
for (auto i = 0; i < 168; i++) {
TS_ASSERT_DELTA(events[i], ref[i], d);
@@ -431,29 +431,29 @@ public:
// reference vector
const std::vector<coord_t> ref = {
600, 0, 1, 0, -0.09776273, -0.09776273, 0.10005156, 600, 0, 1, 1,
- -0.15959044, -0.15959044, 0.14884006, 600, 0, 1, 2, -0.224231616093,
- -0.224231616093, 0.189927174618, 600, 0, 1, 3, -0.291194311172,
- -0.291194311172, 0.223000198347, 600, 0, 1, 4, -0.359968893923,
- -0.359968893923, 0.247807429194, 600, 0, 1, 5, -0.430031948245,
- -0.430031948245, 0.264160069153, 600, 0, 1, 6, -0.500850251989,
- -0.500850251989, 0.271933664761, 600, 0, 1, 7, -0.571884835101,
- -0.571884835101, 0.27106905426, 600, 0, 1, 8, -0.642595081514,
- -0.642595081514, 0.26157281786, 600, 0, 1, 9, -0.712442843555,
- -0.712442843555, 0.243517227652, 600, 0, 1, 10, -0.78089653758,
- -0.78089653758, 0.217039697581, 600, 0, 1, 11, -0.847435189645,
- -0.847435189645, 0.182341737639, 600, 0, 1, 12, -0.911552400429,
- -0.911552400429, 0.13968742025, 600, 0, 1, 13, -0.972760199244,
- -0.972760199244, 0.089401370527, 600, 0, 1, 14, -1.03059275778,
- -1.03059275778, 0.0318662956709, 600, 0, 1, 15, -1.08460993535,
- -1.08460993535, -0.0324799276578, 600, 0, 1, 16, -1.13440062862,
- -1.13440062862, -0.103147585846, 600, 0, 1, 17, -1.17958590034,
- -1.17958590034, -0.179598855345, 600, 0, 1, 18, -1.21982186332,
- -1.21982186332, -0.261251895832, 600, 0, 1, 19, -1.25480229757,
- -1.25480229757, -0.347485278364, 600, 0, 1, 20, -1.28426098088,
- -1.28426098088, -0.437642714831, 600, 0, 1, 21, -1.30797371487,
- -1.30797371487, -0.531038052704, 600, 0, 1, 22, -1.32576003133,
- -1.32576003133, -0.626960497068, 600, 0, 1, 23, -1.33748456564,
- -1.33748456564, -0.724680020201};
+ -0.15959044f, -0.15959044f, 0.14884006f, 600, 0, 1, 2, -0.224231616093f,
+ -0.224231616093f, 0.189927174618f, 600, 0, 1, 3, -0.291194311172f,
+ -0.291194311172f, 0.223000198347f, 600, 0, 1, 4, -0.359968893923f,
+ -0.359968893923f, 0.247807429194f, 600, 0, 1, 5, -0.430031948245f,
+ -0.430031948245f, 0.264160069153f, 600, 0, 1, 6, -0.500850251989f,
+ -0.500850251989f, 0.271933664761f, 600, 0, 1, 7, -0.571884835101f,
+ -0.571884835101f, 0.27106905426, 600, 0, 1, 8, -0.642595081514f,
+ -0.642595081514f, 0.26157281786f, 600, 0, 1, 9, -0.712442843555f,
+ -0.712442843555f, 0.243517227652f, 600, 0, 1, 10, -0.78089653758f,
+ -0.78089653758f, 0.217039697581f, 600, 0, 1, 11, -0.847435189645f,
+ -0.847435189645f, 0.182341737639f, 600, 0, 1, 12, -0.911552400429f,
+ -0.911552400429f, 0.13968742025f, 600, 0, 1, 13, -0.972760199244f,
+ -0.972760199244f, 0.089401370527f, 600, 0, 1, 14, -1.03059275778f,
+ -1.03059275778f, 0.0318662956709f, 600, 0, 1, 15, -1.08460993535f,
+ -1.08460993535f, -0.0324799276578f, 600, 0, 1, 16, -1.13440062862f,
+ -1.13440062862f, -0.103147585846f, 600, 0, 1, 17, -1.17958590034f,
+ -1.17958590034f, -0.179598855345f, 600, 0, 1, 18, -1.21982186332f,
+ -1.21982186332f, -0.261251895832f, 600, 0, 1, 19, -1.25480229757f,
+ -1.25480229757f, -0.347485278364f, 600, 0, 1, 20, -1.28426098088f,
+ -1.28426098088f, -0.437642714831f, 600, 0, 1, 21, -1.30797371487f,
+ -1.30797371487f, -0.531038052704f, 600, 0, 1, 22, -1.32576003133f,
+ -1.32576003133f, -0.626960497068f, 600, 0, 1, 23, -1.33748456564f,
+ -1.33748456564f, -0.724680020201f};
double d(1.0e-06);
for (auto i = 0; i < 168; i++) {
TS_ASSERT_DELTA(events[i], ref[i], d);
@@ -613,13 +613,13 @@ public:
TS_ASSERT_EQUALS(events.size(), 49);
// reference vector
const std::vector<coord_t> ref = {
- 32369, 32369, 1, 3, -0.291194311172, -0.291194311172, 0.223000198347,
- 31851, 31851, 1, 4, -0.359968893923, -0.359968893923, 0.247807429194,
- 30221, 30221, 1, 5, -0.430031948245, -0.430031948245, 0.264160069153,
- 26267, 26267, 1, 6, -0.500850251989, -0.500850251989, 0.271933664761,
- 26788, 26788, 1, 7, -0.571884835101, -0.571884835101, 0.27106905426,
- 29729, 29729, 1, 8, -0.642595081514, -0.642595081514, 0.26157281786,
- 30188, 30188, 1, 9, -0.712442843555, -0.712442843555, 0.243517227652};
+ 32369, 32369, 1, 3, -0.291194311172f, -0.291194311172f, 0.223000198347f,
+ 31851, 31851, 1, 4, -0.359968893923f, -0.359968893923f, 0.247807429194f,
+ 30221, 30221, 1, 5, -0.430031948245f, -0.430031948245f, 0.264160069153f,
+ 26267, 26267, 1, 6, -0.500850251989f, -0.500850251989f, 0.271933664761f,
+ 26788, 26788, 1, 7, -0.571884835101f, -0.571884835101f, 0.27106905426,
+ 29729, 29729, 1, 8, -0.642595081514f, -0.642595081514f, 0.26157281786f,
+ 30188, 30188, 1, 9, -0.712442843555f, -0.712442843555f, 0.243517227652f};
double d(1.0e-06);
for (auto i = 0; i < 49; i++) {
TS_ASSERT_DELTA(events[i], ref[i], d);