Merge pull request #1170 from silx-kit/numpy_reshape_remain

Fix remain `arr.shape=` and remove "silent flattening"

Author: sergey-yaroslavtsev

src/PyMca5/PyMcaGui/physics/xrf/McaAdvancedFit.py

@@ -1072,8 +1072,8 @@ def matrixSpectrum(self):
             ddict['result']['ymatrix']  = ymatrix + self.mcafit.zz
         else:
             ddict['result']['ymatrix']  = ymatrix
-        ddict['result']['ymatrix'].shape  = (len(ddict['result']['ymatrix']),)
-        ddict['result']['continuum'].shape  = (len(ddict['result']['ymatrix']),)
+        ddict['result']['ymatrix'] = ddict['result']['ymatrix'].reshape(len(ddict['result']['ymatrix']))
+        ddict['result']['continuum'] = ddict['result']['continuum'].reshape(len(ddict['result']['ymatrix']))
         if self.matrixSpectrumButton.isChecked():
             self.dict['result']['ymatrix']= ddict['result']['ymatrix'] * 1.0
         """
@@ -1375,7 +1375,7 @@ def peaksSpectrum(self):
                 ddict['result'][label]  = ymatrix + self.mcafit.zz
             else:
                 ddict['result'][label]  = ymatrix
-            ddict['result'][label] = numpy.ravel(ddict['result'][label])
+            ddict['result'][label] = ddict['result'][label].reshape(len(ddict['result'][label]))
             if self.peaksSpectrumButton.isChecked():
                 self.dict['result'][label]= ddict['result'][label] * 1.0
         try:
@@ -1954,8 +1954,8 @@ def plot(self, ddict=None):
                     ydata  = self.mcafit.ydata + self.mcafit.zz
                 else:
                     ydata  = self.mcafit.ydata * 1.0
-                xdata = numpy.ravel(xdata)
-                ydata = numpy.ravel(ydata)
+                xdata = xdata.reshape(len(xdata))
+                ydata = ydata.reshape(len(ydata))
                 self.graph.addCurve(xdata, ydata, legend="Data", replot=True, replace=True)
                 self.graph.updateLegends()
                 return

src/PyMca5/PyMcaMath/mva/Lanczos.py

@@ -620,7 +620,7 @@ def ricipolla(self, k,m):
 
     def diago(self, k, m):
         mat = numpy.zeros([m,m], numpy.float64)
-        mat = numpy.ravel(mat)
+        mat = mat.reshape(m * m)
         mat[0:m*m:m+1] = self.alpha
         mat[k*m+k+1:m*m:m+1] =self.beta[k:m-1]
         mat[(k+1)*m+k:m*m:m+1] =self.beta[k:m-1]