Ticket #6070: 6070.patch

Code/Mantid/Framework/Algorithms/src/Q1D2.cpp

@@ -136 +136 @@
 #include "MantidAlgorithms/Qhelper.h"
 #include "MantidKernel/BoundedValidator.h"
 #include "MantidAPI/ISpectrum.h"
+#include <boost/algorithm/string/split.hpp>
 
 namespace Mantid
 {
@@ -240 +241 @@
   const int numSpec = static_cast<int>(m_dataWS->getNumberHistograms());
   Progress progress(this, 0.05, 1.0, numSpec+1);
 
+  std::set<int> ignore_numbers;
+  std::string pname = "ignore-spectra"; 
+  if( m_dataWS->getInstrument()->hasParameter(pname))
+    {
+      struct GetNum { int operator()(const std::string& inp) const { return atoi(inp.c_str()); } };
+      std::string str_values = m_dataWS->getInstrument()->getStringParameter(pname)[0];
+      std::vector<std::string> data;
+      boost::split(data, str_values, boost::is_any_of(",")); 
+      auto it1 = std::inserter(ignore_numbers, ignore_numbers.begin()); 
+      std::transform(data.begin(), data.end(), it1, GetNum()); 
+    }
+
+
   PARALLEL_FOR3(m_dataWS, outputWS, pixelAdj)
   for (int i = 0; i < numSpec; ++i)
   {
@@ -249 +263 @@
     try {
       det = m_dataWS->getDetector(i);
     } catch (Exception::NotFoundError&) {
-      g_log.warning() << "Workspace index " << i << " (SpectrumIndex = " << m_dataWS->getSpectrum(i)->getSpectrumNo() << ") has no detector assigned to it - discarding" << std::endl;
+      if ( ignore_numbers.find(m_dataWS->getSpectrum(i)->getSpectrumNo()) == ignore_numbers.end())
+        g_log.warning() << "Workspace index " << i << " (SpectrumIndex = " << m_dataWS->getSpectrum(i)->getSpectrumNo() << ") has no detector assigned to it - discarding" << std::endl;
       // Catch if no detector. Next line tests whether this happened - test placed
       // outside here because Mac Intel compiler doesn't like 'continue' in a catch
       // in an openmp block.

Code/Mantid/instrument/LOQ_Parameters.xml

@@ -55 +55 @@
   <value val="3"/>
 </parameter>
 
+<parameter name="ignore-spectra" type="string">
+  <value val="16735, 17085, 17086, 16736, 17785, 17786, 17787, 17788, 17789, 17790, 17791, 17792, 17435, 17436"/>
+</parameter>
+
 </component-link>
 
 </parameter-file>