Try to fix systemtest an warning. Refs #9202

mantidproject · Sep 20, 2014 · 05660b4 · 05660b4
1 parent 786e617
commit 05660b4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/Code/Mantid/Framework/MDAlgorithms/src/SXDMDNorm.cpp b/Code/Mantid/Framework/MDAlgorithms/src/SXDMDNorm.cpp
@@ -136,14 +136,14 @@ namespace MDAlgorithms
       lIndex=-1;
 
       //check for other dimensions if we could measure anything in the original data
-      std::vector<double> otherValues;
+      std::vector<coord_t> otherValues;
       for(size_t i=3;i<m_inputWS->getNumDims();i++)
       {
           float dimMin=static_cast<float>(m_inputWS->getDimension(i)->getMinimum());
           float dimMax=static_cast<float>(m_inputWS->getDimension(i)->getMaximum());
 
           Kernel::TimeSeriesProperty<double> *run_property = dynamic_cast<Kernel::TimeSeriesProperty<double> *>(m_inputWS->getExperimentInfo(0)->run().getProperty(m_inputWS->getDimension(i)->getName()));
-          double value=run_property->firstValue();
+          coord_t value=static_cast<coord_t>(run_property->firstValue());
           otherValues.push_back(value);
           //in the original MD data no time was spent measuring between dimMin and dimMax
           if ((value<dimMin)||(value>dimMax))

diff --git a/Code/Mantid/instrument/TOPAZ_Parameters.xml b/Code/Mantid/instrument/TOPAZ_Parameters.xml
@@ -2,9 +2,10 @@
 <parameter-file instrument = "TOPAZ" valid-from = "2012-08-23T00:00:01">
 
 <component-link name = "TOPAZ">
-
-
-
+<!-- Specify that any banks not in NeXus file are to be removed -->
+<parameter name="remove-unused-banks">
+ <value val="0"/>
+</parameter>
 </component-link>
 
 </parameter-file>