Seem to have fixed the instability. This refs #5801

mantidproject · Oct 10, 2012 · 92e2926 · 92e2926
1 parent 3fc5054
commit 92e2926
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/Code/Mantid/MantidQt/RefDetectorViewer/src/RefMatrixWSImageView.cpp b/Code/Mantid/MantidQt/RefDetectorViewer/src/RefMatrixWSImageView.cpp
@@ -55,7 +55,7 @@ RefMatrixWSImageView::RefMatrixWSImageView( QString wps_name)
     {
         //retrieve data now
         yaxis = ws->readY(px);
-        for (int tof=0; tof<sz-1; tof++)
+        for (size_t tof=0; tof<sz-1; tof++)
         {
             data[px*sz + tof] = yaxis[tof];
         }
@@ -66,7 +66,7 @@ RefMatrixWSImageView::RefMatrixWSImageView( QString wps_name)
                                                         total_rows, total_cols,
                                                         data);
 
-    //std::cout << "ws->readX(0).size(): " << ws->readX(0).size() << std::endl;
+    std::cout << "ws->readX(0).size(): " << ws->readX(0).size() << std::endl;
     image_view = new RefImageView( source );
 }
 

diff --git a/Code/Mantid/scripts/Interface/reduction_gui/widgets/reflectometer/base_ref_reduction.py b/Code/Mantid/scripts/Interface/reduction_gui/widgets/reflectometer/base_ref_reduction.py
@@ -856,7 +856,6 @@ def _plot_data_count_vs_tof_2d(self):
         basename = os.path.basename(file_path)
         ws_base = "__%s" % basename
 
-        print self.instrument_name
         if (self.instrument_name == 'REF_L'):
             ws_output_base = "Pixel Y vs TOF" + " - " + basename
         else:
@@ -878,21 +877,25 @@ def _plot_data_count_vs_tof_2d(self):
 #            if is_pixel_y is False:
 #                ws_output_base = "Counts vs X pixel - %s" % basename
 #                x_title = "X pixel"
-
-        print ws_output_base
 
         range_min = int(self._summary.data_from_tof.text())
         range_max = int(self._summary.data_to_tof.text())
 
+        ws_output_base = "Peak - " + basename + " - Y pixel _2D"
+        if mtd.workspaceExists(ws_output_base):
+            mtd.deleteWorkspace(ws_output_base)
+            ws_output_base_1 = "__" + self.instrument_name + "_" + str(run_number) + "_event.nxs"
+            mtd.deleteWorkspace(ws_output_base_1)
+            ws_output_base_2 = "__" + self.instrument_name + "_" + str(run_number) + "_event.nxs_all"
+            mtd.deleteWorkspace(ws_output_base_2)
+            ws_output_base_3 = "Peak - " + self.instrument_name + "_" + str(run_number) + "_event.nxs - Y pixel "
+            mtd.deleteWorkspace(ws_output_base_3)
+
         call_back = None
         data_manipulation.counts_vs_pixel_distribution(file_path, 
                                                        True, 
-                                                       None) 
-        ws_output_base = "Peak - " + basename + " - Y pixel _2D"
+                                                       None)
 
-        if mtd.workspaceExists(ws_output_base):
-            mtd.deleteWorkspace(ws_output_base)
-
         import mantidqtpython 
         mantidqtpython.MantidQt.RefDetectorViewer.RefMatrixWSImageView(ws_output_base)