Changeset b699768 in sasview for test/sasdataloader/test/utest_averaging.py

Timestamp:

Feb 19, 2016 10:07:22 AM (8 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

d7bb526

Parents:

792e6be

Message:

Initial commit of the refactored SasCalc? module.

File:

• test/sasdataloader/test/utest_averaging.py (modified) (7 diffs)

test/sasdataloader/test/utest_averaging.py

@@ -2 +2 @@
 import unittest
 
-from sas.dataloader.loader import  Loader
-from sas.dataloader.manipulations import Ring, CircularAverage, SectorPhi, get_q,reader2D_converter
+from sas.sascalc.dataloader.loader import  Loader
+from sas.sascalc.dataloader.manipulations import Ring, CircularAverage, SectorPhi, get_q,reader2D_converter
  
 import os.path
 import numpy, math
-import sas.dataloader.data_info as data_info
+import sas.sascalc.dataloader.data_info as data_info
 
 class Averaging(unittest.TestCase):
@@ -139 +139 @@
             The test data was not generated by IGOR.
         """
-        from sas.dataloader.manipulations import Boxsum, Boxavg
+        from sas.sascalc.dataloader.manipulations import Boxsum, Boxavg
         
         r = Boxsum(x_min=.01, x_max=.015, y_min=0.01, y_max=0.015)
@@ -157 +157 @@
             The test data was not generated by IGOR.
         """
-        from sas.dataloader.manipulations import SlabX
+        from sas.sascalc.dataloader.manipulations import SlabX
         
         r = SlabX(x_min=-.01, x_max=.01, y_min=-0.0002, y_max=0.0002, bin_width=0.0004)
@@ -174 +174 @@
             The test data was not generated by IGOR.
         """
-        from sas.dataloader.manipulations import SlabY
+        from sas.sascalc.dataloader.manipulations import SlabY
         
         r = SlabY(x_min=.005, x_max=.01, y_min=-0.01, y_max=0.01, bin_width=0.0004)
@@ -193 +193 @@
             The test data was not generated by IGOR.
         """
-        from sas.dataloader.manipulations import SectorPhi
+        from sas.sascalc.dataloader.manipulations import SectorPhi
         import math
         
@@ -218 +218 @@
             The test data was not generated by IGOR.
         """
-        from sas.dataloader.manipulations import SectorPhi
+        from sas.sascalc.dataloader.manipulations import SectorPhi
         import math
         
@@ -236 +236 @@
             The test data was not generated by IGOR.
         """
-        from sas.dataloader.manipulations import SectorQ
+        from sas.sascalc.dataloader.manipulations import SectorQ
         import math