From ee9d483d867d154084b0b36c547dbb75b3c6a05f Mon Sep 17 00:00:00 2001
From: Marina Ganeva <m.ganeva@fz-juelich.de>
Date: Thu, 15 Mar 2018 14:53:43 +0100
Subject: [PATCH] Refs #21293 LoadDNSSCD: float conversion warnings
---
Framework/MDAlgorithms/test/LoadDNSSCDTest.h | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/Framework/MDAlgorithms/test/LoadDNSSCDTest.h b/Framework/MDAlgorithms/test/LoadDNSSCDTest.h
index a79a329e592..6fce45d4f4d 100644
--- a/Framework/MDAlgorithms/test/LoadDNSSCDTest.h
+++ b/Framework/MDAlgorithms/test/LoadDNSSCDTest.h
@@ -226,7 +226,7 @@ public:
-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.571884835101f, -0.571884835101f, 0.27106905426f, 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,
@@ -347,7 +347,7 @@ public:
TS_ASSERT_EQUALS(events.size(), 168);
// reference vector
const std::vector<coord_t> ref = {
- 8332872, 8332872, 1, 0, -0.09776273, -0.09776273, 0.10005156, 8332872,
+ 8332872, 8332872, 1, 0, -0.09776273f, -0.09776273f, 0.10005156f, 8332872,
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,
@@ -355,7 +355,7 @@ public:
-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, 1, 7, -0.571884835101f, -0.571884835101f, 0.27106905426f,
8332872, 8332872, 1, 8, -0.642595081514f, -0.642595081514f,
0.26157281786f, 8332872, 8332872, 1, 9, -0.712442843555f,
-0.712442843555f, 0.243517227652f, 8332872, 8332872, 1, 10,
@@ -433,14 +433,14 @@ public:
TS_ASSERT_EQUALS(events.size(), 168);
// reference vector
const std::vector<coord_t> ref = {
- 600, 0, 1, 0, -0.09776273, -0.09776273, 0.10005156, 600, 0, 1, 1,
+ 600, 0, 1, 0, -0.09776273f, -0.09776273f, 0.10005156f, 600, 0, 1, 1,
-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.571884835101f, 0.27106905426f, 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,
@@ -620,7 +620,7 @@ public:
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,
+ 26788, 26788, 1, 7, -0.571884835101f, -0.571884835101f, 0.27106905426f,
29729, 29729, 1, 8, -0.642595081514f, -0.642595081514f, 0.26157281786f,
30188, 30188, 1, 9, -0.712442843555f, -0.712442843555f,
0.243517227652f};
--
GitLab