Merge branch 'feature/10094_support_diffraction_corrections' into bug…

…fix/10454_idr_bayes_functional_at_any_facility Conflicts: Code/Mantid/scripts/Inelastic/IndirectAbsCor.py Refs #10454
mantidproject · Nov 26, 2014 · ce80fbc · ce80fbc
2 parents 2a3d96d + d1263e9
commit ce80fbc
Show file tree

Hide file tree

Showing 5 changed files with 225 additions and 163 deletions.
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectDataAnalysis.ui b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectDataAnalysis.ui
@@ -1412,13 +1412,11 @@
             <property name="workspaceSuffixes" stdset="0">
              <stringlist>
               <string>_red</string>
-              <string>_sqw</string>
              </stringlist>
             </property>
             <property name="fileBrowserSuffixes" stdset="0">
              <stringlist>
               <string>_red.nxs</string>
-              <string>_sqw.nxs</string>
              </stringlist>
             </property>
             <property name="showLoad" stdset="0">
@@ -1447,13 +1445,11 @@
             <property name="workspaceSuffixes" stdset="0">
              <stringlist>
               <string>_red</string>
-              <string>_sqw</string>
              </stringlist>
             </property>
             <property name="fileBrowserSuffixes" stdset="0">
              <stringlist>
               <string>_red.nxs</string>
-              <string>_sqw.nxs</string>
              </stringlist>
             </property>
             <property name="showLoad" stdset="0">
@@ -2858,14 +2854,14 @@
   <tabstop>confit_ckSaveSeq</tabstop>
   <tabstop>absp_ckUseCan</tabstop>
   <tabstop>absp_cbShape</tabstop>
-  <tabstop>absp_leavar</tabstop>
-  <tabstop>absp_lewidth</tabstop>
   <tabstop>absp_lets</tabstop>
   <tabstop>absp_letc1</tabstop>
   <tabstop>absp_letc2</tabstop>
   <tabstop>absp_ler1</tabstop>
   <tabstop>absp_ler2</tabstop>
   <tabstop>absp_ler3</tabstop>
+  <tabstop>absp_leavar</tabstop>
+  <tabstop>absp_lewidth</tabstop>
   <tabstop>absp_lesamden</tabstop>
   <tabstop>absp_cbSampleInputType</tabstop>
   <tabstop>absp_lesamsigs</tabstop>

diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/CalcCorr.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/CalcCorr.cpp
@@ -54,7 +54,8 @@ class QDoubleMultiRangeValidator : public QValidator
     // For each range in the list, use the slave QDoubleValidator to find out the state.
     for( auto range = m_ranges.begin(); range != m_ranges.end(); ++ range )
     {
-      assert(range->first < range->second); // Play nice.
+      if(range->first >= range->second)
+        throw std::runtime_error("Invalid range");
 
       m_slaveVal->setBottom(range->first);
       m_slaveVal->setTop(range->second);