Commit 2e8bf286 authored by Mathieu Tillet's avatar Mathieu Tillet
Browse files

Tidying and updates to the documentation

parent 6cb3d234
...@@ -84,7 +84,7 @@ private: ...@@ -84,7 +84,7 @@ private:
double m_wavelength = 0; double m_wavelength = 0;
double m_channelWidth = 0; double m_channelWidth = 0;
double m_timeOfFlightDelay = 0; double m_timeOfFlightDelay = 0;
std::string m_monitorName = ""; std::string m_monitorName;
LoadHelper m_loader; LoadHelper m_loader;
}; };
......
...@@ -173,7 +173,6 @@ void LoadILLTOF2::loadInstrumentDetails(NeXus::NXEntry &firstEntry) { ...@@ -173,7 +173,6 @@ void LoadILLTOF2::loadInstrumentDetails(NeXus::NXEntry &firstEntry) {
m_monitorName = "monitor1"; m_monitorName = "monitor1";
else { else {
std::string message("Cannot find monitor[1] in the Nexus file!"); std::string message("Cannot find monitor[1] in the Nexus file!");
g_log.error(message);
throw std::runtime_error(message); throw std::runtime_error(message);
} }
...@@ -263,7 +262,7 @@ void LoadILLTOF2::loadTimeDetails(NeXus::NXEntry &entry) { ...@@ -263,7 +262,7 @@ void LoadILLTOF2::loadTimeDetails(NeXus::NXEntry &entry) {
g_log.debug("Nexus Data:"); g_log.debug("Nexus Data:");
g_log.debug() << " ChannelWidth: " << m_channelWidth << '\n'; g_log.debug() << " ChannelWidth: " << m_channelWidth << '\n';
g_log.debug() << " TimeOfFlightDealy: " << m_timeOfFlightDelay << '\n'; g_log.debug() << " TimeOfFlightDelay: " << m_timeOfFlightDelay << '\n';
g_log.debug() << " Wavelength: " << m_wavelength << '\n'; g_log.debug() << " Wavelength: " << m_wavelength << '\n';
} // the other case is the diffraction mode for PANTHER, where nothing is } // the other case is the diffraction mode for PANTHER, where nothing is
// needed here // needed here
......
...@@ -12,7 +12,9 @@ Description ...@@ -12,7 +12,9 @@ Description
Loads an ILL TOF NeXus file into a :ref:`Workspace2D <Workspace2D>` with Loads an ILL TOF NeXus file into a :ref:`Workspace2D <Workspace2D>` with
the given name. the given name.
To date this algorithm only supports: IN4, IN5 and IN6. To date this algorithm only supports: IN4, IN5, IN6 and PANTHER.
This algorithm also supports diffraction mode. In this case, the unit of the output workspace will be wavelength instead of time-of-flight.
.. note:: .. note::
The initial time-of-flight axis is set up using the 'time_of_flight' field in the NeXus file. Therefore the conversion from 'TOF' to 'DeltaE' may not give the correct zero-energy transfer. The initial time-of-flight axis is set up using the 'time_of_flight' field in the NeXus file. Therefore the conversion from 'TOF' to 'DeltaE' may not give the correct zero-energy transfer.
......
...@@ -9,14 +9,12 @@ Diffraction Changes ...@@ -9,14 +9,12 @@ Diffraction Changes
putting new features at the top of the section, followed by putting new features at the top of the section, followed by
improvements, followed by bug fixes. improvements, followed by bug fixes.
New
############
- New loader for PANTHER instrument in diffraction mode.
Improvements Improvements
############ ############
- :ref:`LoadILLTOF2 <algm-LoadILLTOF-v2>` now supports data from PANTHER used in diffraction mode.
Powder Diffraction Powder Diffraction
------------------ ------------------
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment