Resolved the conflict. Refs #8291.

mantidproject · Mar 11, 2014 · 9a198b7 · 9a198b7
2 parents 6db8654 + facfc7b
commit 9a198b7
Show file tree

Hide file tree

Showing 2 changed files with 336 additions and 98 deletions.
diff --git a/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/CheckWorkspacesMatch.h b/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/CheckWorkspacesMatch.h
@@ -95,7 +95,7 @@ class DLLExport CheckWorkspacesMatch : public API::Algorithm
   void doPeaksComparison(API::IPeaksWorkspace_sptr tws1, API::IPeaksWorkspace_sptr tws2);
   void doTableComparison(API::ITableWorkspace_const_sptr tws1, API::ITableWorkspace_const_sptr tws2);
   void doMDComparison(API::Workspace_sptr w1, API::Workspace_sptr w2);
-  bool checkEventLists(DataObjects::EventWorkspace_const_sptr ews1, DataObjects::EventWorkspace_const_sptr ews2);
+  bool compareEventWorkspaces(DataObjects::EventWorkspace_const_sptr ews1, DataObjects::EventWorkspace_const_sptr ews2);
   bool checkData(API::MatrixWorkspace_const_sptr ws1, API::MatrixWorkspace_const_sptr ws2);
   bool checkAxes(API::MatrixWorkspace_const_sptr ws1, API::MatrixWorkspace_const_sptr ws2);
   bool checkSpectraMap(API::MatrixWorkspace_const_sptr ws1, API::MatrixWorkspace_const_sptr ws2);
@@ -104,7 +104,12 @@ class DLLExport CheckWorkspacesMatch : public API::Algorithm
   bool checkSample(const API::Sample& sample1, const API::Sample& sample2);
   bool checkRunProperties(const API::Run& run1, const API::Run& run2); 
 
-  std::string result; ///< the result string
+  /// Compare 2 EventsList
+  int compareEventsListInDetails(const DataObjects::EventList &el1, const DataObjects::EventList &el2,
+                        double tolTof, double tolWeight, int64_t tolPulse, bool printdetails,
+                        size_t& numdiffpulse, size_t& numdifftof, size_t& numdiffboth) const;
+
+  std::string m_result; ///< the result string
 
   API::Progress * prog;
   /// Variable states if one wants to compare workspaces in parallell. This usully true but if one wants to look at the comparison logs, parallell comparison make things complicated as