Merge remote branch 'origin/feature/7989_scd_dont_reload_data'

mantidproject · Oct 28, 2013 · 2b0a468 · 2b0a468
2 parents 11a8af5 + c8d6316
commit 2b0a468
Show file tree

Hide file tree

Showing 5 changed files with 2,980 additions and 1,906 deletions.
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/MantidEV.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/MantidEV.h
@@ -35,13 +35,15 @@ class RunLoadAndConvertToMD : public QRunnable
   public:
 
   /// Constructor just saves the info needed by the run() method
-  RunLoadAndConvertToMD(       MantidEVWorker * worker, 
+  RunLoadAndConvertToMD(MantidEVWorker * worker,
                          const std::string    & file_name,
                          const std::string    & ev_ws_name,
                          const std::string    & md_ws_name,
-                               double           maxQ,
-                               bool             do_lorentz_corr,
-                               bool             load_det_cal,
+                         const double           minQ,
+                         const double           maxQ,
+                         const bool             do_lorentz_corr,
+                         const bool             load_data,
+                         const bool             load_det_cal,
                          const std::string    & det_cal_file,
                          const std::string    & det_cal_file2 );
 
@@ -53,8 +55,10 @@ class RunLoadAndConvertToMD : public QRunnable
     std::string      file_name;
     std::string      ev_ws_name;
     std::string      md_ws_name;
+    double           minQ;
     double           maxQ;
     bool             do_lorentz_corr;
+    bool             load_data;
     bool             load_det_cal;
     std::string      det_cal_file;
     std::string      det_cal_file2;