Skip to content
Snippets Groups Projects
Commit ea58ef61 authored by Roman Tolchenov's avatar Roman Tolchenov
Browse files

Re #18688. Returned validity checks.

parent d8164f37
No related branches found
No related tags found
No related merge requests found
...@@ -192,6 +192,8 @@ void RotationSurface::findUVBounds() { ...@@ -192,6 +192,8 @@ void RotationSurface::findUVBounds() {
m_v_max = -DBL_MAX; m_v_max = -DBL_MAX;
for (size_t i = 0; i < m_unwrappedDetectors.size(); ++i) { for (size_t i = 0; i < m_unwrappedDetectors.size(); ++i) {
const UnwrappedDetector &udet = m_unwrappedDetectors[i]; const UnwrappedDetector &udet = m_unwrappedDetectors[i];
if (!udet.isValid())
continue;
if (udet.u < m_u_min) if (udet.u < m_u_min)
m_u_min = udet.u; m_u_min = udet.u;
if (udet.u > m_u_max) if (udet.u > m_u_max)
...@@ -223,6 +225,8 @@ void RotationSurface::findAndCorrectUGap() { ...@@ -223,6 +225,8 @@ void RotationSurface::findAndCorrectUGap() {
std::vector<UnwrappedDetector>::const_iterator ud = std::vector<UnwrappedDetector>::const_iterator ud =
m_unwrappedDetectors.begin(); m_unwrappedDetectors.begin();
for (; ud != m_unwrappedDetectors.end(); ++ud) { for (; ud != m_unwrappedDetectors.end(); ++ud) {
if (!ud->isValid())
continue;
double u = ud->u; double u = ud->u;
int i = int((u - m_u_min) / bin_width); int i = int((u - m_u_min) / bin_width);
ubins[i] = true; ubins[i] = true;
...@@ -259,6 +263,8 @@ void RotationSurface::findAndCorrectUGap() { ...@@ -259,6 +263,8 @@ void RotationSurface::findAndCorrectUGap() {
std::vector<UnwrappedDetector>::iterator ud = m_unwrappedDetectors.begin(); std::vector<UnwrappedDetector>::iterator ud = m_unwrappedDetectors.begin();
for (; ud != m_unwrappedDetectors.end(); ++ud) { for (; ud != m_unwrappedDetectors.end(); ++ud) {
if (!ud->isValid())
continue;
double &u = ud->u; double &u = ud->u;
u = applyUCorrection(u); u = applyUCorrection(u);
} }
......
...@@ -129,6 +129,8 @@ void UnwrappedSurface::cacheAllAssemblies() { ...@@ -129,6 +129,8 @@ void UnwrappedSurface::cacheAllAssemblies() {
for (size_t i = 0; i < m_unwrappedDetectors.size(); ++i) { for (size_t i = 0; i < m_unwrappedDetectors.size(); ++i) {
const UnwrappedDetector &udet = m_unwrappedDetectors[i]; const UnwrappedDetector &udet = m_unwrappedDetectors[i];
if (!udet.isValid())
continue;
// Get the BARE parent (not parametrized) to speed things up. // Get the BARE parent (not parametrized) to speed things up.
auto &detector = m_instrActor->getDetectorByDetID(udet.detID); auto &detector = m_instrActor->getDetectorByDetID(udet.detID);
const Mantid::Geometry::IComponent *bareDet = detector.getComponentID(); const Mantid::Geometry::IComponent *bareDet = detector.getComponentID();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment