Re #6931 Rename and update method

mantidproject · Apr 23, 2015 · 36fa16b · 36fa16b
1 parent 673a681
commit 36fa16b
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 17 deletions.
diff --git a/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/PlotAsymmetryByLogValue.h b/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/PlotAsymmetryByLogValue.h
@@ -103,7 +103,7 @@ class DLLExport PlotAsymmetryByLogValue : public API::Algorithm {
   /// Check input properties
   void checkProperties (size_t &is, size_t &ie);
   /// Clear previous results
-  void clearResults ();
+  void clearResultsFromTo (size_t is, size_t ie);
 
   /// Stores base name shared by all runs
   static std::string g_filenameBase;

diff --git a/Code/Mantid/Framework/Algorithms/src/PlotAsymmetryByLogValue.cpp b/Code/Mantid/Framework/Algorithms/src/PlotAsymmetryByLogValue.cpp
@@ -253,6 +253,9 @@ void PlotAsymmetryByLogValue::checkProperties (size_t &is, size_t &ie) {
   parseRunNames( firstFN, lastFN, filenameBase, filenameExt, filenameZeros);
   is = atoi(firstFN.c_str()); // starting run number
   ie = atoi(lastFN.c_str());  // last run number
+  size_t isOld = g_redX.begin()->first; // Old first run number
+  size_t ieOld = g_redX.rbegin()->first; // Old last run number
+
 
   // Check if any property has changed
   if ( g_logName != logName ||
@@ -269,7 +272,7 @@ void PlotAsymmetryByLogValue::checkProperties (size_t &is, size_t &ie) {
     g_filenameZeros != filenameZeros) {
 
       // If so, clear previous results
-      clearResults();
+      clearResultsFromTo(isOld,ieOld);
   }
 
   g_logName = logName;
@@ -292,21 +295,22 @@ void PlotAsymmetryByLogValue::checkProperties (size_t &is, size_t &ie) {
 
 /**  Clears any possible result from previous call
 */
-void PlotAsymmetryByLogValue::clearResults() {
-
-  g_redX.clear();
-  g_redY.clear();
-  g_redE.clear();
-  g_greenX.clear();
-  g_greenY.clear();
-  g_greenE.clear();
-  g_sumX.clear();
-  g_sumY.clear();
-  g_sumE.clear();
-  g_diffX.clear();
-  g_diffY.clear();
-  g_diffE.clear();
-
+void PlotAsymmetryByLogValue::clearResultsFromTo(size_t is, size_t ie) {
+
+  for (size_t i=is; i<=ie; i++) {
+    g_redX.erase(i);
+    g_redY.erase(i);
+    g_redE.erase(i);
+    g_greenX.erase(i);
+    g_greenY.erase(i);
+    g_greenE.erase(i);
+    g_sumX.erase(i);
+    g_sumY.erase(i);
+    g_sumE.erase(i);
+    g_diffX.erase(i);
+    g_diffY.erase(i);
+    g_diffE.erase(i);
+  }
 
 }