diff --git a/Framework/API/src/MatrixWorkspace.cpp b/Framework/API/src/MatrixWorkspace.cpp
index 8589a7bde7487763ee3d043145550addabfb3f07..07a49631317797f2d979ff2e1b50b42d413feefd 100644
--- a/Framework/API/src/MatrixWorkspace.cpp
+++ b/Framework/API/src/MatrixWorkspace.cpp
@@ -1964,13 +1964,6 @@ void MatrixWorkspace::buildDefaultSpectrumDefinitions() {
std::vector<SpectrumDefinition>(m_indexInfo->size()));
return;
}
- // size_t numberOfSpectra{0};
- // if (detInfo.isScanning()) {
- // for (size_t i = 0; i < numberOfDetectors; ++i)
- // numberOfSpectra += detInfo.scanCount(i);
- // } else {
- // numberOfSpectra = numberOfDetectors;
- // }
size_t numberOfSpectra = numberOfDetectors * detInfo.scanCount();
if (numberOfSpectra != m_indexInfo->globalSize())
throw std::invalid_argument(
diff --git a/Framework/API/test/MatrixWorkspaceTest.h b/Framework/API/test/MatrixWorkspaceTest.h
index aaadc222c5cc882575640ada1f485d2248a9ed28..9c326664c290165eeb05250dc6b2863017a1d64f 100644
--- a/Framework/API/test/MatrixWorkspaceTest.h
+++ b/Framework/API/test/MatrixWorkspaceTest.h
@@ -38,7 +38,7 @@
#include <cmath>
#include <functional>
#include <numeric>
-#include <iostream>
+
using std::size_t;
using namespace Mantid;
using namespace Mantid::Kernel;
@@ -1660,8 +1660,6 @@ public:
// Merge
auto merged = WorkspaceFactory::Instance().create(ws1, 2);
- // auto &detInfo = merged->mutableDetectorInfo();
- // detInfo.merge(detInfo2);
merged->mutableComponentInfo().merge(ws2->mutableComponentInfo());
// Setting IndexInfo without spectrum definitions will set up a 1:1 mapping
diff --git a/Framework/Algorithms/src/CreateSampleWorkspace.cpp b/Framework/Algorithms/src/CreateSampleWorkspace.cpp
index 5af7022ff2e44ce1f7c6d469ef54e9b591700a58..663dd33e0d6042c7662813a86b1fcc30e0431ef9 100644
--- a/Framework/Algorithms/src/CreateSampleWorkspace.cpp
+++ b/Framework/Algorithms/src/CreateSampleWorkspace.cpp
@@ -19,7 +19,6 @@
#include "MantidKernel/MersenneTwister.h"
#include "MantidKernel/UnitFactory.h"
#include "MantidTypes/SpectrumDefinition.h"
-#include<iostream>
#include <cmath>
#include <ctime>
@@ -345,38 +344,28 @@ MatrixWorkspace_sptr CreateSampleWorkspace::createHistogramWorkspace(
MatrixWorkspace_sptr CreateSampleWorkspace::createScanningWorkspace(
int numBins, double x0, double binDelta, Geometry::Instrument_sptr inst,
const std::string &functionString, bool isRandom, int numScanPoints) {
- std::cout << "nvaytet got to here 1" << std::endl;
auto builder = ScanningWorkspaceBuilder(inst, numScanPoints, numBins);
- std::cout << "nvaytet got to here 2" << std::endl;
-
+
auto angles = std::vector<double>();
- std::cout << "nvaytet got to here 3" << std::endl;
auto timeRanges = std::vector<double>();
- std::cout << "nvaytet got to here 4" << std::endl;
for (int i = 0; i < numScanPoints; ++i) {
angles.push_back(double(i));
timeRanges.push_back(double(i + 1));
}
-std::cout << "nvaytet got to here 5" << std::endl;
-
+
builder.setTimeRanges(Types::Core::DateAndTime(0), timeRanges);
- std::cout << "nvaytet got to here 6" << std::endl;
builder.setRelativeRotationsForScans(angles, inst->getSample()->getPos(),
V3D(0, 1, 0));
- std::cout << "nvaytet got to here 7" << std::endl;
BinEdges x(numBins + 1, LinearGenerator(x0, binDelta));
- std::cout << "nvaytet got to here 8" << std::endl;
std::vector<double> xValues(cbegin(x), cend(x) - 1);
- std::cout << "nvaytet got to here 9" << std::endl;
Counts y(evalFunction(functionString, xValues, isRandom ? 1 : 0));
- std::cout << "nvaytet got to here 10" << std::endl;
builder.setHistogram(Histogram(x, y));
-std::cout << "nvaytet got to here 11" << std::endl;
-
+
return builder.buildWorkspace();
+
}
/** Create event workspace
diff --git a/Framework/Algorithms/src/MergeRuns.cpp b/Framework/Algorithms/src/MergeRuns.cpp
index 76233e0cc8db8e8073880613fd3277698c43233d..2903567a62d5d3cd002ba685f236c7c41e163fd6 100644
--- a/Framework/Algorithms/src/MergeRuns.cpp
+++ b/Framework/Algorithms/src/MergeRuns.cpp
@@ -723,18 +723,12 @@ std::vector<SpectrumDefinition> MergeRuns::buildScanIntervals(
for (int64_t i = 0; i < int64_t(addeeSpecDefs.size()); ++i) {
for (auto &index : addeeSpecDefs[i]) {
SpectrumDefinition newSpecDef;
- // const auto &addeeScanInterval = addeeDetInfo.scanIntervals()[index.second];
- // if (addeeScanInterval == outDetInfo.scanIntervals()[index.second]) {
- // newSpecDef.add(index.first, index.second);
- // } else {
- // Find the correct time index for this entry
for (size_t time_index = 0; time_index < newOutDetInfo.scanCount(); time_index++) {
if (addeeDetInfo.scanIntervals()[index.second] ==
newOutDetInfo.scanIntervals()[time_index]) {
newSpecDef.add(index.first, time_index);
}
}
- // }
newAddeeSpecDefs[i] = newSpecDef;
}
}
diff --git a/Framework/Algorithms/src/NormaliseToMonitor.cpp b/Framework/Algorithms/src/NormaliseToMonitor.cpp
index 760f55463f07edcf0b2b48aeb48389f1b0196b84..450d271aa23516924aea2b727ee03629b16dae8f 100644
--- a/Framework/Algorithms/src/NormaliseToMonitor.cpp
+++ b/Framework/Algorithms/src/NormaliseToMonitor.cpp
@@ -378,7 +378,6 @@ void NormaliseToMonitor::checkProperties(
Property *monID = getProperty("MonitorID");
// Is the monitor spectrum within the main input workspace
const bool inWS = !monSpec->isDefault();
- // m_syncScanInput = inputWorkspace->detectorInfo().isSyncScan();
// Or is it in a separate workspace
bool sepWS{monWS};
if (sepWS)
@@ -428,7 +427,6 @@ void NormaliseToMonitor::checkProperties(
"monitor - the instrument is not fully specified.\n "
"Continuing with normalization regardless.");
g_log.warning() << "Error was: " << e.what() << "\n";
- // if (m_syncScanInput)
throw std::runtime_error("Can not continue, spectrum can not be obtained "
"for monitor workspace, but the input workspace "
"has a detector scan.");
diff --git a/Framework/Algorithms/test/MergeRunsTest.h b/Framework/Algorithms/test/MergeRunsTest.h
index f1e54ceb5a7ad1405c83afe3b875e378f9924e35..a52967153a5235a50ee5d729ca156ff49c5ceb4e 100644
--- a/Framework/Algorithms/test/MergeRunsTest.h
+++ b/Framework/Algorithms/test/MergeRunsTest.h
@@ -1542,9 +1542,7 @@ public:
const auto PAIR_2 = std::pair<DateAndTime, DateAndTime>(TIME_2, TIME_3);
TS_ASSERT_EQUALS(detInfo.scanIntervals()[0], PAIR_1)
- // TS_ASSERT_EQUALS(detInfo.scanIntervals()[0], PAIR_1)
TS_ASSERT_EQUALS(detInfo.scanIntervals()[1], PAIR_2)
- // TS_ASSERT_EQUALS(detInfo.scanIntervals()[1], PAIR_2)
if (extraTimes) {
const auto TIME_4 = DateAndTime(20, 0);
@@ -1555,9 +1553,7 @@ public:
const auto PAIR_4 = std::pair<DateAndTime, DateAndTime>(TIME_5, TIME_6);
TS_ASSERT_EQUALS(detInfo.scanIntervals()[2], PAIR_3)
- // TS_ASSERT_EQUALS(detInfo.scanIntervals()[2], PAIR_3)
TS_ASSERT_EQUALS(detInfo.scanIntervals()[3], PAIR_4)
- // TS_ASSERT_EQUALS(detInfo.scanIntervals()[3], PAIR_4)
}
}
@@ -1613,7 +1609,6 @@ public:
const auto &detInfo = outputWS->detectorInfo();
TS_ASSERT_EQUALS(detInfo.size(), 2)
TS_ASSERT_EQUALS(detInfo.scanCount(), 4)
- // TS_ASSERT_EQUALS(detInfo.scanCount(1), 4)
assert_scan_intervals_are_correct(detInfo, true);
const auto &specInfo = outputWS->spectrumInfo();
diff --git a/Framework/Algorithms/test/NormaliseToMonitorTest.h b/Framework/Algorithms/test/NormaliseToMonitorTest.h
index ac5f3380a7231e8979ec6d25f8070575903e9f7c..d8221584eaf1b99aeba6548de209d9a10fcee466 100644
--- a/Framework/Algorithms/test/NormaliseToMonitorTest.h
+++ b/Framework/Algorithms/test/NormaliseToMonitorTest.h
@@ -9,8 +9,8 @@
#include "MantidAlgorithms/NormaliseToMonitor.h"
#include "MantidDataObjects/WorkspaceCreation.h"
#include "MantidGeometry/Instrument.h"
-#include "MantidGeometry/Instrument/DetectorInfo.h"
#include "MantidGeometry/Instrument/ComponentInfo.h"
+#include "MantidGeometry/Instrument/DetectorInfo.h"
#include "MantidHistogramData/BinEdges.h"
#include "MantidHistogramData/Counts.h"
#include "MantidHistogramData/LinearGenerator.h"
@@ -512,12 +512,8 @@ public:
N_DET, N_BINS, true);
auto &detInfo1 = ws1->mutableDetectorInfo();
auto &detInfo2 = ws2->mutableDetectorInfo();
- // auto &cmpInfo2 = ws2->mutableComponentInfo();
-
- // for (size_t i = 0; i < N_DET; ++i) {
detInfo1.setScanInterval({10, 20});
detInfo2.setScanInterval({20, 30});
- // }
// Merge
auto merged = WorkspaceFactory::Instance().create(ws1, 2 * N_DET);
auto &cmpInfo = merged->mutableComponentInfo();
diff --git a/Framework/Beamline/inc/MantidBeamline/ComponentInfo.h b/Framework/Beamline/inc/MantidBeamline/ComponentInfo.h
index c79955608f741e0755f87e9c4a9731b36d1d4bef..7b5d50c61ad7ef95151b0c6c39701518894e48a0 100644
--- a/Framework/Beamline/inc/MantidBeamline/ComponentInfo.h
+++ b/Framework/Beamline/inc/MantidBeamline/ComponentInfo.h
@@ -67,8 +67,6 @@ private:
DetectorInfo *m_detectorInfo; // Geometry::DetectorInfo is the owner.
size_t m_scanCounts = 1;
std::vector<std::pair<int64_t, int64_t>> m_scanIntervals{{0, 1}};
- // Kernel::cow_ptr<std::vector<std::pair<int64_t, int64_t>>> m_scanIntervals{
- // nullptr};
/// For (component index, time index) -> linear index conversions
Kernel::cow_ptr<std::vector<std::vector<size_t>>> m_indexMap{nullptr};
/// For linear index -> (detector index, time index) conversions
@@ -144,7 +142,6 @@ public:
bool hasParent(const size_t componentIndex) const;
bool hasDetectorInfo() const;
void setDetectorInfo(DetectorInfo *detectorInfo);
- // const DetectorInfo &getDetectorInfo() const {return *m_detectorInfo;}
bool hasSource() const;
bool hasSample() const;
Eigen::Vector3d sourcePosition() const;
@@ -160,12 +157,9 @@ public:
const Eigen::Vector3d &scaleFactor);
ComponentType componentType(const size_t componentIndex) const;
-// size_t scanCount(const size_t index) const;
size_t scanCount() const;
size_t scanSize() const;
bool isScanning() const;
-// std::pair<int64_t, int64_t>
-// scanInterval(const std::pair<size_t, size_t> &index) const;
const std::vector<std::pair<int64_t, int64_t>> &scanIntervals() const {return m_scanIntervals;}
void setScanInterval(const std::pair<int64_t, int64_t> &interval);
void merge(const ComponentInfo &other);
diff --git a/Framework/Beamline/inc/MantidBeamline/DetectorInfo.h b/Framework/Beamline/inc/MantidBeamline/DetectorInfo.h
index 338598ba98c8f04191f4d3db8d12ae848f4dc259..e3d08431dbbde4c4440f0d5b9f40bb8c1a6464e3 100644
--- a/Framework/Beamline/inc/MantidBeamline/DetectorInfo.h
+++ b/Framework/Beamline/inc/MantidBeamline/DetectorInfo.h
@@ -76,7 +76,6 @@ public:
size_t size() const;
size_t scanSize() const;
bool isScanning() const;
-// bool isSyncScan() const;
bool isMonitor(const size_t index) const;
bool isMonitor(const std::pair<size_t, size_t> &index) const;
@@ -97,15 +96,8 @@ public:
size_t scanCount() const;
const std::vector<std::pair<int64_t, int64_t>> &scanIntervals() const;
-// std::vector<std::pair<int64_t, int64_t>> &scanIntervals() const;
-
-// std::pair<int64_t, int64_t>
-// scanInterval(const std::pair<size_t, size_t> &index) const;
-// void setScanInterval(const size_t index,
-// const std::pair<int64_t, int64_t> &interval);
void setScanInterval(const std::pair<int64_t, int64_t> &interval);
-// void merge(const DetectorInfo &other);
void setComponentInfo(ComponentInfo *componentInfo);
bool hasComponentInfo() const;
double l1() const;
@@ -113,20 +105,15 @@ public:
Eigen::Vector3d samplePosition() const;
friend class ComponentInfo;
-// friend class Geometry::DetectorInfo;
private:
size_t linearIndex(const std::pair<size_t, size_t> &index) const;
void checkNoTimeDependence() const;
-// void initScanCounts();
-// void initScanIntervals();
-// void initIndices();
std::vector<bool> buildMergeIndices(const DetectorInfo &other) const;
std::vector<bool> buildMergeSyncScanIndices(const DetectorInfo &other) const;
void checkSizes(const DetectorInfo &other) const;
void checkIdenticalIntervals(const DetectorInfo &other, const size_t index1,
const size_t index2) const;
-// bool m_isSyncScan{true};
void merge(const DetectorInfo &other);
Kernel::cow_ptr<std::vector<bool>> m_isMonitor{nullptr};
@@ -136,15 +123,8 @@ private:
Eigen::aligned_allocator<Eigen::Quaterniond>>>
m_rotations{nullptr};
-// Kernel::cow_ptr<std::vector<size_t>> m_scanCounts{nullptr};
size_t m_scanCounts = 1;
std::vector<std::pair<int64_t, int64_t>> m_scanIntervals{{0, 1}};
- // Kernel::cow_ptr<std::vector<std::pair<int64_t, int64_t>>> m_scanIntervals{
- // nullptr};
- /// For (detector index, time index) -> linear index conversions
-// Kernel::cow_ptr<std::vector<std::vector<size_t>>> m_indexMap{nullptr};
- /// For linear index -> (detector index, time index) conversions
-// Kernel::cow_ptr<std::vector<std::pair<size_t, size_t>>> m_indices{nullptr};
ComponentInfo *m_componentInfo = nullptr; // Geometry::ComponentInfo owner
};
@@ -160,8 +140,9 @@ inline size_t DetectorInfo::size() const {
/// Returns true if the beamline has scanning detectors.
inline bool DetectorInfo::isScanning() const {
- if (!m_positions)
+ if (!m_positions) {
return false;
+ }
return size() != m_positions->size();
}
@@ -244,9 +225,7 @@ DetectorInfo::linearIndex(const std::pair<size_t, size_t> &index) const {
if (index.second == 0)
return index.first;
else
-// if (m_isSyncScan)
return index.first + size() * index.second;
-// return (*m_indexMap)[index.first][index.second];
}
} // namespace Beamline
diff --git a/Framework/Beamline/src/ComponentInfo.cpp b/Framework/Beamline/src/ComponentInfo.cpp
index c9d4452233dc33306d3e20b4bb43ea9bfdf4f9ce..62f52e0412528827b067ee2149f9a572590e70ef 100644
--- a/Framework/Beamline/src/ComponentInfo.cpp
+++ b/Framework/Beamline/src/ComponentInfo.cpp
@@ -7,7 +7,6 @@
#include <numeric>
#include <sstream>
#include <utility>
-// #include<iostream>
namespace Mantid {
namespace Beamline {
@@ -575,13 +574,6 @@ ComponentType ComponentInfo::componentType(const size_t componentIndex) const {
size_t ComponentInfo::scanCount() const {
return m_scanCounts;
}
-// size_t ComponentInfo::scanCount(const size_t index) const {
-// if (m_detectorInfo && isDetector(index))
-// return m_detectorInfo->scanCount(index);
-// else {
-// return m_scanCounts;
-// }
-// }
size_t ComponentInfo::scanSize() const {
const auto detectorScanSize = m_detectorInfo ? m_detectorInfo->scanSize() : 0;
@@ -591,12 +583,13 @@ size_t ComponentInfo::scanSize() const {
}
bool ComponentInfo::isScanning() const {
- if (m_detectorInfo && m_detectorInfo->isScanning())
+ if (m_detectorInfo && m_detectorInfo->isScanning()) {
return true;
- else if (!m_positions || !m_componentRanges)
+ } else if (!m_positions || !m_componentRanges) {
return false;
- else
+ } else {
return nonDetectorSize() != m_positions->size();
+ }
}
/// Throws if this has time-dependent data.
@@ -607,34 +600,6 @@ void ComponentInfo::checkNoTimeDependence() const {
"beamline has time-dependent (moving) components.");
}
-// /**
-// * Retrieve the scan interval for a component at a time index
-// * @param index component index, time index pair
-// * @return offset interval times since epoch
-// */
-// const std::vector<std::pair<int64_t, int64_t>> &ComponentInfo::scanIntervals() const {
-// // if (!m_scanIntervals) {
-// // // // return &{0, 0};
-// // std::vector<std::pair<int64_t, int64_t>>* dummy_vec = new std::vector<std::pair<int64_t, int64_t>> (1);
-// // // std::pair<int64_t, int64_t> dummy_pair = {0,0};
-// // // dummy_vec[0] = dummy_pair;
-// // dummy_vec->push_back({0, 0});
-// // return *dummy_vec;
-// // // return new std::vector<std::pair<int64_t, int64_t>> {{0,0}};
-// // } else {
-// return m_scanIntervals;
-// // }
-// }
-
-// std::pair<int64_t, int64_t>
-// ComponentInfo::scanInterval(const std::pair<size_t, size_t> &index) const {
-// if (m_detectorInfo && isDetector(index.first))
-// return m_detectorInfo->scanInterval(index);
-// if (!m_scanIntervals)
-// return {0, 0};
-// return (*m_scanIntervals)[index.second];
-// }
-
void ComponentInfo::checkSpecialIndices(size_t componentIndex) const {
if (!isDetector(componentIndex)) {
// Empty range means no child detectors
@@ -651,9 +616,6 @@ void ComponentInfo::setScanInterval(
// Enforces setting scan intervals BEFORE time indexed positions and rotations
checkNoTimeDependence();
checkScanInterval(interval);
- // if (!m_scanIntervals) {
- // initScanIntervals();
- // }
m_scanIntervals[0] = interval;
if (m_detectorInfo) {
m_detectorInfo->setScanInterval(interval);
@@ -675,16 +637,13 @@ this has no time dependence prior to this operation.
* ignored, i.e., no time index is added.
**/
void ComponentInfo::merge(const ComponentInfo &other) {
- checkNoTimeDependence();
const auto &toMerge = buildMergeIndicesSync(other);
for (size_t timeIndex = 0; timeIndex < other.m_scanIntervals.size();
++timeIndex) {
if (!toMerge[timeIndex])
continue;
- // auto &scanIntervals = m_scanIntervals.access();
auto &positions = m_positions.access();
auto &rotations = m_rotations.access();
- // scanIntervals.push_back((*other.m_scanIntervals)[timeIndex]);
m_scanIntervals.push_back(other.m_scanIntervals[timeIndex]);
const size_t indexStart = other.linearIndex({0, timeIndex});
size_t indexEnd = indexStart + nonDetectorSize();
@@ -726,8 +685,6 @@ ComponentInfo::buildMergeIndicesSync(const ComponentInfo &other) const {
void ComponentInfo::checkSizes(const ComponentInfo &other) const {
if (size() != other.size())
failMerge("size mismatch");
- // if (!m_scanIntervals || !other.m_scanIntervals)
- // failMerge("scan intervals not defined");
}
void ComponentInfo::checkIdenticalIntervals(
@@ -754,11 +711,5 @@ size_t ComponentInfo::nonDetectorSize() const {
return 0;
}
-// void ComponentInfo::initScanIntervals() {
-// checkNoTimeDependence();
-// m_scanIntervals = Kernel::make_cow<std::vector<std::pair<int64_t, int64_t>>>(
-// 1, std::pair<int64_t, int64_t>{0, 1});
-// }
-
} // namespace Beamline
} // namespace Mantid
diff --git a/Framework/Beamline/src/DetectorInfo.cpp b/Framework/Beamline/src/DetectorInfo.cpp
index cc791cb6175f2e38cd967f6633fda6069aedbf7b..ea7e13a86f4ea14e13b45934f56c830cbc0b9e5e 100644
--- a/Framework/Beamline/src/DetectorInfo.cpp
+++ b/Framework/Beamline/src/DetectorInfo.cpp
@@ -61,14 +61,8 @@ bool DetectorInfo::isEquivalent(const DetectorInfo &other) const {
// Scanning related fields. Not testing m_scanCounts and m_indexMap since
// those just are internally derived from m_indices.
- // if (m_scanIntervals && other.m_scanIntervals &&
- // !(m_scanIntervals == other.m_scanIntervals) &&
- // (*m_scanIntervals != *other.m_scanIntervals))
- // return false;
if (m_scanIntervals != other.m_scanIntervals)
return false;
-// if (m_indices && other.m_indices && !(m_indices == other.m_indices) &&
-// (*m_indices != *other.m_indices))
if (m_scanCounts && other.m_scanCounts && !(m_scanCounts == other.m_scanCounts))
return false;
@@ -113,12 +107,6 @@ size_t DetectorInfo::scanSize() const {
return m_positions->size();
}
-/**
- * Returns true if all of the detectors all have the same scan interval. Will
- * return false if DetectorInfo is not scanning.
- */
-// bool DetectorInfo::isSyncScan() const { return isScanning() && m_isSyncScan; }
-
/// Returns true if the detector with given detector index is a monitor.
bool DetectorInfo::isMonitor(const size_t index) const {
// No check for time dependence since monitor flags are not time dependent.
@@ -169,12 +157,8 @@ void DetectorInfo::setMasked(const std::pair<size_t, size_t> &index,
size_t DetectorInfo::scanCount() const {
if (!m_scanCounts)
return 1;
-// if (m_isSyncScan)
else
return m_scanCounts;
-// return (*m_scanCounts)[0];
-// return m_scanCounts.access()[0]; //?
-// return (*m_scanCounts)[index];
}
/** Returns the scan interval of the detector with given index.
@@ -182,28 +166,9 @@ size_t DetectorInfo::scanCount() const {
* The interval start and end values would typically correspond to nanoseconds
* since 1990, as in Types::Core::DateAndTime. */
const std::vector<std::pair<int64_t, int64_t>> &DetectorInfo::scanIntervals() const {
-// if (!m_scanIntervals) {
-// // // return &{0, 0};
-// std::vector<std::pair<int64_t, int64_t>>* dummy_vec = new std::vector<std::pair<int64_t, int64_t>> (1);
-// // std::pair<int64_t, int64_t> dummy_pair = {0,0};
-// // dummy_vec[0] = dummy_pair;
-// dummy_vec->push_back({0, 0});
-// return *dummy_vec;
-// // return new std::vector<std::pair<int64_t, int64_t>> {{0,0}};
-// } else {
return m_scanIntervals;
- // }
}
-// std::pair<int64_t, int64_t>
-// DetectorInfo::scanInterval(const std::pair<size_t, size_t> &index) const {
-// if (!m_scanIntervals)
-// return {0, 0};
-// if (m_isSyncScan)
-// return (*m_scanIntervals)[index.second];
-// return (*m_scanIntervals)[linearIndex(index)];
-// }
-
namespace {
void checkScanInterval(const std::pair<int64_t, int64_t> &interval) {
if (interval.first >= interval.second)
@@ -212,28 +177,6 @@ void checkScanInterval(const std::pair<int64_t, int64_t> &interval) {
}
} // namespace
-/** Set the scan interval of the detector with given detector index.
- *
- * The interval start and end values would typically correspond to nanoseconds
- * since 1990, as in Types::Core::DateAndTime. Note that it is currently not
- *possible
- * to modify scan intervals for a DetectorInfo with time-dependent detectors,
- * i.e., time intervals must be set with this method before merging individual
- * scans. */
-// void DetectorInfo::setScanInterval(
-// const size_t index, const std::pair<int64_t, int64_t> &interval) {
-// // Time intervals must be set up before adding time sensitive
-// // positions/rotations hence check below.
-// checkNoTimeDependence();
-// checkScanInterval(interval);
-// if (!m_scanIntervals)
-// initScanIntervals();
-// if (m_isSyncScan)
-// throw std::runtime_error("DetectorInfo has been initialized with a "
-// "synchonous scan, cannot set scan interval for "
-// "individual detector.");
-// m_scanIntervals.access()[index] = interval;
-// }
/** Set the scan interval for all detectors.
*
@@ -243,16 +186,6 @@ void DetectorInfo::setScanInterval(
const std::pair<int64_t, int64_t> &interval) {
checkNoTimeDependence();
checkScanInterval(interval);
- // if (!m_scanIntervals) {
- // m_scanIntervals =
- // Kernel::make_cow<std::vector<std::pair<int64_t, int64_t>>>(
- // 1, std::pair<int64_t, int64_t>{0, 1});
- // }
-// if (!m_isSyncScan) {
-// throw std::runtime_error(
-// "DetectorInfo has been initialized with a "
-// "asynchonous scan, cannot set synchronous scan interval.");
-// }
m_scanIntervals[0] = interval;
}
@@ -260,14 +193,6 @@ namespace {
void failMerge(const std::string &what) {
throw std::runtime_error(std::string("Cannot merge DetectorInfo: ") + what);
}
-
-// std::pair<size_t, size_t>
-// getIndex(const Kernel::cow_ptr<std::vector<std::pair<size_t, size_t>>> &indices,
-// const size_t index) {
-// if (!indices)
-// return {index, 0};
-// return (*indices)[index];
-// }
} // namespace
/** Merges the contents of other into this.
@@ -282,21 +207,15 @@ void failMerge(const std::string &what) {
* index in `other` is identical to a corresponding interval in `this`, it is
* ignored, i.e., no time index is added. */
void DetectorInfo::merge(const DetectorInfo &other) {
-// if (!m_scanCounts)
-// initScanCounts();
-// if (m_isSyncScan) {
const auto &merge = buildMergeSyncScanIndices(other);
for (size_t timeIndex = 0; timeIndex < other.m_scanIntervals.size();
++timeIndex) {
if (!merge[timeIndex])
continue;
- // auto &scanIntervals = m_scanIntervals.access();
auto &isMasked = m_isMasked.access();
auto &positions = m_positions.access();
auto &rotations = m_rotations.access();
-// m_scanCounts.access()[0]++;
m_scanCounts++;
- // scanIntervals.push_back((*other.m_scanIntervals)[timeIndex]);
m_scanIntervals.push_back(other.m_scanIntervals[timeIndex]);
const size_t indexStart = other.linearIndex({0, timeIndex});
size_t indexEnd = indexStart + size();
@@ -308,28 +227,6 @@ void DetectorInfo::merge(const DetectorInfo &other) {
other.m_rotations->begin() + indexEnd);
}
return;
-// }
-// const auto &merge = buildMergeIndices(other);
-// if (!m_indexMap)
-// initIndices();
-// // Temporary to accumulate scan counts (need original for index offset).
-// auto scanCounts(m_scanCounts);
-// for (size_t linearIndex = 0; linearIndex < other.m_positions->size();
-// ++linearIndex) {
-// if (!merge[linearIndex])
-// continue;
-// auto newIndex = getIndex(other.m_indices, linearIndex);
-// const size_t detIndex = newIndex.first;
-// newIndex.second += scanCount(detIndex);
-// scanCounts.access()[detIndex]++;
-// m_indexMap.access()[detIndex].push_back((*m_indices).size());
-// m_indices.access().push_back(newIndex);
-// m_isMasked.access().push_back((*other.m_isMasked)[linearIndex]);
-// m_positions.access().push_back((*other.m_positions)[linearIndex]);
-// m_rotations.access().push_back((*other.m_rotations)[linearIndex]);
-// m_scanIntervals.access().push_back((*other.m_scanIntervals)[linearIndex]);
-// }
-// m_scanCounts = std::move(scanCounts);
}
void DetectorInfo::setComponentInfo(ComponentInfo *componentInfo) {
@@ -367,61 +264,6 @@ Eigen::Vector3d DetectorInfo::samplePosition() const {
return m_componentInfo->samplePosition();
}
-// void DetectorInfo::initScanCounts() {
-// checkNoTimeDependence();
-// // if (m_isSyncScan)
-// m_scanCounts = Kernel::make_cow<std::vector<size_t>>(1, 1);
-// // else
-// // m_scanCounts = Kernel::make_cow<std::vector<size_t>>(size(), 1);
-// }
-
-// void DetectorInfo::initScanIntervals() {
-// checkNoTimeDependence();
-// m_isSyncScan = false;
-// m_scanIntervals = Kernel::make_cow<std::vector<std::pair<int64_t, int64_t>>>(
-// size(), std::pair<int64_t, int64_t>{0, 1});
-// }
-
-// void DetectorInfo::initIndices() {
-// checkNoTimeDependence();
-// m_indexMap = Kernel::make_cow<std::vector<std::vector<size_t>>>();
-// m_indices = Kernel::make_cow<std::vector<std::pair<size_t, size_t>>>();
-// auto &indexMap = m_indexMap.access();
-// auto &indices = m_indices.access();
-// indexMap.reserve(size());
-// indices.reserve(size());
-// // No time dependence, so both the detector index and the linear index are i.
-// for (size_t i = 0; i < size(); ++i) {
-// indexMap.emplace_back(1, i);
-// indices.emplace_back(i, 0);
-// }
-// }
-
-// // Indices returned here are the list of linear indexes not to merge
-// std::vector<bool>
-// DetectorInfo::buildMergeIndices(const DetectorInfo &other) const {
-// checkSizes(other);
-// std::vector<bool> merge(other.m_positions->size(), true);
-//
-// for (size_t linearIndex1 = 0; linearIndex1 < other.m_positions->size();
-// ++linearIndex1) {
-// const size_t detIndex = getIndex(other.m_indices, linearIndex1).first;
-// const auto &interval1 = (*other.m_scanIntervals)[linearIndex1];
-// for (size_t timeIndex = 0; timeIndex < scanCount(detIndex); ++timeIndex) {
-// const auto linearIndex2 = linearIndex({detIndex, timeIndex});
-// const auto &interval2 = (*m_scanIntervals)[linearIndex2];
-// if (interval1 == interval2) {
-// checkIdenticalIntervals(other, linearIndex1, linearIndex2);
-// merge[linearIndex1] = false;
-// } else if ((interval1.first < interval2.second) &&
-// (interval1.second > interval2.first)) {
-// failMerge("scan intervals overlap but not identical");
-// }
-// }
-// }
-// return merge;
-// }
-
// Indices returned here are the list of time indexes not to merge
std::vector<bool>
DetectorInfo::buildMergeSyncScanIndices(const DetectorInfo &other) const {
@@ -451,10 +293,6 @@ DetectorInfo::buildMergeSyncScanIndices(const DetectorInfo &other) const {
void DetectorInfo::checkSizes(const DetectorInfo &other) const {
if (size() != other.size())
failMerge("size mismatch");
- // if (!m_scanIntervals || !other.m_scanIntervals)
- // failMerge("scan intervals not defined");
-// if (m_isSyncScan != other.m_isSyncScan)
-// failMerge("both or none of the scans must be synchronous");
if (!(m_isMonitor == other.m_isMonitor) &&
(*m_isMonitor != *other.m_isMonitor))
failMerge("monitor flags mismatch");
diff --git a/Framework/Beamline/test/ComponentInfoTest.h b/Framework/Beamline/test/ComponentInfoTest.h
index 188e85d31d2c1ecdb4ed949bd4d26fa1293ab1b8..5d0f1c38d4ead472522adddba0b6b8549dc58b51 100644
--- a/Framework/Beamline/test/ComponentInfoTest.h
+++ b/Framework/Beamline/test/ComponentInfoTest.h
@@ -11,7 +11,6 @@
#include <numeric>
#include <string>
#include <tuple>
-#include <iostream>
using namespace Mantid::Beamline;
@@ -882,15 +881,12 @@ public:
void test_setRotation_single_scan_updates_positions_correctly() {
auto allOutputs = makeTreeExampleAndReturnGeometricArguments();
- // Resulting ComponentInfo
ComponentInfo &info = *std::get<0>(allOutputs);
const std::pair<size_t, size_t> rootIndex{4, 0};
const std::pair<size_t, size_t> detectorIndex{1, 0};
do_write_rotation_updates_positions_correctly(info, rootIndex,
detectorIndex);
- }
- void test_setScanInterval_failures() {
auto infos = makeTreeExample();
auto &compInfo = *std::get<0>(infos);
TS_ASSERT_THROWS_EQUALS(
@@ -911,40 +907,11 @@ public:
auto &b = *std::get<0>(infos2);
a.setScanInterval({0, 1});
b.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 ComponentInfo: size mismatch");
}
- // void xtest_merge_fail_no_intervals() {
- // auto infos1 = makeFlatTree(PosVec(1, Eigen::Vector3d{0, 0, 0}), RotVec(1,
- // Eigen::Quaterniond::Identity()));
- // auto infos2 = makeFlatTree(PosVec(1, Eigen::Vector3d{0, 0, 0}), RotVec(1,
- // Eigen::Quaterniond::Identity()));
- // auto infos3 = makeFlatTree(PosVec(1, Eigen::Vector3d{1, 0, 0}), RotVec(1,
- // Eigen::Quaterniond::Identity()));
- // auto &a = *std::get<0>(infos1);
- // auto &b = *std::get<0>(infos2);
- // auto &c = *std::get<0>(infos3);
-
- // std::cout << "NVAYTET: a position: " << a.position(0) << std::endl;
- // std::cout << "NVAYTET: b position: " << b.position(0) << std::endl;
- // std::cout << "NVAYTET: c position: " << c.position(0) << std::endl;
- // // std::cout << "NVAYTET: a position: " << a.position(1) << std::endl;
-
-
- // TS_ASSERT_THROWS_NOTHING(a.merge(b));
- // TS_ASSERT_THROWS_EQUALS(
- // a.merge(c), const std::runtime_error &e, std::string(e.what()),
- // "Cannot merge DetectorInfo: matching scan interval but positions differ");
- // a.setScanInterval({0, 1});
- // b.setScanInterval({0, 10});
- // TS_ASSERT_THROWS_EQUALS(
- // a.merge(b), const std::runtime_error &e, std::string(e.what()),
- // "Cannot merge ComponentInfo: scan intervals not defined");
- // }
-
void test_merge_identical() {
auto infos1 = makeFlatTree(PosVec(1, Eigen::Vector3d(0, 0, 0)),
RotVec(1, Eigen::Quaterniond(Eigen::AngleAxisd(
diff --git a/Framework/Beamline/test/DetectorInfoTest.h b/Framework/Beamline/test/DetectorInfoTest.h
index c3ef6143babc89fa2230cbe19164b45709aa880a..2c59cb14efe174bc74e15478cdcb6e2b91661a4a 100644
--- a/Framework/Beamline/test/DetectorInfoTest.h
+++ b/Framework/Beamline/test/DetectorInfoTest.h
@@ -284,40 +284,16 @@ public:
(std::pair<int64_t, int64_t>(0, 1)));
}
- // void xtest_setScanInterval() {
- // DetectorInfo info(PosVec(1), RotVec(1));
- // info.setScanInterval(0, {1, 2});
- // TS_ASSERT_EQUALS(info.scanInterval({0, 0}),
- // (std::pair<int64_t, int64_t>(1, 2)));
- // info.setScanInterval(0, {1, 3});
- // TS_ASSERT_EQUALS(info.scanInterval({0, 0}),
- // (std::pair<int64_t, int64_t>(1, 3)));
- // }
-
void test_setScanInterval() {
DetectorInfo info(PosVec(2), RotVec(2));
std::pair<int64_t, int64_t> interval(1, 2);
info.setScanInterval(interval);
TS_ASSERT_EQUALS(info.scanIntervals()[0], interval);
- // TS_ASSERT_EQUALS(info.scanIntervals({1, 0}), interval);
interval = {1, 3};
info.setScanInterval(interval);
TS_ASSERT_EQUALS(info.scanIntervals()[0], interval);
- // TS_ASSERT_EQUALS(info.scanInterval({1, 0}), interval);
}
- // void xtest_setScanInterval_failures() {
- // DetectorInfo info(PosVec(1), RotVec(1));
- // TS_ASSERT_THROWS_EQUALS(
- // info.setScanInterval(0, {1, 1}), const std::runtime_error &err,
- // std::string(err.what()),
- // "DetectorInfo: cannot set scan interval with start >= end");
- // TS_ASSERT_THROWS_EQUALS(
- // info.setScanInterval(0, {2, 1}), const std::runtime_error &err,
- // std::string(err.what()),
- // "DetectorInfo: cannot set scan interval with start >= end");
- // }
-
void test_setScanInterval_failures() {
DetectorInfo info(PosVec(1), RotVec(1));
TS_ASSERT_THROWS_EQUALS(
@@ -339,552 +315,6 @@ public:
"ComponentInfo must have detector indices input of same size as size of DetectorInfo");
}
- // void xtest_setScanInterval_sync_async_fail() {
- // DetectorInfo info(PosVec(1), RotVec(1));
- // info.setScanInterval({1, 2});
- // TS_ASSERT_THROWS_EQUALS(info.setScanInterval(0, {1, 2}),
- // const std::runtime_error &err, std::string(err.what()),
- // "DetectorInfo has been initialized with a "
- // "synchonous scan, cannot set scan interval for "
- // "individual detector.");
- // }
-
- // void xtest_setScanInterval_async_sync_fail() {
- // DetectorInfo info(PosVec(1), RotVec(1));
- // info.setScanInterval(0, {1, 2});
- // TS_ASSERT_THROWS_EQUALS(info.setScanInterval({1, 2}),
- // const std::runtime_error &err, std::string(err.what()),
- // "DetectorInfo has been initialized with a "
- // "asynchonous scan, cannot set synchronous scan "
- // "interval.");
- // }
-
- // void xtest_merge_fail_size() {
- // auto infos1 = makeFlatTree(PosVec(1), RotVec(1));
- // auto infos2 = makeFlatTree(PosVec(1), RotVec(1));
- // auto &a = *std::get<0>(infos1);
- // auto &b = *std::get<0>(infos2);
-
- // a.setScanInterval({0, 1});
- // b.setScanInterval({0, 1});
-
- // DetectorInfo c(PosVec(2), RotVec(2));
- // b.setDetectorInfo(&c);
- // // std::cout << "NVAYTET: got to here 1" <<std::endl;
- // TS_ASSERT_THROWS_EQUALS(a.merge(b), const std::runtime_error &e,
- // std::string(e.what()),
- // "Cannot merge ComponentInfo: size mismatch");
-
-
-
-
- // DetectorInfo a(PosVec(1), RotVec(1));
- // DetectorInfo b(PosVec(2), RotVec(2));
- // a.setScanInterval({0, 1});
- // b.setScanInterval({0, 1});
- // // b.setScanInterval(1, {0, 1});
- // Mantid::Beamline::ComponentInfo c;
- // Mantid::Beamline::ComponentInfo d;
- // c.setScanInterval({0, 1});
- // d.setScanInterval({0, 1});
- // std::cout << "NVAYTET: got to here 1" <<std::endl;
- // c.setDetectorInfo(&a);
- // std::cout << "NVAYTET: got to here 2" <<std::endl;
- // d.setDetectorInfo(&b);
-
- // // TS_ASSERT_THROWS_EQUALS(a.merge(b), const std::runtime_error &err,
- // // std::string(err.what()),
- // // "Cannot merge DetectorInfo: size mismatch");
- // TS_ASSERT_THROWS_EQUALS(c.merge(d), const std::runtime_error &err,
- // std::string(err.what()),
- // "Cannot merge DetectorInfo: size mismatch");
- // }
-
- // void xtest_merge_fail_no_intervals() {
- // DetectorInfo a(PosVec(1), RotVec(1));
- // DetectorInfo b(PosVec(1), RotVec(1));
- // DetectorInfo c(PosVec(1), RotVec(1));
- // Mantid::Beamline::ComponentInfo d;
- // Mantid::Beamline::ComponentInfo e;
- // Mantid::Beamline::ComponentInfo f;
- // d.setDetectorInfo(&a);
- // e.setDetectorInfo(&b);
- // f.setDetectorInfo(&c);
- // TS_ASSERT_THROWS_EQUALS(
- // d.merge(e), const std::runtime_error &err, std::string(err.what()),
- // "Cannot merge DetectorInfo: scan intervals not defined");
- // c.setScanInterval({0, 1});
- // TS_ASSERT_THROWS_EQUALS(
- // d.merge(f), const std::runtime_error &err, std::string(err.what()),
- // "Cannot merge DetectorInfo: scan intervals not defined");
- // a.setScanInterval({0, 1});
- // TS_ASSERT_THROWS_EQUALS(
- // d.merge(e), const std::runtime_error &err, std::string(err.what()),
- // "Cannot merge DetectorInfo: scan intervals not defined");
- // }
-
- // void xtest_merge_fail_sync_async_mismatch() {
- // DetectorInfo a(PosVec(1), RotVec(1));
- // DetectorInfo b(PosVec(1), RotVec(1));
- // a.setScanInterval({0, 1});
- // b.setScanInterval({0, 1});
- // Mantid::Beamline::ComponentInfo c;
- // Mantid::Beamline::ComponentInfo d;
- // c.setDetectorInfo(&a);
- // d.setDetectorInfo(&b);
- // TS_ASSERT_THROWS_EQUALS(c.merge(d), const std::runtime_error &err,
- // std::string(err.what()),
- // "Cannot merge DetectorInfo: "
- // "both or none of the scans "
- // "must be synchronous");
- // TS_ASSERT_THROWS_EQUALS(d.merge(a), const std::runtime_error &err,
- // std::string(err.what()),
- // "Cannot merge DetectorInfo: "
- // "both or none of the scans "
- // "must be synchronous");
- // }
-
-
- // void xtest_merge_fail_monitor_mismatch() {
- // auto infos1 = makeFlatTree(PosVec(2), RotVec(2));
- // auto infos2 = makeFlatTree(PosVec(2), RotVec(2));
- // auto &a = *std::get<0>(infos1);
- // auto &b = *std::get<0>(infos2);
- // DetectorInfo c(PosVec(2), RotVec(2), {1});
-
- // b.setDetectorInfo(&c);
- // a.setScanInterval({0, 1});
- // b.setScanInterval({0, 1});
-
- // TS_ASSERT_THROWS_EQUALS(
- // a.merge(b), const std::runtime_error &err, std::string(err.what()),
- // "Cannot merge DetectorInfo: monitor flags mismatch");
- // }
-
- // void xtest_merge_fail_monitor_mismatch() {
- // DetectorInfo a(PosVec(2), RotVec(2));
- // DetectorInfo b(PosVec(2), RotVec(2), {1});
- // a.setScanInterval({0, 1});
- // // a.setScanInterval(1, {0, 1});
- // b.setScanInterval({0, 1});
- // // b.setScanInterval(1, {0, 1});
- // Mantid::Beamline::ComponentInfo c;
- // Mantid::Beamline::ComponentInfo d;
- // c.setDetectorInfo(&a);
- // d.setDetectorInfo(&b);
- // TS_ASSERT_THROWS_EQUALS(
- // c.merge(d), const std::runtime_error &err, std::string(err.what()),
- // "Cannot merge DetectorInfo: monitor flags mismatch");
- // }
-
- // void xtest_merge_identical() {
- // auto infos1 = makeFlatTree(PosVec(2), RotVec(2));
- // auto &a = *std::get<0>(infos1);
- // a.setScanInterval({0, 10});
- // auto b(a);
- // TS_ASSERT_THROWS_NOTHING(a.merge(b));
- // }
-
- // void xtest_merge_identical() {
- // DetectorInfo a(PosVec(2), RotVec(2));
- // a.setScanInterval({0, 10});
- // auto b(a);
- // Mantid::Beamline::ComponentInfo c;
- // Mantid::Beamline::ComponentInfo d;
- // c.setDetectorInfo(&a);
- // d.setDetectorInfo(&b);
- // TS_ASSERT_THROWS_NOTHING(d.merge(c));
- // }
-
- // void xtest_merge_fail_overlap() {
- // DetectorInfo a(PosVec(2), RotVec(2));
- // a.setScanInterval({0, 10});
- // auto b(a);
- // b = a;
- // b.setScanInterval({-1, 5});
- // Mantid::Beamline::ComponentInfo c;
- // Mantid::Beamline::ComponentInfo d;
- // c.setDetectorInfo(&a);
- // d.setDetectorInfo(&b);
- // TS_ASSERT_THROWS_EQUALS(d.merge(c), const std::runtime_error &err,
- // std::string(err.what()),
- // "Cannot merge DetectorInfo: "
- // "sync scan intervals "
- // "overlap but not identical");
- // b.setScanInterval({1, 5});
- // TS_ASSERT_THROWS_EQUALS(d.merge(c), const std::runtime_error &err,
- // std::string(err.what()),
- // "Cannot merge DetectorInfo: "
- // "sync scan intervals "
- // "overlap but not identical");
- // b.setScanInterval({1, 11});
- // TS_ASSERT_THROWS_EQUALS(d.merge(c), const std::runtime_error &err,
- // std::string(err.what()),
- // "Cannot merge DetectorInfo: "
- // "sync scan intervals "
- // "overlap but not identical");
- // }
-
- // void do_test_merge_identical_interval_failures(DetectorInfo &a) {
- // Eigen::Vector3d pos1(1, 0, 0);
- // Eigen::Vector3d pos2(2, 0, 0);
- // Eigen::Quaterniond rot1(
- // Eigen::AngleAxisd(30.0, Eigen::Vector3d{1, 2, 3}.normalized()));
- // Eigen::Quaterniond rot2(
- // Eigen::AngleAxisd(31.0, Eigen::Vector3d{1, 2, 3}.normalized()));
- // a.setMasked(0, true);
- // a.setPosition(0, pos1);
- // a.setRotation(0, rot1);
- // auto b(a);
-
- // Mantid::Beamline::ComponentInfo c;
- // Mantid::Beamline::ComponentInfo d;
- // c.setDetectorInfo(&a);
- // d.setDetectorInfo(&b);
-
- // TS_ASSERT_THROWS_NOTHING(d.merge(c));
-
- // b = a;
- // b.setMasked(0, false);
- // TS_ASSERT_THROWS_EQUALS(d.merge(c), const std::runtime_error &err,
- // std::string(err.what()),
- // "Cannot merge DetectorInfo: "
- // "matching scan interval but "
- // "mask flags differ");
- // b.setMasked(0, true);
- // TS_ASSERT_THROWS_NOTHING(d.merge(c));
-
- // b = a;
- // b.setPosition(0, pos2);
- // TS_ASSERT_THROWS_EQUALS(d.merge(c), const std::runtime_error &err,
- // std::string(err.what()),
- // "Cannot merge DetectorInfo: "
- // "matching scan interval but "
- // "positions differ");
- // b.setPosition(0, pos1);
- // TS_ASSERT_THROWS_NOTHING(d.merge(c));
-
- // b = a;
- // b.setRotation(0, rot2);
- // TS_ASSERT_THROWS_EQUALS(d.merge(c), const std::runtime_error &err,
- // std::string(err.what()),
- // "Cannot merge DetectorInfo: "
- // "matching scan interval but "
- // "rotations differ");
- // b.setRotation(0, rot1);
- // TS_ASSERT_THROWS_NOTHING(d.merge(c));
- // }
-
- // void xtest_merge_identical_interval_failures_async() {
- // DetectorInfo a(PosVec(1), RotVec(1));
- // a.setScanInterval({0, 1});
- // do_test_merge_identical_interval_failures(a);
- // }
-
- // void xtest_merge_identical_interval_failures() {
- // DetectorInfo a(PosVec(1), RotVec(1));
- // a.setScanInterval({0, 1});
- // do_test_merge_identical_interval_failures(a);
- // }
-
- // void xtest_merge_identical_interval_async() {
- // DetectorInfo a(PosVec(1), RotVec(1));
- // a.setScanInterval(0, {0, 1});
- // const auto b(a);
- // TS_ASSERT_THROWS_NOTHING(a.merge(b));
- // TS_ASSERT(a.isEquivalent(b));
- // }
-
- // void xtest_merge_identical_interval() {
- // DetectorInfo a(PosVec(2), RotVec(2));
- // a.setScanInterval({0, 10});
- // auto b(a);
- // Mantid::Beamline::ComponentInfo c;
- // Mantid::Beamline::ComponentInfo d;
- // c.setDetectorInfo(&a);
- // d.setDetectorInfo(&b);
- // TS_ASSERT_THROWS_NOTHING(d.merge(c));
- // }
-
- // void xtest_merge_identical_interval_with_monitor() {
- // DetectorInfo a(PosVec(2), RotVec(2), {1});
- // a.setScanInterval({0, 1});
- // a.setScanInterval({0, 1});
- // auto b(a);
- // Mantid::Beamline::ComponentInfo c;
- // Mantid::Beamline::ComponentInfo d;
- // c.setDetectorInfo(&a);
- // d.setDetectorInfo(&b);
- // TS_ASSERT_THROWS_NOTHING(c.merge(d));
- // TS_ASSERT(a.isEquivalent(b));
- // }
-
- // void xtest_merge_fail_partial_overlap() {
- // DetectorInfo a(PosVec(2), RotVec(2));
- // a.setScanInterval({0, 10});
- // a.setScanInterval({0, 10});
- // auto b(a);
- // Mantid::Beamline::ComponentInfo c;
- // Mantid::Beamline::ComponentInfo d;
- // c.setDetectorInfo(&a);
- // d.setDetectorInfo(&b);
- // TS_ASSERT_THROWS_NOTHING(d.merge(c));
- // b = a;
- // b.setScanInterval({-1, 5});
- // TS_ASSERT_THROWS_EQUALS(
- // d.merge(c), const std::runtime_error &err, std::string(err.what()),
- // "Cannot merge DetectorInfo: scan intervals overlap but not identical");
- // b.setScanInterval({1, 5});
- // TS_ASSERT_THROWS_EQUALS(
- // d.merge(c), const std::runtime_error &err, std::string(err.what()),
- // "Cannot merge DetectorInfo: scan intervals overlap but not identical");
- // b.setScanInterval({1, 11});
- // TS_ASSERT_THROWS_EQUALS(
- // d.merge(c), const std::runtime_error &err, std::string(err.what()),
- // "Cannot merge DetectorInfo: scan intervals overlap but not identical");
- // }
-
- // void xtest_merge() {
- // DetectorInfo a(PosVec(2), RotVec(2), {1});
- // // Monitor at index 1, set up for identical interval
- // std::pair<int64_t, int64_t> monitorInterval(0, 2);
- // a.setScanInterval(monitorInterval);
- // auto b(a);
- // Eigen::Vector3d pos1(1, 0, 0);
- // Eigen::Vector3d pos2(2, 0, 0);
- // a.setPosition(0, pos1);
- // b.setPosition(0, pos2);
- // std::pair<int64_t, int64_t> interval1(0, 1);
- // std::pair<int64_t, int64_t> interval2(1, 2);
- // a.setScanInterval(interval1);
- // b.setScanInterval(interval2);
- // Mantid::Beamline::ComponentInfo c;
- // Mantid::Beamline::ComponentInfo d;
- // c.setDetectorInfo(&a);
- // d.setDetectorInfo(&b);
-
- // TS_ASSERT_THROWS_NOTHING(c.merge(d));
- // TS_ASSERT(a.isScanning());
- // // TS_ASSERT(!a.isSyncScan());
- // TS_ASSERT(!a.isEquivalent(b));
- // TS_ASSERT_EQUALS(a.size(), 2);
- // TS_ASSERT_EQUALS(a.scanSize(), 3);
- // TS_ASSERT_EQUALS(a.scanCount(), 2);
- // // Note that the order is not guaranteed, currently these are just in the
- // // order in which the are merged.
- // TS_ASSERT_EQUALS(a.scanIntervals()[0], interval1);
- // TS_ASSERT_EQUALS(a.scanIntervals()[1], interval2);
- // TS_ASSERT_EQUALS(a.position({0, 0}), pos1);
- // TS_ASSERT_EQUALS(a.position({0, 1}), pos2);
- // // Monitor is not scanning
- // TS_ASSERT_EQUALS(a.scanCount(), 1);
- // }
-
- // void xtest_merge_sync() {
- // DetectorInfo a(PosVec(2), RotVec(2), {1});
- // auto b(a);
- // Eigen::Vector3d pos1(1, 0, 0);
- // Eigen::Vector3d pos2(2, 0, 0);
- // a.setPosition(0, pos1);
- // b.setPosition(0, pos2);
- // std::pair<int64_t, int64_t> interval1(0, 1);
- // std::pair<int64_t, int64_t> interval2(1, 2);
- // a.setScanInterval(interval1);
- // b.setScanInterval(interval2);
- // Mantid::Beamline::ComponentInfo c;
- // Mantid::Beamline::ComponentInfo d;
- // c.setDetectorInfo(&a);
- // d.setDetectorInfo(&b);
-
- // TS_ASSERT_THROWS_NOTHING(c.merge(d));
- // TS_ASSERT(a.isScanning());
- // // TS_ASSERT(a.isSyncScan());
- // TS_ASSERT(!a.isEquivalent(b));
- // TS_ASSERT_EQUALS(a.size(), 2);
- // TS_ASSERT_EQUALS(a.scanSize(), 4);
- // TS_ASSERT_EQUALS(a.scanCount(), 2);
- // TS_ASSERT_EQUALS(a.scanCount(), 2);
- // // Note that the order is not guaranteed, currently these are just in the
- // // order in which the are merged.
- // TS_ASSERT_EQUALS(a.scanIntervals()[0], interval1);
- // // TS_ASSERT_EQUALS(a.scanIntervals()[0], interval1);
- // TS_ASSERT_EQUALS(a.scanIntervals()[1], interval2);
- // // TS_ASSERT_EQUALS(a.scanIntervals()[1], interval2);
- // TS_ASSERT_EQUALS(a.position({0, 0}), pos1);
- // TS_ASSERT_EQUALS(a.position({0, 1}), pos2);
- // }
-
- // void xtest_merge_idempotent() {
- // // Test that A + B + B = A + B
- // DetectorInfo a(PosVec(2), RotVec(2), {1});
- // // Monitor at index 1, set up for identical interval
- // std::pair<int64_t, int64_t> monitorInterval(0, 2);
- // a.setScanInterval(monitorInterval);
- // a.setPosition(1, {0, 0, 0});
- // auto b(a);
- // Eigen::Vector3d pos1(1, 0, 0);
- // Eigen::Vector3d pos2(2, 0, 0);
- // a.setPosition(0, pos1);
- // b.setPosition(0, pos2);
- // std::pair<int64_t, int64_t> interval1(0, 1);
- // std::pair<int64_t, int64_t> interval2(1, 2);
- // a.setScanInterval(interval1);
- // b.setScanInterval(interval2);
- // Mantid::Beamline::ComponentInfo c;
- // Mantid::Beamline::ComponentInfo d;
- // c.setDetectorInfo(&a);
- // d.setDetectorInfo(&b);
-
-
- // TS_ASSERT_THROWS_NOTHING(c.merge(d));
- // auto a0(a);
- // TS_ASSERT_THROWS_NOTHING(c.merge(d));
- // TS_ASSERT(a.isEquivalent(a0));
- // }
-
- // void xtest_merge_multiple() {
- // DetectorInfo a(PosVec(2), RotVec(2), {1});
- // // Monitor at index 1, set up for identical interval
- // std::pair<int64_t, int64_t> monitorInterval(0, 3);
- // a.setScanInterval(1, monitorInterval);
- // auto b(a);
- // auto c(a);
- // Eigen::Vector3d pos1(1, 0, 0);
- // Eigen::Vector3d pos2(2, 0, 0);
- // Eigen::Vector3d pos3(3, 0, 0);
- // a.setPosition(0, pos1);
- // b.setPosition(0, pos2);
- // c.setPosition(0, pos3);
- // std::pair<int64_t, int64_t> interval1(0, 1);
- // std::pair<int64_t, int64_t> interval2(1, 2);
- // std::pair<int64_t, int64_t> interval3(2, 3);
- // a.setScanInterval(0, interval1);
- // b.setScanInterval(0, interval2);
- // c.setScanInterval(0, interval3);
- // TS_ASSERT_THROWS_NOTHING(a.merge(b));
- // TS_ASSERT_THROWS_NOTHING(a.merge(c));
- // TS_ASSERT(a.isScanning());
- // TS_ASSERT(!a.isSyncScan());
- // TS_ASSERT(!a.isEquivalent(b));
- // TS_ASSERT(!a.isEquivalent(c));
- // TS_ASSERT_EQUALS(a.size(), 2);
- // TS_ASSERT_EQUALS(a.scanSize(), 4);
- // TS_ASSERT_EQUALS(a.scanCount(), 3);
- // TS_ASSERT_EQUALS(a.scanInterval({0, 0}), interval1);
- // TS_ASSERT_EQUALS(a.scanInterval({0, 1}), interval2);
- // TS_ASSERT_EQUALS(a.scanInterval({0, 2}), interval3);
- // TS_ASSERT_EQUALS(a.position({0, 0}), pos1);
- // TS_ASSERT_EQUALS(a.position({0, 1}), pos2);
- // TS_ASSERT_EQUALS(a.position({0, 2}), pos3);
- // // Monitor is not scanning
- // TS_ASSERT_EQUALS(a.scanCount(), 1);
- // }
-
- // void xtest_merge_multiple() {
- // DetectorInfo a(PosVec(2), RotVec(2), {1});
- // auto b(a);
- // auto c(a);
- // Eigen::Vector3d pos1(1, 0, 0);
- // Eigen::Vector3d pos2(2, 0, 0);
- // Eigen::Vector3d pos3(3, 0, 0);
- // a.setPosition(0, pos1);
- // b.setPosition(0, pos2);
- // c.setPosition(0, pos3);
- // std::pair<int64_t, int64_t> interval1(0, 1);
- // std::pair<int64_t, int64_t> interval2(1, 2);
- // std::pair<int64_t, int64_t> interval3(2, 3);
- // a.setScanInterval(interval1);
- // b.setScanInterval(interval2);
- // c.setScanInterval(interval3);
- // Mantid::Beamline::ComponentInfo d;
- // Mantid::Beamline::ComponentInfo e;
- // Mantid::Beamline::ComponentInfo f;
- // d.setDetectorInfo(&a);
- // e.setDetectorInfo(&b);
- // f.setDetectorInfo(&c);
-
- // TS_ASSERT_THROWS_NOTHING(d.merge(e));
- // TS_ASSERT_THROWS_NOTHING(d.merge(f));
- // TS_ASSERT(a.isScanning());
- // // TS_ASSERT(a.isSyncScan());
- // TS_ASSERT(!a.isEquivalent(b));
- // TS_ASSERT(!a.isEquivalent(c));
- // TS_ASSERT_EQUALS(a.size(), 2);
- // TS_ASSERT_EQUALS(a.scanSize(), 6);
- // TS_ASSERT_EQUALS(a.scanCount(), 3);
- // TS_ASSERT_EQUALS(a.scanCount(), 3);
- // TS_ASSERT_EQUALS(a.scanIntervals()[0], interval1);
- // TS_ASSERT_EQUALS(a.scanIntervals()[0], interval1);
- // TS_ASSERT_EQUALS(a.scanIntervals()[1], interval2);
- // TS_ASSERT_EQUALS(a.scanIntervals()[1], interval2);
- // TS_ASSERT_EQUALS(a.scanIntervals()[2], interval3);
- // TS_ASSERT_EQUALS(a.scanIntervals()[2], interval3);
- // TS_ASSERT_EQUALS(a.position({0, 0}), pos1);
- // TS_ASSERT_EQUALS(a.position({0, 1}), pos2);
- // TS_ASSERT_EQUALS(a.position({0, 2}), pos3);
- // }
-
- // void xtest_merge_multiple_associative() {
- // // Test that (A + B) + C == A + (B + C)
- // // This is implied by the ordering guaranteed by merge().
- // DetectorInfo a1(PosVec(1), RotVec(1));
- // a1.setRotation(0, Eigen::Quaterniond::Identity());
- // auto b(a1);
- // auto c(a1);
- // Eigen::Vector3d pos1(1, 0, 0);
- // Eigen::Vector3d pos2(2, 0, 0);
- // Eigen::Vector3d pos3(3, 0, 0);
- // a1.setPosition(0, pos1);
- // b.setPosition(0, pos2);
- // c.setPosition(0, pos3);
- // std::pair<int64_t, int64_t> interval1(0, 1);
- // std::pair<int64_t, int64_t> interval2(1, 2);
- // std::pair<int64_t, int64_t> interval3(2, 3);
- // a1.setScanInterval(0, interval1);
- // b.setScanInterval(0, interval2);
- // c.setScanInterval(0, interval3);
- // auto a2(a1);
- // TS_ASSERT_THROWS_NOTHING(a1.merge(b));
- // TS_ASSERT_THROWS_NOTHING(a1.merge(c));
- // TS_ASSERT_THROWS_NOTHING(b.merge(c));
- // TS_ASSERT_THROWS_NOTHING(a2.merge(b));
- // TS_ASSERT(a1.isEquivalent(a2));
- // }
-
- // void xtest_merge_multiple_associative() {
- // // Test that (A + B) + C == A + (B + C)
- // // This is implied by the ordering guaranteed by merge().
- // DetectorInfo a1(PosVec(1), RotVec(1));
- // a1.setRotation(0, Eigen::Quaterniond::Identity());
- // auto b(a1);
- // auto c(a1);
- // Eigen::Vector3d pos1(1, 0, 0);
- // Eigen::Vector3d pos2(2, 0, 0);
- // Eigen::Vector3d pos3(3, 0, 0);
- // a1.setPosition(0, pos1);
- // b.setPosition(0, pos2);
- // c.setPosition(0, pos3);
- // std::pair<int64_t, int64_t> interval1(0, 1);
- // std::pair<int64_t, int64_t> interval2(1, 2);
- // std::pair<int64_t, int64_t> interval3(2, 3);
- // a1.setScanInterval(interval1);
- // b.setScanInterval(interval2);
- // c.setScanInterval(interval3);
- // auto a2(a1);
- // Mantid::Beamline::ComponentInfo d1;
- // Mantid::Beamline::ComponentInfo d2;
- // Mantid::Beamline::ComponentInfo e;
- // Mantid::Beamline::ComponentInfo f;
- // d1.setDetectorInfo(&a1);
- // d2.setDetectorInfo(&a2);
- // e.setDetectorInfo(&b);
- // f.setDetectorInfo(&c);
- // TS_ASSERT_THROWS_NOTHING(d1.merge(e));
- // TS_ASSERT_THROWS_NOTHING(d1.merge(f));
- // TS_ASSERT_THROWS_NOTHING(e.merge(f));
- // TS_ASSERT_THROWS_NOTHING(d2.merge(e));
- // TS_ASSERT(a1.isEquivalent(a2));
- // }
};
#endif /* MANTID_BEAMLINE_DETECTORINFOTEST_H_ */
diff --git a/Framework/DataHandling/test/LoadILLDiffractionTest.h b/Framework/DataHandling/test/LoadILLDiffractionTest.h
index d5893ba2adddc650350210bd31c27e8ad1355cd1..c4ac7079e4267c1762e4c70927dca12265c94232 100644
--- a/Framework/DataHandling/test/LoadILLDiffractionTest.h
+++ b/Framework/DataHandling/test/LoadILLDiffractionTest.h
@@ -332,28 +332,6 @@ public:
EXPECTED_SECOND_FROM_END_TIME)
TS_ASSERT_EQUALS(endRange.second.toISO8601String(), EXPECTED_END_TIME)
- // for (size_t i = 0; i < detInfo.size(); ++i) {
- // TS_ASSERT_EQUALS(detInfo.scanCount(), SCAN_COUNT)
-
- // const auto &startRange = detInfo.scanInterval({i, 0});
- // const auto &secondRange = detInfo.scanInterval({i, 1});
- // const auto &secondFromEndRange =
- // detInfo.scanInterval({i, detInfo.scanCount(i) - 2});
- // const auto &endRange =
- // detInfo.scanInterval({i, detInfo.scanCount(i) - 1});
-
- // 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(),
- // EXPECTED_SECOND_FROM_END_TIME)
- // TS_ASSERT_EQUALS(endRange.first.toISO8601String(),
- // EXPECTED_SECOND_FROM_END_TIME)
- // TS_ASSERT_EQUALS(endRange.second.toISO8601String(), EXPECTED_END_TIME)
- // }
-
// Check monitor does not move
for (size_t j = 0; j < detInfo.scanCount(); ++j) {
TS_ASSERT(detInfo.isMonitor({0, j}))
diff --git a/Framework/DataObjects/src/ScanningWorkspaceBuilder.cpp b/Framework/DataObjects/src/ScanningWorkspaceBuilder.cpp
index 740b823672d55d3b8ec7fb7b80043300fad3ca36..47574c80067271fe5e54bc96702dca5fad180fda 100644
--- a/Framework/DataObjects/src/ScanningWorkspaceBuilder.cpp
+++ b/Framework/DataObjects/src/ScanningWorkspaceBuilder.cpp
@@ -190,7 +190,7 @@ void ScanningWorkspaceBuilder::setIndexingType(
* @return Workspace2D with the scanning information set
*/
MatrixWorkspace_sptr ScanningWorkspaceBuilder::buildWorkspace() const {
- validateInputs();
+ validateInputs();
auto outputWorkspace = create<Workspace2D>(
m_instrument, m_nDetectors * m_nTimeIndexes, m_histogram);
@@ -201,7 +201,6 @@ MatrixWorkspace_sptr ScanningWorkspaceBuilder::buildWorkspace() const {
buildOutputComponentInfo(outputComponentInfo);
auto &outputDetectorInfo = outputWorkspace->mutableDetectorInfo();
- outputDetectorInfo.setScanInterval(m_timeRanges[0]);
if (!m_positions.empty())
buildPositions(outputDetectorInfo);
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument/ComponentInfo.h b/Framework/Geometry/inc/MantidGeometry/Instrument/ComponentInfo.h
index c6505ca552d9d0083c00aa73763601404c36211f..b01bdd66a85df5585386dc486753afe9af89c35f 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/ComponentInfo.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/ComponentInfo.h
@@ -151,8 +151,6 @@ public:
const BoundingBox *reference = nullptr) const;
Beamline::ComponentType componentType(const size_t componentIndex) const;
void setScanInterval(const std::pair<int64_t, int64_t> &interval);
- // void setScanInterval(const std::pair<Types::Core::DateAndTime, Types::Core::DateAndTime>
- // &interval);
void merge(const ComponentInfo &other);
size_t scanSize() const;
friend class Instrument;
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument/DetectorInfo.h b/Framework/Geometry/inc/MantidGeometry/Instrument/DetectorInfo.h
index 0fb3ac5db9beb19af557317f6b3738a41e960647..213b77bb839381827dad0afebe106da3094730c1 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/DetectorInfo.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/DetectorInfo.h
@@ -78,7 +78,6 @@ public:
size_t size() const;
size_t scanSize() const;
bool isScanning() const;
-// bool isSyncScan() const;
bool isMonitor(const size_t index) const;
bool isMonitor(const std::pair<size_t, size_t> &index) const;
@@ -119,19 +118,11 @@ public:
/// This will throw an out of range exception if the detector does not exist.
size_t indexOf(const detid_t id) const { return m_detIDToIndex->at(id); }
-// size_t scanCount(const size_t index) const;
size_t scanCount() const;
const std::vector<std::pair<Types::Core::DateAndTime, Types::Core::DateAndTime>> &scanIntervals() const;
-// std::pair<Types::Core::DateAndTime, Types::Core::DateAndTime>
-// scanInterval(const std::pair<size_t, size_t> &index) const;
-// void setScanInterval(const size_t index,
-// const std::pair<Types::Core::DateAndTime,
-// Types::Core::DateAndTime> &interval);
void setScanInterval(const std::pair<Types::Core::DateAndTime,
Types::Core::DateAndTime> &interval);
-// void merge(const DetectorInfo &other);
-
friend class API::SpectrumInfo;
friend class Instrument;
@@ -140,8 +131,6 @@ private:
boost::shared_ptr<const Geometry::IDetector>
getDetectorPtr(const size_t index) const;
- // void merge(const DetectorInfo &other);
-
/// Pointer to the actual DetectorInfo object (non-wrapping part).
std::unique_ptr<Beamline::DetectorInfo> m_detectorInfo;
diff --git a/Framework/Geometry/src/Instrument/ComponentInfo.cpp b/Framework/Geometry/src/Instrument/ComponentInfo.cpp
index 99172aeaeaf9821ad9254a296dad5552726a25d6..73e92efa2d60b0c8873d31ecf9933b0c07dfc253 100644
--- a/Framework/Geometry/src/Instrument/ComponentInfo.cpp
+++ b/Framework/Geometry/src/Instrument/ComponentInfo.cpp
@@ -421,18 +421,9 @@ ComponentInfo::componentType(const size_t componentIndex) const {
void ComponentInfo::setScanInterval(
const std::pair<int64_t, int64_t> &interval) {
- // const std::pair<Types::Core::DateAndTime, Types::Core::DateAndTime>
- // &interval) {
m_componentInfo->setScanInterval(interval);
}
-// void ComponentInfo::setScanInterval(
-// // const std::pair<int64_t, int64_t> &interval) {
-// const std::pair<Types::Core::DateAndTime, Types::Core::DateAndTime>
-// &interval) {
-// m_componentInfo->setScanInterval({interval.first.totalNanoseconds(),interval.second.totalNanoseconds()});
-// }
-
void ComponentInfo::merge(const ComponentInfo &other) {
m_componentInfo->merge(*other.m_componentInfo);
}
diff --git a/Framework/Geometry/src/Instrument/DetectorInfo.cpp b/Framework/Geometry/src/Instrument/DetectorInfo.cpp
index 786cd1dc34629dc4e3b7234a6327fdf0e6c81fb6..be4923a1f580ebf5f860acd0cf88b00a9207d821 100644
--- a/Framework/Geometry/src/Instrument/DetectorInfo.cpp
+++ b/Framework/Geometry/src/Instrument/DetectorInfo.cpp
@@ -90,10 +90,6 @@ size_t DetectorInfo::scanSize() const { return m_detectorInfo->scanSize(); }
/// Returns true if the beamline has scanning detectors.
bool DetectorInfo::isScanning() const { return m_detectorInfo->isScanning(); }
-/// Returns true if the beamline has scanning detectors and they have all the
-/// same scan intervals.
-// bool DetectorInfo::isSyncScan() const { return m_detectorInfo->isSyncScan(); }
-
/// Returns true if the detector is a monitor.
bool DetectorInfo::isMonitor(const size_t index) const {
return m_detectorInfo->isMonitor(index);
@@ -335,31 +331,8 @@ const std::vector<std::pair<Types::Core::DateAndTime, Types::Core::DateAndTime>>
intervals_vector->push_back({(*it).first, (*it).second});
}
return *intervals_vector;
-// return m_detectorInfo->scanIntervals();
}
-// std::pair<Types::Core::DateAndTime, Types::Core::DateAndTime>
-// DetectorInfo::scanInterval(const std::pair<size_t, size_t> &index) const {
-// const auto &interval = m_detectorInfo->scanInterval(index);
-// return {interval.first, interval.second};
-// }
-
-/** Set the scan interval of the detector with given detector index.
- *
- * The interval start and end values would typically correspond to nanoseconds
- * since 1990, as in Types::Core::DateAndTime. Note that it is currently not
- *possible
- * to modify scan intervals for a DetectorInfo with time-dependent detectors,
- * i.e., time intervals must be set with this method before merging individual
- * scans. */
-// void DetectorInfo::setScanInterval(
-// const size_t index,
-// const std::pair<Types::Core::DateAndTime, Types::Core::DateAndTime>
-// &interval) {
-// m_detectorInfo->setScanInterval(index, {interval.first.totalNanoseconds(),
-// interval.second.totalNanoseconds()});
-// }
-
/** Set the scan interval for all detectors.
*
* Prefer this over setting intervals for individual detectors since it enables
@@ -371,15 +344,6 @@ void DetectorInfo::setScanInterval(
{interval.first.totalNanoseconds(), interval.second.totalNanoseconds()});
}
-/** Merges the contents of other into this.
- *
- * Scan intervals in both other and this must be set. Intervals must be
- * identical or non-overlapping. If they are identical all other parameters (for
- * that index) must match. */
-// void DetectorInfo::merge(const DetectorInfo &other) {
-// m_detectorInfo->merge(*other.m_detectorInfo);
-// }
-
const Geometry::IDetector &DetectorInfo::getDetector(const size_t index) const {
size_t thread = static_cast<size_t>(PARALLEL_THREAD_NUMBER);
if (m_lastIndex[thread] != index) {
diff --git a/Framework/Kernel/src/ConfigService.cpp b/Framework/Kernel/src/ConfigService.cpp
index d79d1ab4f7f4cc8ca4fd2dd0d7bb37f07d0a336e..aba2bb609451b8d5a02bff30bd2af6c8aedc3fd5 100644
--- a/Framework/Kernel/src/ConfigService.cpp
+++ b/Framework/Kernel/src/ConfigService.cpp
@@ -647,7 +647,7 @@ void ConfigServiceImpl::createUserPropertiesFile() const {
filestr << "#algorithms.retained=90\n\n";
filestr
<< "## Set the maximum number of cores used to run algorithms over\n";
- filestr << "MultiThreaded.MaxCores=2\n\n";
+ filestr << "#MultiThreaded.MaxCores=4\n\n";
filestr << "##\n";
filestr << "## FACILITY AND INSTRUMENT\n";
filestr << "##\n\n";
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/ApplyDetectorScanEffCorrTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/ApplyDetectorScanEffCorrTest.py
index 079e94c74a1ba6bf1380dc8e833c3a1ff0d157f0..0a13784999a62f419f6f9925c02b0d08f983f77a 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/ApplyDetectorScanEffCorrTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/ApplyDetectorScanEffCorrTest.py
@@ -20,30 +20,19 @@ class ApplyDetectorScanEffCorrTest(unittest.TestCase):
self.assertEquals(calibrated_ws.readE(i), input_ws.readE(i) * (i+1))
def test_simple_scanning_case(self):
- print("NEIL : got to here 1")
input_ws = CreateSampleWorkspace(NumMonitors=0, NumBanks=6, BankPixelWidth=1, XMin=0, XMax=1, BinWidth=1, NumScanPoints=2)
- print("NEIL : got to here 2")
-
calibration_x = np.array([0, 0, 0, 0, 0, 0])
calibration_y = np.array([1.0, 2.0, 3.0, 4.0, 5.0, 6.0])
- print("NEIL : got to here 3")
-
# Note the monitors are in the wrong place doing the test workspace creation like this - but it does not affect the test.
calibration_ws = CreateWorkspace(DataX=calibration_x, DataY=calibration_y, Nspec=calibration_y.size)
- print("NEIL : got to here 4")
-
expected = np.repeat(calibration_y, 2)
calibrated_ws = ApplyDetectorScanEffCorr(input_ws, calibration_ws)
- print("NEIL : got to here 5")
-
for i in range(12):
self.assertEquals(calibrated_ws.readY(i), input_ws.readY(i) * expected[i])
self.assertEquals(calibrated_ws.readE(i), input_ws.readE(i) * expected[i])
- print("NEIL : got to here 6")
-
def test_mismatched_workspace_size(self):
input_ws = CreateSampleWorkspace(NumMonitors=0, NumBanks=6, BankPixelWidth=1, XMin=0, XMax=1, BinWidth=1)