Commit 06f3cbce authored by mantid-builder's avatar mantid-builder Committed by Karl Palmen
Browse files

clang-format PR21245 8a490428

parent 8a490428
......@@ -98,11 +98,11 @@ public:
int version() const override { return (1); }
protected:
API::MatrixWorkspace_sptr m_inputWS; ///< A pointer to the input workspace
API::MatrixWorkspace_sptr m_inputWS; ///< A pointer to the input workspace
const Geometry::IObject *m_sampleObject; ///< Local cache of sample object.
Kernel::V3D m_beamDirection; ///< The direction of the beam.
std::vector<double> m_L1s, ///< Cached L1 distances
m_elementVolumes; ///< Cached element volumes
Kernel::V3D m_beamDirection; ///< The direction of the beam.
std::vector<double> m_L1s, ///< Cached L1 distances
m_elementVolumes; ///< Cached element volumes
std::vector<Kernel::V3D> m_elementPositions; ///< Cached element positions
size_t m_numVolumeElements; ///< The number of volume elements
double m_sampleVolume; ///< The total volume of the sample
......
......@@ -564,8 +564,8 @@ Instrument_sptr CreateSampleWorkspace::createTestInstrumentRectangular(
}
// Define a source component
ObjComponent *source =
new ObjComponent("moderator", IObject_sptr(new CSGObject), testInst.get());
ObjComponent *source = new ObjComponent(
"moderator", IObject_sptr(new CSGObject), testInst.get());
source->setPos(V3D(0.0, 0.0, -sourceSampleDistance));
testInst->add(source);
testInst->markAsSource(source);
......
......@@ -342,7 +342,8 @@ void LoadNXSPE::exec() {
setProperty("OutputWorkspace", outputWS);
}
Geometry::IObject_sptr LoadNXSPE::createCuboid(double dx, double dy, double dz) {
Geometry::IObject_sptr LoadNXSPE::createCuboid(double dx, double dy,
double dz) {
dx = 0.5 * std::fabs(dx);
dy = 0.5 * std::fabs(dy);
......
......@@ -321,7 +321,8 @@ public:
// A sphere
std::string ObjSphere = "-41";
boost::shared_ptr<CSGObject> geom_obj = boost::shared_ptr<CSGObject>(new CSGObject);
boost::shared_ptr<CSGObject> geom_obj =
boost::shared_ptr<CSGObject>(new CSGObject);
geom_obj->setObject(41, ObjSphere);
geom_obj->populate(SphSurMap);
......@@ -1162,7 +1163,8 @@ private:
// using surface ids: 31 (cylinder) 32 (plane (top) ) and 33 (plane (base))
std::string ObjCapCylinder = "-31 -32 33";
boost::shared_ptr<CSGObject> retVal = boost::shared_ptr<CSGObject>(new CSGObject);
boost::shared_ptr<CSGObject> retVal =
boost::shared_ptr<CSGObject>(new CSGObject);
retVal->setObject(21, ObjCapCylinder);
retVal->populate(CylSurMap);
......@@ -1197,7 +1199,8 @@ private:
// using surface ids: 31 (cylinder) 32 (plane (top) ) and 33 (plane (base))
std::string ObjCapCylinder = "-31 -32 33";
boost::shared_ptr<CSGObject> retVal = boost::shared_ptr<CSGObject>(new CSGObject);
boost::shared_ptr<CSGObject> retVal =
boost::shared_ptr<CSGObject>(new CSGObject);
retVal->setObject(21, ObjCapCylinder);
retVal->populate(CylSurMap);
......@@ -1297,7 +1300,8 @@ private:
// using surface ids: 1-6
std::string ObjCube = "1 -2 3 -4 5 -6";
boost::shared_ptr<CSGObject> retVal = boost::shared_ptr<CSGObject>(new CSGObject);
boost::shared_ptr<CSGObject> retVal =
boost::shared_ptr<CSGObject>(new CSGObject);
retVal->setObject(68, ObjCube);
retVal->populate(CubeSurMap);
......@@ -1338,7 +1342,8 @@ private:
// using surface ids: 1-6
std::string ObjCube = "1 -2 3 -4 5 -6";
boost::shared_ptr<CSGObject> retVal = boost::shared_ptr<CSGObject>(new CSGObject);
boost::shared_ptr<CSGObject> retVal =
boost::shared_ptr<CSGObject>(new CSGObject);
retVal->setObject(68, ObjCube);
retVal->populate(CubeSurMap);
......@@ -1418,7 +1423,8 @@ private:
std::string ObjHex = "-1 2 3 -4 -5 6";
boost::shared_ptr<CSGObject> retVal = boost::shared_ptr<CSGObject>(new CSGObject);
boost::shared_ptr<CSGObject> retVal =
boost::shared_ptr<CSGObject>(new CSGObject);
// Explicitly setting the GluGeometryHanler hexahedron allows
// for the correct bounding box calculation.
......
......@@ -300,8 +300,8 @@ Instrument_sptr createTestInstrumentCylindrical(
}
// Define a source component
ObjComponent *source =
new ObjComponent("moderator", IObject_sptr(new CSGObject), testInst.get());
ObjComponent *source = new ObjComponent(
"moderator", IObject_sptr(new CSGObject), testInst.get());
source->setPos(sourcePos);
testInst->add(source);
testInst->markAsSource(source);
......@@ -391,8 +391,8 @@ createCylInstrumentWithDetInGivenPositions(const std::vector<double> &L2,
bank->setPos(V3D(0., 0., 0.));
// Define a source component
ObjComponent *source =
new ObjComponent("moderator", IObject_sptr(new CSGObject), testInst.get());
ObjComponent *source = new ObjComponent(
"moderator", IObject_sptr(new CSGObject), testInst.get());
source->setPos(V3D(0.0, 0.0, -L2_min));
testInst->add(source);
testInst->markAsSource(source);
......@@ -540,8 +540,8 @@ Instrument_sptr createTestInstrumentRectangular2(int num_banks, int pixels,
}
// Define a source component
ObjComponent *source =
new ObjComponent("moderator", IObject_sptr(new CSGObject), testInst.get());
ObjComponent *source = new ObjComponent(
"moderator", IObject_sptr(new CSGObject), testInst.get());
source->setPos(V3D(0.0, 0.0, -10.));
testInst->add(source);
testInst->markAsSource(source);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment