From 14b82d450060b31ecea740e9515372fd6860ef44 Mon Sep 17 00:00:00 2001
From: Martyn Gigg <martyn.gigg@stfc.ac.uk>
Date: Tue, 25 Oct 2011 14:55:52 +0100
Subject: [PATCH] Fixes #4006. Update the detector table code to use
getSpectrum. That way it is consistent with more of the algorithms and the
getDetector call later in the code.
---
Code/Mantid/MantidPlot/src/Mantid/MantidUI.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/Code/Mantid/MantidPlot/src/Mantid/MantidUI.cpp b/Code/Mantid/MantidPlot/src/Mantid/MantidUI.cpp
index 5e4902cb15e..d60f59b3736 100644
--- a/Code/Mantid/MantidPlot/src/Mantid/MantidUI.cpp
+++ b/Code/Mantid/MantidPlot/src/Mantid/MantidUI.cpp
@@ -828,7 +828,7 @@ Table* MantidUI::createDetectorTable(const QString & wsName, const std::vector<i
}
t->setHeaderColType();
- Mantid::API::Axis *spectraAxis = ws->getAxis(1);
+ //Mantid::API::Axis *spectraAxis = ws->getAxis(1);
Mantid::Geometry::IObjComponent_const_sptr sample = ws->getInstrument()->getSample();
QList<double> col_values; // List of double valued data for one row
for( size_t row = 0; row < nrows; ++row )
@@ -838,15 +838,15 @@ Table* MantidUI::createDetectorTable(const QString & wsName, const std::vector<i
Mantid::specid_t currentSpec;
try
{
- currentSpec = spectraAxis->spectraNo(ws_index);
+ currentSpec = ws->getSpectrum(ws_index)->getSpectrumNo();
}
- catch(std::domain_error)
+ catch(std::range_error&)
{//if there is no spectra number information in the workspace display the spectra numbers as -1
currentSpec = -1;
}
int detID = 0;
- bool isMon = false;
+ bool isMon = false;
double R(0.0), Theta(0.0), Phi(0.0);
try
{
--
GitLab