diff --git a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDDimensionExtents.h b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDDimensionExtents.h index 65d940db46fe6da9e24ea84a977dc2624bd218ef..848e4610e05ec0371997e71d9928aee106028637 100644 --- a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDDimensionExtents.h +++ b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDDimensionExtents.h @@ -37,8 +37,8 @@ namespace Geometry /** Empty constructor - reset everything. * */ MDDimensionExtents() : - min( coord_t(1e30) ), - max( coord_t(-1e30) ) + min( 1e30f ), + max( -1e30f ) { } // ---- Public members ---------- diff --git a/Code/Mantid/Framework/Geometry/src/MDGeometry/MDPlane.cpp b/Code/Mantid/Framework/Geometry/src/MDGeometry/MDPlane.cpp index ffcda27627186d21b5b1cfe059d8a49fb45acbf8..570c9a69df0fdd1605f3050a3540b149c092df22 100644 --- a/Code/Mantid/Framework/Geometry/src/MDGeometry/MDPlane.cpp +++ b/Code/Mantid/Framework/Geometry/src/MDGeometry/MDPlane.cpp @@ -94,7 +94,7 @@ namespace Geometry // Flip the normal over delete [] this->m_normal; for (size_t d=0; d<normal.getNumDims(); d++) - normal[d] = coord_t(-1.0) * normal[d]; + normal[d] = -1.0f * normal[d]; // And re-construct construct(normal, origin); } diff --git a/Code/Mantid/Framework/MDEvents/test/MDBoxIteratorTest.h b/Code/Mantid/Framework/MDEvents/test/MDBoxIteratorTest.h index fe0e260c52b90155d25e503c6ed1fad5f69959de..3cbf93b4204e3c1677df5c62d52cac5c0354b891 100644 --- a/Code/Mantid/Framework/MDEvents/test/MDBoxIteratorTest.h +++ b/Code/Mantid/Framework/MDEvents/test/MDBoxIteratorTest.h @@ -589,7 +589,7 @@ public: coord_t normal1[3] = {coord_t(+1.000), 0, 0}; coord_t origin1[3] = {coord_t(+2.201), 0, 0}; function->addPlane(MDPlane(3,normal1, origin1)); - coord_t normal2[3] = {coord_t(-1.000), 0, 0}; + coord_t normal2[3] = {-1.000f, 0, 0}; coord_t origin2[3] = {coord_t(+2.399), 0, 0}; function->addPlane(MDPlane(3,normal2, origin2)); top->getBoxes(boxes, 20, leafOnly, function); @@ -597,7 +597,7 @@ public: else if (ImplicitFunction==3) { // Box in 3D where -5 < (x,y,z) < +10 - std::vector<coord_t> min(3, coord_t(-4.999)); + std::vector<coord_t> min(3, -4.999f); std::vector<coord_t> max(3, coord_t(+9.999)); function = new MDBoxImplicitFunction(min, max); top->getBoxes(boxes, 20, leafOnly, function); diff --git a/Code/Mantid/Framework/MDEvents/test/MDEventWorkspaceTest.h b/Code/Mantid/Framework/MDEvents/test/MDEventWorkspaceTest.h index 8363352d23eaba9f7c0c58eb87d9da1d1a4c8749..47001fb1f6a878b4bf1d617f81d36a48ad2e8d3e 100644 --- a/Code/Mantid/Framework/MDEvents/test/MDEventWorkspaceTest.h +++ b/Code/Mantid/Framework/MDEvents/test/MDEventWorkspaceTest.h @@ -180,7 +180,7 @@ public: MDEventWorkspace3Lean::sptr ew = MDEventsTestHelper::makeMDEW<3>(4, 0.0, 4.0, 1); coord_t coords1[3] = {1.5,1.5,1.5}; coord_t coords2[3] = {2.5,2.5,2.5}; - coord_t coords3[3] = {coord_t(-0.1), 2, 2}; + coord_t coords3[3] = {-0.1f, 2, 2}; coord_t coords4[3] = {2, 2, 4.1f}; ew->addEvent(MDLeanEvent<3>(2.0, 2.0, coords2)); ew->refreshCache(); diff --git a/Code/Mantid/MantidQt/SliceViewer/src/SliceViewer.cpp b/Code/Mantid/MantidQt/SliceViewer/src/SliceViewer.cpp index 14aaa6c7952da3b55af4544884234cb06f873944..62b506398f2363e231aeb68a5e179e797c725178 100644 --- a/Code/Mantid/MantidQt/SliceViewer/src/SliceViewer.cpp +++ b/Code/Mantid/MantidQt/SliceViewer/src/SliceViewer.cpp @@ -1058,7 +1058,7 @@ void SliceViewer::findRangeSlice() else { // Is a slice. Take a slice of widht = binWidth - min[d] = VMD_t(widget->getSlicePoint()) - dim->getBinWidth() * VMD_t(0.45); + min[d] = VMD_t(widget->getSlicePoint()) - dim->getBinWidth() * 0.45f; max[d] = min[d] + dim->getBinWidth(); } }