SasView · ehewins · Aug 23, 2023 · Aug 31, 2023 · Sep 1, 2023 · Sep 4, 2023
diff --git a/requirements.txt b/requirements.txt
@@ -4,6 +4,7 @@ lxml
 
 # Calculation
 numpy
+scipy
 
 # Unit testing
 pytest

diff --git a/sasdata/data_util/averaging.py b/sasdata/data_util/averaging.py
diff --git a/sasdata/data_util/manipulations.py b/sasdata/data_util/manipulations.py
@@ -22,9 +22,12 @@
 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 and replaced by sasdata.data_util.averaging.",
+     DeprecationWarning, stacklevel=2)
 
 def position_and_wavelength_to_q(dx: float, dy: float, detector_distance: float, wavelength: float) -> float:
     """

diff --git a/test/sasmanipulations/data/MAR07232_rest.h5 b/test/sasmanipulations/data/MAR07232_rest.h5
diff --git a/test/sasmanipulations/data/avg_testdata.txt b/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
+
diff --git a/test/sasdataloader/data/ring_testdata.txt → test/sasmanipulations/data/ring_testdata.txt b/test/sasdataloader/data/ring_testdata.txt → test/sasmanipulations/data/ring_testdata.txt
diff --git a/...sasdataloader/data/sectorphi_testdata.txt → ...manipulations/data/sectorphi_testdata.txt b/...sasdataloader/data/sectorphi_testdata.txt → ...manipulations/data/sectorphi_testdata.txt
diff --git a/test/sasdataloader/data/sectorq_testdata.txt → ...asmanipulations/data/sectorq_testdata.txt b/test/sasdataloader/data/sectorq_testdata.txt → ...asmanipulations/data/sectorq_testdata.txt
diff --git a/test/sasdataloader/data/slabx_testdata.txt → .../sasmanipulations/data/slabx_testdata.txt b/test/sasdataloader/data/slabx_testdata.txt → .../sasmanipulations/data/slabx_testdata.txt
diff --git a/test/sasdataloader/data/slaby_testdata.txt → .../sasmanipulations/data/slaby_testdata.txt b/test/sasdataloader/data/slaby_testdata.txt → .../sasmanipulations/data/slaby_testdata.txt
diff --git a/test/sasdataloader/utest_averaging.py → test/sasmanipulations/utest_averaging.py b/test/sasdataloader/utest_averaging.py → test/sasmanipulations/utest_averaging.py