diff --git a/Framework/Algorithms/test/MergeRunsTest.h b/Framework/Algorithms/test/MergeRunsTest.h
index a52967153a5235a50ee5d729ca156ff49c5ceb4e..1f97295f21bc4df89d98fd11ed6080d5284836b4 100644
--- a/Framework/Algorithms/test/MergeRunsTest.h
+++ b/Framework/Algorithms/test/MergeRunsTest.h
@@ -1629,9 +1629,8 @@ public:
alg.setPropertyValue("OutputWorkspace", "outWS");
TS_ASSERT_THROWS_EQUALS(alg.execute(), const std::runtime_error &e,
std::string(e.what()),
- "Cannot merge DetectorInfo: "
- "sync scan intervals "
- "overlap but not identical")
+ "Cannot merge ComponentInfo: "
+ "scan intervals overlap but not identical")
}
void test_merging_detector_scan_workspaces_does_not_append_workspaces() {
@@ -1663,7 +1662,7 @@ public:
alg.setPropertyValue("OutputWorkspace", "outWS");
TS_ASSERT_THROWS_EQUALS(alg.execute(), const std::runtime_error &e,
std::string(e.what()),
- "Cannot merge DetectorInfo: "
+ "Cannot merge ComponentInfo: "
"matching scan interval but "
"positions differ")
}
@@ -1684,9 +1683,8 @@ public:
alg.setPropertyValue("OutputWorkspace", "outWS");
TS_ASSERT_THROWS_EQUALS(alg.execute(), const std::runtime_error &e,
std::string(e.what()),
- "Cannot merge DetectorInfo: "
- "sync scan intervals "
- "overlap but not identical")
+ "Cannot merge ComponentInfo: "
+ "scan intervals overlap but not identical")
}
void test_merging_detector_scan_workspaces_failure_case() {
diff --git a/Framework/Beamline/src/ComponentInfo.cpp b/Framework/Beamline/src/ComponentInfo.cpp
index a812701b77ba2a831649b3e8ff363d49550d1016..e4dc8cb5bfa2beb6cf3779c279df4458e7b3cc06 100644
--- a/Framework/Beamline/src/ComponentInfo.cpp
+++ b/Framework/Beamline/src/ComponentInfo.cpp
@@ -464,6 +464,9 @@ void ComponentInfo::setDetectorInfo(DetectorInfo *detectorInfo) {
"input of same size as size of DetectorInfo");
}
m_detectorInfo = detectorInfo;
+ /* We need to check here whether m_detectorInfo actually exists, since in the
+ * case of cloneWithoutDetectorInfo(), the detectorInfo is a null pointer.
+ */
if (m_detectorInfo)
m_detectorInfo->setComponentInfo(this);
}
diff --git a/Framework/Beamline/test/ComponentInfoTest.h b/Framework/Beamline/test/ComponentInfoTest.h
index 39ba3bef527dfcb7024c83f1260cc70ed6cfbe13..aca991c751799bc7c61c5069fe4453464634766f 100644
--- a/Framework/Beamline/test/ComponentInfoTest.h
+++ b/Framework/Beamline/test/ComponentInfoTest.h
@@ -86,6 +86,18 @@ makeFlatTree(PosVec detPositions, RotVec detRotations) {
return std::make_tuple(componentInfo, detectorInfo);
}
+std::tuple<boost::shared_ptr<ComponentInfo>, boost::shared_ptr<DetectorInfo>>
+makeFlatTreeWithMonitor(PosVec detPositions, RotVec detRotations,
+ const std::vector<size_t> &monitorIndices) {
+ auto flatTree = makeFlatTree(detPositions, detRotations);
+ auto detectorInfo = boost::make_shared<DetectorInfo>(
+ detPositions, detRotations, monitorIndices);
+ auto compInfo = std::get<0>(flatTree);
+ // auto detInfo = std::get<1>(flatTree);
+ compInfo->setDetectorInfo(detectorInfo.get());
+ return std::make_tuple(compInfo, detectorInfo);
+}
+
std::tuple<boost::shared_ptr<ComponentInfo>, PosVec, RotVec, PosVec, RotVec,
boost::shared_ptr<DetectorInfo>>
makeTreeExampleAndReturnGeometricArguments() {
@@ -994,6 +1006,18 @@ public:
"rotations differ");
}
+ void test_merge_fail_monitor_mismatch() {
+ auto infos1 = makeFlatTree(PosVec(2), RotVec(2));
+ auto infos2 = makeFlatTreeWithMonitor(PosVec(2), RotVec(2), {1});
+ ComponentInfo &a = *std::get<0>(infos1);
+ ComponentInfo &b = *std::get<0>(infos2);
+ a.setScanInterval({0, 1});
+ b.setScanInterval({0, 1});
+ TS_ASSERT_THROWS_EQUALS(
+ a.merge(b), const std::runtime_error &e, std::string(e.what()),
+ "Cannot merge DetectorInfo: monitor flags mismatch");
+ }
+
void test_merge_fail_partial_overlap() {
auto infos1 = makeFlatTree(PosVec(1), RotVec(1));
ComponentInfo &a = *std::get<0>(infos1);
diff --git a/Framework/Beamline/test/DetectorInfoTest.h b/Framework/Beamline/test/DetectorInfoTest.h
index 84046033618e76a7e54d78b10706d03a20a90285..7748d092afda49fa2ff7c038117acbe94ee27ed5 100644
--- a/Framework/Beamline/test/DetectorInfoTest.h
+++ b/Framework/Beamline/test/DetectorInfoTest.h
@@ -273,7 +273,7 @@ public:
DetectorInfo detInfo;
Mantid::Beamline::ComponentInfo compInfo;
detInfo.setComponentInfo(&compInfo);
- TS_ASSERT_EQUALS(detInfo.scanCount(),1);
+ TS_ASSERT_EQUALS(detInfo.scanCount(), 1);
}
void test_scanIntervals() {
@@ -283,7 +283,6 @@ public:
TS_ASSERT_EQUALS(detInfo.scanIntervals(),
(std::vector<std::pair<int64_t, int64_t>>{{0, 1}}));
}
-
};
#endif /* MANTID_BEAMLINE_DETECTORINFOTEST_H_ */
diff --git a/Framework/DataHandling/test/LoadILLDiffractionTest.h b/Framework/DataHandling/test/LoadILLDiffractionTest.h
index c34563f6b5b6fda69d5c107fb26f1f59e1ae9b2f..2f5ad391f1453b3f99a555db66c03682b529de74 100644
--- a/Framework/DataHandling/test/LoadILLDiffractionTest.h
+++ b/Framework/DataHandling/test/LoadILLDiffractionTest.h
@@ -312,22 +312,25 @@ public:
"2015-04-16T16:40:34.289000000";
const std::string EXPECTED_END_TIME = "2015-04-16T16:41:11.956000000";
- TS_ASSERT_EQUALS(detInfo.scanCount(), SCAN_COUNT)
-
- const auto &startRange = detInfo.scanIntervals()[0];
- const auto &secondRange = detInfo.scanIntervals()[1];
- const auto &secondFromEndRange =
- detInfo.scanIntervals()[detInfo.scanCount() - 2];
- const auto &endRange = detInfo.scanIntervals()[detInfo.scanCount() - 1];
+ auto firstIntervalLeft = detInfo.scanIntervals()[0].first;
+ auto firstIntervalRight = detInfo.scanIntervals()[0].second;
+ auto secondIntervalLeft = detInfo.scanIntervals()[1].first;
+ auto penultimateIntervalRight =
+ detInfo.scanIntervals()[detInfo.scanCount() - 2].second;
+ auto lastIntervalLeft =
+ detInfo.scanIntervals()[detInfo.scanCount() - 1].first;
+ auto lastIntervalRight =
+ detInfo.scanIntervals()[detInfo.scanCount() - 1].second;
- TS_ASSERT_EQUALS(startRange.first.toISO8601String(), EXPECTED_START_TIME)
- TS_ASSERT_EQUALS(startRange.second.toISO8601String(), EXPECTED_SECOND_TIME)
- TS_ASSERT_EQUALS(secondRange.first.toISO8601String(), EXPECTED_SECOND_TIME)
- TS_ASSERT_EQUALS(secondFromEndRange.second.toISO8601String(),
+ TS_ASSERT_EQUALS(detInfo.scanCount(), SCAN_COUNT)
+ TS_ASSERT_EQUALS(firstIntervalLeft.toISO8601String(), EXPECTED_START_TIME)
+ TS_ASSERT_EQUALS(firstIntervalRight.toISO8601String(), EXPECTED_SECOND_TIME)
+ TS_ASSERT_EQUALS(secondIntervalLeft.toISO8601String(), EXPECTED_SECOND_TIME)
+ TS_ASSERT_EQUALS(penultimateIntervalRight.toISO8601String(),
EXPECTED_SECOND_FROM_END_TIME)
- TS_ASSERT_EQUALS(endRange.first.toISO8601String(),
+ TS_ASSERT_EQUALS(lastIntervalLeft.toISO8601String(),
EXPECTED_SECOND_FROM_END_TIME)
- TS_ASSERT_EQUALS(endRange.second.toISO8601String(), EXPECTED_END_TIME)
+ TS_ASSERT_EQUALS(lastIntervalRight.toISO8601String(), EXPECTED_END_TIME)
// Check monitor does not move
for (size_t j = 0; j < detInfo.scanCount(); ++j) {
diff --git a/Framework/DataObjects/src/ScanningWorkspaceBuilder.cpp b/Framework/DataObjects/src/ScanningWorkspaceBuilder.cpp
index 87873fd57519293147d2fefbc7067022fba72fca..e95ab851dad4a8a88214ea373c19f48cce9221cd 100644
--- a/Framework/DataObjects/src/ScanningWorkspaceBuilder.cpp
+++ b/Framework/DataObjects/src/ScanningWorkspaceBuilder.cpp
@@ -1,6 +1,5 @@
#include "MantidDataObjects/ScanningWorkspaceBuilder.h"
-#include "MantidAPI/WorkspaceFactory.h"
#include "MantidDataObjects/Workspace2D.h"
#include "MantidDataObjects/WorkspaceCreation.h"
#include "MantidGeometry/Instrument.h"
diff --git a/Framework/Geometry/src/Instrument.cpp b/Framework/Geometry/src/Instrument.cpp
index 45a381c5ab3de0c056eb913a51b982f5840864e9..8c1169c841f6486c0448771335f061bc32b463a6 100644
--- a/Framework/Geometry/src/Instrument.cpp
+++ b/Framework/Geometry/src/Instrument.cpp
@@ -1403,7 +1403,6 @@ Instrument::makeWrappers(ParameterMap &pmap, const ComponentInfo &componentInfo,
auto compInfo = componentInfo.cloneWithoutDetectorInfo();
auto detInfo = Kernel::make_unique<DetectorInfo>(detectorInfo);
compInfo->m_componentInfo->setDetectorInfo(detInfo->m_detectorInfo.get());
- detInfo->m_detectorInfo->setComponentInfo(compInfo->m_componentInfo.get());
const auto parInstrument = ParComponentFactory::createInstrument(
boost::shared_ptr<const Instrument>(this, NoDeleting()),
boost::shared_ptr<ParameterMap>(&pmap, NoDeleting()));
diff --git a/Framework/Geometry/src/Instrument/InstrumentVisitor.cpp b/Framework/Geometry/src/Instrument/InstrumentVisitor.cpp
index 240c2d2aa2be0e7b83f100f916e40696d2041b91..13813567191dec09820399847ae34e149d71497e 100644
--- a/Framework/Geometry/src/Instrument/InstrumentVisitor.cpp
+++ b/Framework/Geometry/src/Instrument/InstrumentVisitor.cpp
@@ -416,7 +416,6 @@ InstrumentVisitor::makeWrappers() const {
auto detInfo = detectorInfo();
// Cross link Component and Detector info objects
compInfo->setDetectorInfo(detInfo.get());
- detInfo->setComponentInfo(compInfo.get());
auto compInfoWrapper = Kernel::make_unique<ComponentInfo>(
std::move(compInfo), componentIds(), componentIdToIndexMap(), m_shapes);