Making constDataY/constDataE update both. Refs #4208.

Code/Mantid/Framework/DataObjects/src/EventList.cpp

@@ -1308,27 +1308,38 @@ namespace DataObjects
     mru->ensureEnoughBuffersY(thread);
 
     //Is the data in the mrulist?
-    MantidVecWithMarker * data;
-    data = mru->findY(thread, this->m_specNo);
+    MantidVecWithMarker * yData;
+    yData = mru->findY(thread, this->m_specNo);
 
-    if (data == NULL)
+    if (yData == NULL)
     {
       //Create the MRU object
-      data = new MantidVecWithMarker(this->m_specNo);
+      yData = new MantidVecWithMarker(this->m_specNo);
+
+      // prepare to update the uncertainties
+      mru->ensureEnoughBuffersE(thread);
+      MantidVecWithMarker * eData = new MantidVecWithMarker(this->m_specNo);
+
+      // see if E should be calculated;
+      bool skipErrors = (eventType == TOF);
 
       //Set the Y data in it
-      MantidVec E_ignored;
-      this->generateHistogram( *refX, data->m_data, E_ignored, true);
+      this->generateHistogram( *refX, yData->m_data, eData->m_data, skipErrors);
 
       //Lets save it in the MRU
-      MantidVecWithMarker * oldData;
-      oldData = mru->insertY(thread, data);
+      MantidVecWithMarker * yOldData = mru->insertY(thread, yData);
+      if (!skipErrors)
+      {
+        MantidVecWithMarker * eOldData = mru->insertE(thread, eData);
+        if (eOldData)
+          delete eOldData;
+      }
 
       //And clear up the memory of the old one, if it is dropping out.
-      if (oldData)
-        delete oldData;
+      if (yOldData)
+        delete yOldData;
     }
-    return data->m_data;
+    return yData->m_data;
   }
 
   /** Look in the MRU to see if the E histogram has been generated before.
@@ -1345,27 +1356,32 @@ namespace DataObjects
     mru->ensureEnoughBuffersE(thread);
 
     //Is the data in the mrulist?
-    MantidVecWithMarker * data;
-    data = mru->findE(thread, this->m_specNo);
+    MantidVecWithMarker * eData;
+    eData = mru->findE(thread, this->m_specNo);
 
-    if (data == NULL)
+    if (eData == NULL)
     {
       //Create the MRU object
-      data = new MantidVecWithMarker(this->m_specNo);
+      eData = new MantidVecWithMarker(this->m_specNo);
+
+      // prepare to update the uncertainties
+      mru->ensureEnoughBuffersY(thread);
+      MantidVecWithMarker * yData = new MantidVecWithMarker(this->m_specNo);
 
       //Now use that to get E -- Y values are generated from another function
-      MantidVec Y;
-      this->generateHistogram(*refX, Y, data->m_data);
+      this->generateHistogram(*refX, yData->m_data, eData->m_data);
 
       //Lets save it in the MRU
-      MantidVecWithMarker * oldData;
-      oldData = mru->insertE(thread, data);
+      MantidVecWithMarker * yOldData = mru->insertY(thread, yData);
+      MantidVecWithMarker * eOldData = mru->insertE(thread, eData);
 
       //And clear up the memory of the old one, if it is dropping out.
-      if (oldData)
-        delete oldData;
+      if (yOldData)
+        delete yOldData;
+      if (eOldData)
+        delete eOldData;
     }
-    return data->m_data;
+    return eData->m_data;
   }
 
 
@@ -1736,9 +1752,8 @@ namespace DataObjects
     } // end if (there are any events to histogram)
 
     // Now do the sqrt of all errors
-    typedef double (*uf)(double);
-    uf dblSqrt = std::sqrt;
-    std::transform(E.begin(), E.end(), E.begin(), dblSqrt);
+    std::transform(E.begin(), E.end(), E.begin(),
+                   static_cast<double (*)(double)>(std::sqrt));
   }
 
 
@@ -1877,9 +1892,8 @@ namespace DataObjects
     E.resize(Y.size(), 0);
 
     // windows can get confused about std::sqrt
-    typedef double (*uf)(double);
-    uf dblSqrt = std::sqrt;
-    std::transform(Y.begin(), Y.end(), E.begin(), dblSqrt);
+    std::transform(Y.begin(), Y.end(), E.begin(),
+                   static_cast<double (*)(double)>(std::sqrt));
 
   }