diff --git a/Framework/CurveFitting/test/Algorithms/VesuvioCalculateMSTest.h b/Framework/CurveFitting/test/Algorithms/VesuvioCalculateMSTest.h index 875ed5020e7138821ae5e394b132475250bd7421..128c57e8c7009ab8d4344ebfbb4af62b0512acb9 100644 --- a/Framework/CurveFitting/test/Algorithms/VesuvioCalculateMSTest.h +++ b/Framework/CurveFitting/test/Algorithms/VesuvioCalculateMSTest.h @@ -78,7 +78,8 @@ createTestWorkspace(const bool detShape = true, if (groupedDets) { // Add another detector in the same position as the first auto shape = ShapeFactory().createShape(shapeXML); - Mantid::Geometry::Detector *det2 = new Detector("det1", 2, shape, nullptr); + Mantid::Geometry::Detector *det2 = + new Detector("det1", 2, shape, nullptr); // Setting detectors should normally go via DetectorInfo, but here we need // to set a position as we are adding a new detector. In general getPos // should not be called as this tries to set the position of the base diff --git a/Framework/MDAlgorithms/test/SlicingAlgorithmTest.h b/Framework/MDAlgorithms/test/SlicingAlgorithmTest.h index a2038d7a0f2c628eaa37950849984c107db151e7..0d558dbcf5f121b919345f2ceedfa9e5197ea267 100644 --- a/Framework/MDAlgorithms/test/SlicingAlgorithmTest.h +++ b/Framework/MDAlgorithms/test/SlicingAlgorithmTest.h @@ -332,7 +332,8 @@ public: void test_aligned_ImplicitFunction() { SlicingAlgorithmImpl *alg = do_createAlignedTransform( "Axis0, 2.0,8.0, 6", "Axis1, 2.0,8.0, 3", "Axis2, 2.0,8.0, 3", ""); - MDImplicitFunction *func = alg->getImplicitFunctionForChunk(nullptr, nullptr); + MDImplicitFunction *func = + alg->getImplicitFunctionForChunk(nullptr, nullptr); TS_ASSERT(func); TS_ASSERT_EQUALS(func->getNumPlanes(), 6); TS_ASSERT(func->isPointContained(VMD(3, 4, 5))); @@ -681,7 +682,8 @@ public: TS_ASSERT_EQUALS(VMD(3, in), VMD(3.0, 1.0, 2.6)); // The implicit function - MDImplicitFunction *func = alg->getImplicitFunctionForChunk(nullptr, nullptr); + MDImplicitFunction *func = + alg->getImplicitFunctionForChunk(nullptr, nullptr); TS_ASSERT(func); TS_ASSERT_EQUALS(func->getNumPlanes(), 6); TS_ASSERT(func->isPointContained(VMD(1.5, 1.5, 2))); @@ -738,7 +740,8 @@ public: TS_ASSERT_EQUALS(VMD(3, in), VMD(3.0, -1.0, 2.6)); // The implicit function - MDImplicitFunction *func = alg->getImplicitFunctionForChunk(nullptr, nullptr); + MDImplicitFunction *func = + alg->getImplicitFunctionForChunk(nullptr, nullptr); TS_ASSERT(func); TS_ASSERT_EQUALS(func->getNumPlanes(), 6); TS_ASSERT(func->isPointContained(VMD(1.5, -1.5, 2))); @@ -756,8 +759,8 @@ public: // The implicit function MDImplicitFunction *func(nullptr); - TS_ASSERT_THROWS_NOTHING(func = - alg->getImplicitFunctionForChunk(nullptr, nullptr)); + TS_ASSERT_THROWS_NOTHING( + func = alg->getImplicitFunctionForChunk(nullptr, nullptr)); TS_ASSERT(func); TS_ASSERT_EQUALS(func->getNumPlanes(), 6); TS_ASSERT(func->isPointContained(VMD(1.5, 1.5, 2, 234))); @@ -777,8 +780,8 @@ public: // The implicit function MDImplicitFunction *func(nullptr); - TS_ASSERT_THROWS_NOTHING(func = - alg->getImplicitFunctionForChunk(nullptr, nullptr)); + TS_ASSERT_THROWS_NOTHING( + func = alg->getImplicitFunctionForChunk(nullptr, nullptr)); TS_ASSERT(func); TS_ASSERT_EQUALS(func->getNumPlanes(), 8); TS_ASSERT(func->isPointContained(VMD(1.5, 1.5, 1.5, 1.5))); @@ -796,8 +799,8 @@ public: // The implicit function MDImplicitFunction *func(nullptr); - TS_ASSERT_THROWS_NOTHING(func = - alg->getImplicitFunctionForChunk(nullptr, nullptr)); + TS_ASSERT_THROWS_NOTHING( + func = alg->getImplicitFunctionForChunk(nullptr, nullptr)); TS_ASSERT(func); TS_ASSERT_EQUALS(func->getNumPlanes(), 8); TS_ASSERT(func->isPointContained(VMD(1.5, -1.5, 1.5, 1.5))); @@ -814,8 +817,8 @@ public: // The implicit function MDImplicitFunction *func(nullptr); - TS_ASSERT_THROWS_NOTHING(func = - alg->getImplicitFunctionForChunk(nullptr, nullptr)); + TS_ASSERT_THROWS_NOTHING( + func = alg->getImplicitFunctionForChunk(nullptr, nullptr)); TS_ASSERT(func); TS_ASSERT_EQUALS(func->getNumPlanes(), 6); TS_ASSERT(func->isPointContained(VMD(1.5, 1.5, 2, 234, 456))); @@ -835,8 +838,8 @@ public: // The implicit function MDImplicitFunction *func(nullptr); - TS_ASSERT_THROWS_NOTHING(func = - alg->getImplicitFunctionForChunk(nullptr, nullptr)); + TS_ASSERT_THROWS_NOTHING( + func = alg->getImplicitFunctionForChunk(nullptr, nullptr)); TS_ASSERT(func); TS_ASSERT_EQUALS(func->getNumPlanes(), 4); TS_ASSERT(func->isPointContained(VMD(1.5, 1.5, 2, 234))); @@ -854,8 +857,8 @@ public: // The implicit function MDImplicitFunction *func(nullptr); - TS_ASSERT_THROWS_NOTHING(func = - alg->getImplicitFunctionForChunk(nullptr, nullptr)); + TS_ASSERT_THROWS_NOTHING( + func = alg->getImplicitFunctionForChunk(nullptr, nullptr)); TS_ASSERT(func); TS_ASSERT_EQUALS(func->getNumPlanes(), 4); TS_ASSERT(func->isPointContained(VMD(1.5, 1.5, 2))); @@ -873,8 +876,8 @@ public: // The implicit function MDImplicitFunction *func(nullptr); - TS_ASSERT_THROWS_NOTHING(func = - alg->getImplicitFunctionForChunk(nullptr, nullptr)); + TS_ASSERT_THROWS_NOTHING( + func = alg->getImplicitFunctionForChunk(nullptr, nullptr)); TS_ASSERT(func); TS_ASSERT_EQUALS(func->getNumPlanes(), 4); TS_ASSERT(func->isPointContained(VMD(1.5, 1.5))); @@ -932,7 +935,8 @@ public: TS_ASSERT_EQUALS(VMD(2, in), VMD(3., -11.)); // The implicit function - MDImplicitFunction *func = alg->getImplicitFunctionForChunk(nullptr, nullptr); + MDImplicitFunction *func = + alg->getImplicitFunctionForChunk(nullptr, nullptr); TS_ASSERT(func); TS_ASSERT_EQUALS(func->getNumPlanes(), 4); TS_ASSERT(func->isPointContained(VMD(-8.9, -18.9))); @@ -997,7 +1001,8 @@ public: TS_ASSERT_EQUALS(VMD(2, in), VMD(3., -11.)); // The implicit function - MDImplicitFunction *func = alg->getImplicitFunctionForChunk(nullptr, nullptr); + MDImplicitFunction *func = + alg->getImplicitFunctionForChunk(nullptr, nullptr); TS_ASSERT(func); TS_ASSERT_EQUALS(func->getNumPlanes(), 4); TS_ASSERT(func->isPointContained(VMD(-18.9, -98.9))); @@ -1026,8 +1031,8 @@ public: // The implicit function MDImplicitFunction *func(nullptr); - TS_ASSERT_THROWS_NOTHING(func = - alg->getImplicitFunctionForChunk(nullptr, nullptr)); + TS_ASSERT_THROWS_NOTHING( + func = alg->getImplicitFunctionForChunk(nullptr, nullptr)); TS_ASSERT(func); TS_ASSERT_EQUALS(func->getNumPlanes(), 4); TS_ASSERT(func->isPointContained(VMD(2., 1.))); @@ -1048,8 +1053,8 @@ public: // The implicit function MDImplicitFunction *func(nullptr); - TS_ASSERT_THROWS_NOTHING(func = - alg->getImplicitFunctionForChunk(nullptr, nullptr)); + TS_ASSERT_THROWS_NOTHING( + func = alg->getImplicitFunctionForChunk(nullptr, nullptr)); TS_ASSERT(func); TS_ASSERT_EQUALS(func->getNumPlanes(), 4); TS_ASSERT(func->isPointContained(VMD(2., 1., 0.))); @@ -1072,8 +1077,8 @@ public: // The implicit function MDImplicitFunction *func(nullptr); - TS_ASSERT_THROWS_NOTHING(func = - alg->getImplicitFunctionForChunk(nullptr, nullptr)); + TS_ASSERT_THROWS_NOTHING( + func = alg->getImplicitFunctionForChunk(nullptr, nullptr)); TS_ASSERT(func); TS_ASSERT_EQUALS(func->getNumPlanes(), 8); TS_ASSERT(func->isPointContained(VMD(2., 1., 0., 0.))); @@ -1093,8 +1098,8 @@ public: // The implicit function MDImplicitFunction *func(nullptr); - TS_ASSERT_THROWS_NOTHING(func = - alg->getImplicitFunctionForChunk(nullptr, nullptr)); + TS_ASSERT_THROWS_NOTHING( + func = alg->getImplicitFunctionForChunk(nullptr, nullptr)); TS_ASSERT(func); TS_ASSERT_EQUALS(func->getNumPlanes(), 6); TS_ASSERT(func->isPointContained(VMD(2., 1., 0., 0.))); @@ -1112,7 +1117,8 @@ public: TS_ASSERT_EQUALS(alg->m_bases.size(), 1); // The implicit function - MDImplicitFunction *func = alg->getImplicitFunctionForChunk(nullptr, nullptr); + MDImplicitFunction *func = + alg->getImplicitFunctionForChunk(nullptr, nullptr); TS_ASSERT(func); TS_ASSERT_EQUALS(func->getNumPlanes(), 2); TS_ASSERT(func->isPointContained(VMD(1.5, 1.5, 2, 345))); @@ -1127,7 +1133,8 @@ public: TS_ASSERT_EQUALS(alg->m_bases.size(), 1); // The implicit function - MDImplicitFunction *func = alg->getImplicitFunctionForChunk(nullptr, nullptr); + MDImplicitFunction *func = + alg->getImplicitFunctionForChunk(nullptr, nullptr); TS_ASSERT(func); TS_ASSERT_EQUALS(func->getNumPlanes(), 2); TS_ASSERT(func->isPointContained(VMD(1.5, 1.5, 2))); @@ -1142,7 +1149,8 @@ public: TS_ASSERT_EQUALS(alg->m_bases.size(), 1); // The implicit function - MDImplicitFunction *func = alg->getImplicitFunctionForChunk(nullptr, nullptr); + MDImplicitFunction *func = + alg->getImplicitFunctionForChunk(nullptr, nullptr); TS_ASSERT(func); TS_ASSERT_EQUALS(func->getNumPlanes(), 2); TS_ASSERT(func->isPointContained(VMD(1.5, 1.5))); @@ -1159,7 +1167,8 @@ public: TS_ASSERT_EQUALS(alg->m_bases.size(), 1); // The implicit function - MDImplicitFunction *func = alg->getImplicitFunctionForChunk(nullptr, nullptr); + MDImplicitFunction *func = + alg->getImplicitFunctionForChunk(nullptr, nullptr); TS_ASSERT(func); TS_ASSERT_EQUALS(func->getNumPlanes(), 2); VMD point(1);