Finishing the manipulatons.py Rewrite

sasdata/data_util/manipulations.py

@@ -1,12 +1,11 @@
 """
 Data manipulations for 2D data sets.
-Using the meta data information, various types of averaging
-are performed in Q-space
+Using the meta data information, various types of averaging are performed in Q-space
 
 To test this module use:
 ```
 cd test
-PYTHONPATH=../src/ python2  -m sasdataloader.test.utest_averaging DataInfoTests.test_sectorphi_quarter
+PYTHONPATH=../src/ python2  -m sasmanipulations.test.utest_averaging DataInfoTests.test_sectorphi_quarter
 ```
 """
 #####################################################################
@@ -22,9 +21,13 @@
 import math
 import numpy as np
 from typing import Optional, Union
+from warnings import warn
 
 from sasdata.dataloader.data_info import Data1D, Data2D
 
+warn("sasdata.data_util.manipulations is deprecated. Unless otherwise noted, update your import to "
+     "sasdata.data_util.averaging.", DeprecationWarning, stacklevel=2)
+
 
 def position_and_wavelength_to_q(dx: float, dy: float, detector_distance: float, wavelength: float) -> float:
     """
@@ -196,7 +199,7 @@ def get_dq_data(data2d: Data2D) -> np.array:
     Get the dq for resolution averaging
     The pinholes and det. pix contribution present
     in both direction of the 2D which must be subtracted when
-    converting to 1D: dq_overlap should calculated ideally at
+    converting to 1D: dq_overlap should be calculated ideally at
     q = 0. Note This method works on only pinhole geometry.
     Extrapolate dqx(r) and dqy(phi) at q = 0, and take an average.
     '''
@@ -245,6 +248,8 @@ def reader2D_converter(data2d: Optional[Data2D] = None) -> Data2D:
     :return: 1d arrays of Data2D object
 
     """
+    warn("reader2D_converter should be imported in the future sasdata.dataloader.data_info.",
+         DeprecationWarning, stacklevel=2)
     if data2d.data is None or data2d.x_bins is None or data2d.y_bins is None:
         raise ValueError("Can't convert this data: data=None...")
     new_x = np.tile(data2d.x_bins, (len(data2d.y_bins), 1))

sasdata/dataloader/data_info.py

@@ -22,6 +22,7 @@
 import math
 from math import fabs
 import copy
+from typing import Optional
 
 import numpy as np
 
@@ -1235,6 +1236,43 @@ def _perform_union(self, other):
         return result
 
 
+def reader2D_converter(data2d: Optional[Data2D] = None) -> Data2D:
+    """
+    convert old 2d format opened by IhorReader or danse_reader
+    to new Data2D format
+    This is mainly used by the Readers
+
+    :param data2d: 2d array of Data2D object
+    :return: 1d arrays of Data2D object
+
+    """
+    if data2d.data is None or data2d.x_bins is None or data2d.y_bins is None:
+        raise ValueError("Can't convert this data: data=None...")
+    new_x = np.tile(data2d.x_bins, (len(data2d.y_bins), 1))
+    new_y = np.tile(data2d.y_bins, (len(data2d.x_bins), 1))
+    new_y = new_y.swapaxes(0, 1)
+
+    new_data = data2d.data.flatten()
+    qx_data = new_x.flatten()
+    qy_data = new_y.flatten()
+    q_data = np.sqrt(qx_data * qx_data + qy_data * qy_data)
+    if data2d.err_data is None or np.any(data2d.err_data <= 0):
+        new_err_data = np.sqrt(np.abs(new_data))
+    else:
+        new_err_data = data2d.err_data.flatten()
+    mask = np.ones(len(new_data), dtype=bool)
+
+    output = data2d
+    output.data = new_data
+    output.err_data = new_err_data
+    output.qx_data = qx_data
+    output.qy_data = qy_data
+    output.q_data = q_data
+    output.mask = mask
+
+    return output
+
+
 def combine_data_info_with_plottable(data, datainfo):
     """
     A function that combines the DataInfo data in self.current_datainto with a

test/sasmanipulations/data/avg_testdata.txt

@@ -0,0 +1,21 @@
+0.00019987186878 -0.01196215 0.148605728355
+0.000453772721237 0.02091606 0.23372601
+0.000750492390439 -0.01337855 0.17169562
+0.00103996394336 0.03062 0.13136407
+0.0013420198959 0.0811008333333 0.10681163
+0.001652061869 0.167022288372 0.10098903
+0.00196086470492 27.5554711176 0.7350533
+0.00226262401224 105.031578947 1.35744586624
+0.00256734439716 82.1791776119 1.10749938588
+0.0028637128388 54.714657971 0.890486416264
+0.00315257408712 36.8455584416 0.691746880003
+0.00344644126616 24.8938701149 0.534917225468
+0.00374248202229 16.5905619565 0.424655384023
+0.00404393067437 11.4714217925 0.328969543128
+0.004346317814 8.05405805556 0.273083524998
+0.00465162170627 5.5823291129 0.21217630209
+0.00495449803049 4.2574845082 0.186808495528
+0.00525641407066 3.30448963768 0.154743584955
+0.00555735057365 2.6995389781 0.140373302568
+0.00585577429002 2.03298512 0.116418358232
+