diff --git a/Code/Mantid/Framework/API/src/CoordTransform.cpp b/Code/Mantid/Framework/API/src/CoordTransform.cpp index 3f975c43c81bdebb115ee76aa57834034baea0fc..9fb33abe585820f9f8c20f9b2c2b9b46e6e2b6a4 100644 --- a/Code/Mantid/Framework/API/src/CoordTransform.cpp +++ b/Code/Mantid/Framework/API/src/CoordTransform.cpp @@ -52,14 +52,7 @@ namespace API if (inputVector.getNumDims() != inD) throw std::runtime_error("CoordTransform::apply(): inputVector has the wrong number of coordinates!"); coord_t * outArray = new coord_t[outD]; - -#ifdef COORDT_IS_FLOAT - std::vector<coord_t> temp = inputVector.toVector<coord_t>(); - this->apply(&temp[0], outArray); -#else this->apply(inputVector.getBareArray(), outArray); -#endif - VMD out(outD, outArray); delete [] outArray; return out; diff --git a/Code/Mantid/Framework/API/src/IMDWorkspace.cpp b/Code/Mantid/Framework/API/src/IMDWorkspace.cpp index c9d0a7f859ba59e1eaa767c9fadc751307b08d5c..8a3193ecebf9ed2f2124e2f6184a318e513a1578 100644 --- a/Code/Mantid/Framework/API/src/IMDWorkspace.cpp +++ b/Code/Mantid/Framework/API/src/IMDWorkspace.cpp @@ -54,13 +54,7 @@ namespace Mantid signal_t IMDWorkspace::getSignalAtVMD(const Mantid::Kernel::VMD & coords, const Mantid::API::MDNormalization & normalization) const { -#ifdef COORDT_IS_FLOAT - std::vector<coord_t> temp = coords.toVector<coord_t>(); - signal_t out = this->getSignalAtCoord(&temp[0], normalization); - return out; -#else return this->getSignalAtCoord(coords.getBareArray(), normalization); -#endif } } diff --git a/Code/Mantid/Framework/MDEvents/src/LoadMD.cpp b/Code/Mantid/Framework/MDEvents/src/LoadMD.cpp index 7c32c975c45f313d1c2cf794e41e2195f346df39..af440648ef59cad161c3b4931c5275bcc9824842 100644 --- a/Code/Mantid/Framework/MDEvents/src/LoadMD.cpp +++ b/Code/Mantid/Framework/MDEvents/src/LoadMD.cpp @@ -394,6 +394,15 @@ namespace Mantid file->openGroup("event_data", "NXdata"); uint64_t totalNumEvents = MDE::openNexusData(file); +#ifdef COORDT_IS_FLOAT + if (FileBackEnd && file->getInfo().type == ::NeXus::FLOAT64) + { + g_log.warning() << "You have loaded, in file-backed mode, an older NXS file where event_data is in doubles." << std::endl; + g_log.warning() << "Use this file in read-only mode! Adding or changing data will cause incorrect results!" << std::endl; + g_log.warning() << "It is highly recommended that you save to a new file under the new format." << std::endl; + } +#endif + for (size_t i=0; i<numBoxes; i++) { prog->report(); diff --git a/Code/Mantid/Framework/MDEvents/src/MDEventWorkspace.cpp b/Code/Mantid/Framework/MDEvents/src/MDEventWorkspace.cpp index 9bfb8cbdece4bb86399f018d601aec915b8df843..0dbf3dbdc27610f9dc4103ae60e00b8f212f0ed1 100644 --- a/Code/Mantid/Framework/MDEvents/src/MDEventWorkspace.cpp +++ b/Code/Mantid/Framework/MDEvents/src/MDEventWorkspace.cpp @@ -687,12 +687,7 @@ namespace MDEvents //TODO: make the logic/reuse in the following nicer. if (!outOfBounds) { -#ifdef COORDT_IS_FLOAT - std::vector<coord_t> temp = coord.toVector<coord_t>(); - box = this->data->getBoxAtCoord(&temp[0]); -#else box = this->data->getBoxAtCoord(coord.getBareArray()); -#endif if(box != NULL) { diff --git a/Code/Mantid/MantidPlot/src/Mantid/MantidUI.cpp b/Code/Mantid/MantidPlot/src/Mantid/MantidUI.cpp index 366b1057dc1348cd2b574ea60edc773ace0934e4..33a77ed5ce8da8059ad8e53ae48f2bc73157acd7 100644 --- a/Code/Mantid/MantidPlot/src/Mantid/MantidUI.cpp +++ b/Code/Mantid/MantidPlot/src/Mantid/MantidUI.cpp @@ -1783,8 +1783,8 @@ void MantidUI::logMessage(const Poco::Message& msg) } if (msg.getPriority() < Poco::Message::PRIO_ERROR) appWindow()->results->setTextColor(Qt::red); - else if (msg.getPriority() < Poco::Message::PRIO_WARNING) - appWindow()->results->setTextColor(Qt::darkRed); + else if (msg.getPriority() <= Poco::Message::PRIO_WARNING) + appWindow()->results->setTextColor(QColor::fromRgb(255, 100, 0)); // Orange else if (msg.getPriority() > Poco::Message::PRIO_INFORMATION) appWindow()->results->setTextColor(Qt::gray); else if (msg.getPriority() == Poco::Message::PRIO_NOTICE)