Added event time correction for inelastic instrument. Refs #9378.

mantidproject · May 30, 2014 · da4f9ee · da4f9ee
1 parent a06ec5b
commit da4f9ee
Show file tree

Hide file tree

Showing 2 changed files with 174 additions and 137 deletions.
diff --git a/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/FilterEvents.h b/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/FilterEvents.h
@@ -80,14 +80,23 @@ namespace Algorithms
     /// Set up detector calibration parameters
     void setupDetectorTOFCalibration();
 
+    /// Set up detector calibration parameters for elastic scattering instrument
+    void setupElasticTOFCorrection(API::MatrixWorkspace_sptr corrws);
+
+    /// Set up detector calibration parmaeters for direct inelastic scattering instrument
+    void setupDirectTOFCorrection(API::MatrixWorkspace_sptr corrws);
+
+    /// Set up detector calibration parameters for indirect inelastic scattering instrument
+    void setupIndirectTOFCorrection(API::MatrixWorkspace_sptr corrws);
+
     /// Set up detector calibration parameters from customized values
     void setupCustomizedTOFCorrection();
 
 
     /// Filter events by splitters in format of Splitter
     void filterEventsBySplitters(double progressamount);
 
-    ///
+    /// Filter events by splitters in format of vector
     void filterEventsByVectorSplitters(double progressamount);
 
     DataObjects::EventWorkspace_sptr m_eventWS;
@@ -104,7 +113,7 @@ namespace Algorithms
     std::vector<std::string> m_wsNames;
 
     std::vector<double> m_detTofOffsets;
-    std::vector<double> m_detTOFShifts;
+    std::vector<double> m_detTofShifts;
 
     bool mFilterByPulseTime;
 
@@ -119,11 +128,6 @@ namespace Algorithms
 
     void splitLog(DataObjects::EventWorkspace_sptr eventws, std::string logname, Kernel::TimeSplitterType& splitters);
 
-    /// Flag to do TOF correction
-    // bool m_doTOFCorrection;
-    /// Flag to generate TOF correction
-    bool m_genTOFCorrection;
-
     /// Base of output workspace's name
     std::string m_outputWSNameBase;